[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master, updated. debian/1.7.6-1-7-g120d70b

Iain Lane laney at debian.org
Mon Sep 26 22:23:48 UTC 2011


The following commit has been merged in the master branch:
commit 74507b7e65e2584a0549905ce9621cdda224dd1c
Author: Iain Lane <laney at debian.org>
Date:   Mon Sep 26 22:26:38 2011 +0100

    Imported Upstream version 1.8.0

diff --git a/ChangeLog b/ChangeLog
index c36d18c..5985200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,366 @@
 # Generated by Makefile. Do not edit.
 
+commit 0f5f896493f472604b51f2119aa0f21f67149f3a
+Author: Aaron Borden <adborden at live.com>
+Date:   Mon Sep 26 08:29:11 2011 -0700
+
+    Bump version to 1.8.0
+
+ Tomboy/Defines.WIN32.cs |    2 +-
+ configure.in            |    2 +-
+ osx/Contents/Info.plist |    4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 81f472ebd92bbb71d0172ed9e6c0e5a48a2d2aa9
+Author: Aaron Borden <adborden at live.com>
+Date:   Mon Sep 26 08:28:58 2011 -0700
+
+    Update NEWS file for 1.8.0
+
+ NEWS |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit f03e9e38be3672406686f78df8b021286bbae046
+Author: Carles Ferrando <carles.ferrando at gmail.com>
+Date:   Mon Sep 26 14:14:47 2011 +0200
+
+    [l10n]Updated Catalan (Valencian) translation
+
+ po/ca at valencia.po | 1167 ++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 664 insertions(+), 503 deletions(-)
+
+commit eed623fb56f8fead8ca5d20d0f3d26aa39aa0675
+Author: Inaki Larranaga Murgoitio <dooteo at zundan.com>
+Date:   Sun Sep 25 16:53:36 2011 +0200
+
+    Updated Basque language
+
+ po/eu.po | 1219 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 707 insertions(+), 512 deletions(-)
+
+commit 5f922d3c9ba0a1e3b7a7948c4181b2f23687defd
+Author: Kentaro KAZUHAMA <kazken3 at gmail.com>
+Date:   Sun Sep 25 15:01:44 2011 +0900
+
+    Updated Japanese translation
+
+ po/ja.po | 1386 +++++++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 792 insertions(+), 594 deletions(-)
+
+commit b6c2d77486f0a8ffbdb7868c0d51687cb6fe9809
+Author: Bruno Brouard <annoa.b at gmail.com>
+Date:   Sat Sep 24 22:31:56 2011 +0200
+
+    Updated French translation
+
+ po/fr.po |   40 +++++++++++++++++++++-------------------
+ 1 files changed, 21 insertions(+), 19 deletions(-)
+
+commit f4cd271a791011a899da7d1ae3edd835b8b5ae76
+Author: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>
+Date:   Sat Sep 24 20:38:48 2011 +0300
+
+    Updated Belarusian translation.
+
+ po/be.po |  175 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 96 insertions(+), 79 deletions(-)
+
+commit 329539183033b9d4d7f696b55503a4f4b000abcc
+Author: Changwoo Ryu <cwryu at debian.org>
+Date:   Fri Sep 23 04:15:56 2011 +0900
+
+    Updated Korean translation
+
+ po/ko.po | 1158 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 670 insertions(+), 488 deletions(-)
+
+commit 2840770edeb3913c0c3ab9c3e29b5a9ec6086f4f
+Author: Abderrahim Kitouni <a.kitouni at gmail.com>
+Date:   Thu Sep 22 18:00:59 2011 +0100
+
+    Updated Arabic translation by Anass Ahmed and Abdalrahim Fakhouri
+
+ po/ar.po | 2646 +++++++++++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 1758 insertions(+), 888 deletions(-)
+
+commit 0e02cdc66510348bfc3edafff9cfc476ccda8fc0
+Author: Nilamdyuti Goswami <ngoswami at redhat.com>
+Date:   Thu Sep 22 16:28:55 2011 +0530
+
+    Updated Assamese Translations:bugzilla#659595
+
+ po/as.po | 2104 +++++++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 1178 insertions(+), 926 deletions(-)
+
+commit 29845a7c5d8e975da297d02a631aa775574e8a3b
+Author: Мирослав Николић <miroslavnikolic at rocketmail.com>
+Date:   Tue Sep 20 22:09:14 2011 +0200
+
+    Updated Serbian translation
+
+ po/sr.po       | 1419 ++++++++++++++++++++++++++++++++------------------------
+ po/sr at latin.po | 1415 ++++++++++++++++++++++++++++++++------------------------
+ 2 files changed, 1608 insertions(+), 1226 deletions(-)
+
+commit 553dc93ee9980e377a7fc7e0997c3ab66e886186
+Author: Gabor Kelemen <kelemeng at gnome.hu>
+Date:   Tue Sep 20 15:17:36 2011 +0200
+
+    Updated Hungarian translation
+
+ po/hu.po | 1156 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 664 insertions(+), 492 deletions(-)
+
+commit 8a9eebc5c89b5b5de04651b3b3f5a6a6224dbaa6
+Author: Flemming Christensen <fc at stromata.dk>
+Date:   Tue Sep 20 11:10:16 2011 +0200
+
+    Updated Danish translation
+
+ po/da.po | 1199 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 700 insertions(+), 499 deletions(-)
+
+commit b980f05bbf1600b1da141d5aaf73b3ee35d98f99
+Author: Rudolfs Mazurs <rudolfs.mazurs at gmail.com>
+Date:   Mon Sep 19 21:53:00 2011 +0300
+
+    Updated Latvian translation.
+
+ po/lv.po |   53 +++++++++++++++++++----------------------------------
+ 1 files changed, 19 insertions(+), 34 deletions(-)
+
+commit 7b51f8d92813efa09279dafd8352d6291e770927
+Author: Pau Iranzo <paugnu at gmail.com>
+Date:   Mon Sep 19 15:05:07 2011 +0200
+
+    [l10n]Updated Catalan translation
+
+ po/ca.po | 1248 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 718 insertions(+), 530 deletions(-)
+
+commit 6f1ae919171e0f44c0190806621e224168b68320
+Author: Aaron Borden <adborden at live.com>
+Date:   Sun Sep 18 22:47:37 2011 -0700
+
+    Bump the version to 1.7.8
+
+ Tomboy/Defines.WIN32.cs |    2 +-
+ configure.in            |    2 +-
+ osx/Contents/Info.plist |    4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 1fab9033bda3677d1927891d4e89821df41db7d9
+Author: Aaron Borden <adborden at live.com>
+Date:   Sun Sep 18 22:41:51 2011 -0700
+
+    Update NEWS for 1.7.7
+
+ NEWS |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit c0a8a6ba43b71bfd6a4cf9ec6f16c156886646d1
+Author: Hannie Dumoleyn <hannie at ubuntu-nl.org>
+Date:   Sun Sep 18 20:25:29 2011 +0200
+
+    Updated Dutch translation by Hannie Dumoleyn
+
+ po/nl.po | 1311 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 754 insertions(+), 557 deletions(-)
+
+commit a81cfbed260227d0bb30a27e2f13d2bd2a65921a
+Author: Pavol Klačanský <pavol at klacansky.com>
+Date:   Sun Sep 18 14:34:05 2011 +0200
+
+    Updated Slovak translation
+
+ po/sk.po | 1308 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 757 insertions(+), 551 deletions(-)
+
+commit f0d0a6e952159d8b69286ed10f2da05c2eb56e46
+Author: Mario Blättermann <mariobl at gnome.org>
+Date:   Fri Sep 16 22:00:05 2011 +0200
+
+    [l10n] Updated German translation
+
+ po/de.po |  341 +++++---------------------------------------------------------
+ 1 files changed, 27 insertions(+), 314 deletions(-)
+
+commit 4fca15bdfbb37e84734c61d22e65be97a5ed79f5
+Author: Claude Paroz <claude at 2xlibre.net>
+Date:   Thu Sep 15 09:18:09 2011 +0200
+
+    Fixed error in French translation
+
+ po/fr.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 85a182d91882119cdfd87f7a174a2088c3691b42
+Author: Milo Casagrande <milo at ubuntu.com>
+Date:   Wed Sep 14 22:27:06 2011 +0200
+
+    [l10n] Updated Italian translation
+
+ po/it.po | 1149 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 662 insertions(+), 487 deletions(-)
+
+commit a19f143802003fdd66cc6bb75e19ebb31fb919aa
+Author: Claude Paroz <claude at 2xlibre.net>
+Date:   Wed Sep 14 22:23:59 2011 +0200
+
+    Updated French translation
+    
+    Contributed by Bruno Brouard
+
+ po/fr.po | 1200 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 689 insertions(+), 511 deletions(-)
+
+commit 575ba2f382704378e35f6bd1910b3190e1802a4d
+Author: dmustieles <daniel.mustieles at gmail.com>
+Date:   Wed Sep 14 17:55:03 2011 +0200
+
+    Updated Spanish translation
+
+ po/es.po | 5454 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 2724 insertions(+), 2730 deletions(-)
+
+commit 7fa1fc8ef0853859fa0af9b7fb7095b883e8126a
+Author: Krasimir Chonov <mk2616 at abv.bg>
+Date:   Wed Sep 14 07:11:19 2011 +0300
+
+    Updated Bulgarian translation
+
+ po/bg.po |  254 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 149 insertions(+), 105 deletions(-)
+
+commit 49cdba94f3046fda59c8c11a378f00be866b092e
+Author: Yinghua Wang <wantinghard at gmail.com>
+Date:   Tue Sep 13 13:35:24 2011 +0800
+
+    update Simplified Chinese (zh_CN) translation
+
+ po/zh_CN.po |  770 ++++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 413 insertions(+), 357 deletions(-)
+
+commit 8db15788f1ad53674f9e1b9344daeab9a0260c43
+Author: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>
+Date:   Mon Sep 12 01:09:06 2011 +0300
+
+    Updated Belarusian translation.
+
+ po/be.po | 2638 +++++++++++++++++++++++++++++++++++++++++++++++---------------
+ 1 files changed, 1996 insertions(+), 642 deletions(-)
+
+commit f9c38bd5c442f1db9cde32c58a34737e39947416
+Author: Duarte Loreto <happyguy_pt at hotmail.com>
+Date:   Sat Sep 10 19:24:59 2011 +0100
+
+    Updated Portuguese translation
+
+ po/pt.po | 1177 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 681 insertions(+), 496 deletions(-)
+
+commit ad98c18a5eea2f7b84eddf5562016abbba699d40
+Author: Rudolfs Mazurs <rudolfs.mazurs at gmail.com>
+Date:   Fri Sep 9 23:11:23 2011 +0300
+
+    Updated Latvian translation.
+
+ po/lv.po |  948 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 486 insertions(+), 462 deletions(-)
+
+commit 3f275be4e07995a525da8677b145b7037c9acfbe
+Author: Antonio Fernandes C. Neto <fernandesn at gnome.org>
+Date:   Fri Sep 9 09:35:45 2011 -0400
+
+    Updated Brazilian Portuguese translation, reviewed by Og Maciel <ogmaciel at gmail.com>.
+
+ po/pt_BR.po | 1238 ++++++++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 716 insertions(+), 522 deletions(-)
+
+commit 2b82cd40d9dec20c75359818af7dddb15c1d47a1
+Author: Yaron Shahrabani <sh.yaron at gmail.com>
+Date:   Fri Sep 9 12:59:33 2011 +0300
+
+    Updated Hebrew translation.
+
+ po/he.po |   42 +++++++++++++++++++++++++++---------------
+ 1 files changed, 27 insertions(+), 15 deletions(-)
+
+commit 6bd8451a16f154baa22d30849a7c0d1214941232
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date:   Thu Sep 8 21:39:20 2011 +0200
+
+    Updated Polish translation
+
+ po/pl.po | 1164 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 669 insertions(+), 495 deletions(-)
+
+commit 5ec7aaa3d249c139ea82a3837079910409c970ce
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date:   Wed Sep 7 19:30:03 2011 +0200
+
+    Updated Slovenian translation
+
+ po/sl.po |  265 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 153 insertions(+), 112 deletions(-)
+
+commit 4d6c8b07ade75ed297fcfdf3609a679b8f68b809
+Author: Bruce Cowan <bruce at bcowan.me.uk>
+Date:   Wed Sep 7 16:46:34 2011 +0100
+
+    Updated British English translation
+
+ po/en_GB.po | 1182 ++++++++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 685 insertions(+), 497 deletions(-)
+
+commit d4f539f151630ca8349ad56f0b3ab5a1a09c0366
+Author: Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>
+Date:   Tue Sep 6 20:13:37 2011 +0800
+
+    Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+ po/zh_HK.po |  247 ++++++++++++++++++++++++++++++++++------------------------
+ po/zh_TW.po |  249 +++++++++++++++++++++++++++++++++++------------------------
+ 2 files changed, 292 insertions(+), 204 deletions(-)
+
+commit 84abc666cd54cd4754df72cc82c780070c4b1f8a
+Author: Dr.T.Vasudevan <agnihot3 at gmail.com>
+Date:   Tue Sep 6 17:18:10 2011 +0530
+
+    updated Tamil translation
+
+ po/ta.po | 1176 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 686 insertions(+), 490 deletions(-)
+
+commit 008b101cc190b8b877e5625a3f536e3e869cdf8a
+Author: Andika Triwidada <andika at gmail.com>
+Date:   Tue Sep 6 13:30:47 2011 +0700
+
+    Updated Indonesian translation
+
+ po/id.po |  342 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 170 insertions(+), 172 deletions(-)
+
+commit 2b832b1e447f4231836c262a8fcf31433061a3d8
+Author: Greg Poirier <grep at binary-snobbery.com>
+Date:   Mon Sep 5 13:07:27 2011 -0500
+
+    Bumped version to 1.7.7
+
+ Tomboy/Defines.WIN32.cs |    2 +-
+ configure.in            |    2 +-
+ osx/Contents/Info.plist |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 1dadcfcc9fe62765a4c36371a8a4dcc9602b3fc3
+Author: Greg Poirier <grep at binary-snobbery.com>
+Date:   Mon Sep 5 12:54:43 2011 -0500
+
+    Update NEWS for 1.7.6
+
+ NEWS |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
 commit e3ebbbe5e5a37253d7a9decafcc52bdd7ccabf88
 Author: Alexandre Franke <alexandre.franke at gmail.com>
 Date:   Mon Sep 5 11:34:40 2011 +0200
diff --git a/NEWS b/NEWS
index f90f52e..272eb0c 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,17 @@ 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.8
+* Translation Updates: ar, as, be, ca, da, eu, fr, ja, hu, ko, lv, sr
+
+Version 1.7.7
+* Translation Updates: be, bg, de, en, es, fr, he, id, it, lv, nl, pl,
+  pt, sk, sl, ta, zh
+
+Version 1.7.6
+* Replace string concat with variable substitution to make translations possible (654883)
+* Translation Updates: FR, GL, PA, CS, LT, RU, ES, SV, NO, FI
+
 Version 1.7.5
 * Translation Updates: DE, LT, NB, ES, GL, HE, SV
  
diff --git a/aclocal.m4 b/aclocal.m4
index d79acdc..facceb5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -1479,6 +1479,7 @@ _LT_CONFIG_SAVE_COMMANDS([
 
 # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 _LT_COPYING
@@ -1815,7 +1816,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
 # to the aix ld manual.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
 	/^0/ {
@@ -3239,7 +3240,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -3279,6 +3280,18 @@ linux* | k*bsd*-gnu)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3866,11 +3879,11 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4487,7 +4500,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4551,7 +4564,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4771,7 +4784,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4976,6 +4989,9 @@ m4_if([$1], [CXX], [
   cygwin* | mingw* | cegcc*)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
+  linux* | k*bsd*-gnu)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+  ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -5040,6 +5056,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5061,6 +5080,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -5152,7 +5172,7 @@ _LT_EOF
       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -5222,7 +5242,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5397,6 +5417,7 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -5620,18 +5641,9 @@ _LT_EOF
 	# implicitly export all symbols.
         save_LDFLAGS="$LDFLAGS"
         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(
-          [AC_LANG_SOURCE(
-	     [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			   [C++], [[int foo (void) { return 0; }]],
-			   [Fortran 77], [[
-       subroutine foo
-       end]],
-			   [Fortran], [[
-       subroutine foo
-       end]])])], [
+        AC_LINK_IFELSE(int foo(void) {},
           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        ])
+        )
         LDFLAGS="$save_LDFLAGS"
       else
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -5644,7 +5656,7 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -6640,7 +6652,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -8647,15 +8659,15 @@ m4_define([lt_dict_filter],
 
 # Generated from ltversion.in.
 
-# serial 3018 ltversion.m4
+# serial 3017 ltversion.m4
 # This file is part of GNU Libtool
 
 m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3018])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
 
 AC_DEFUN([LTVERSION_VERSION],
 [macro_version='2.2.6b'
-macro_revision='1.3018'
+macro_revision='1.3017'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/config.guess b/config.guess
index 666c5ad..c2246a4 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2009-12-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,16 +140,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_MACHINE}" in
-    i?86)
-	test -z "$VENDOR" && VENDOR=pc
-	;;
-    *)
-	test -z "$VENDOR" && VENDOR=unknown
-	;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -213,19 +204,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
     *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
     *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
@@ -290,13 +281,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo alpha-dec-winnt3.5
 	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-${VENDOR}-sysv4
+	echo m68k-unknown-sysv4
 	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
+	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-morphos
+	echo ${UNAME_MACHINE}-unknown-morphos
 	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
@@ -311,7 +302,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
     arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-${VENDOR}-riscos
+	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
@@ -419,7 +410,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         echo m68k-hades-mint${UNAME_RELEASE}
         exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-${VENDOR}-mint${UNAME_RELEASE}
+        echo m68k-unknown-mint${UNAME_RELEASE}
         exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
@@ -730,9 +721,9 @@ EOF
 	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-${VENDOR}-osf1
+	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
 	exit ;;
     parisc*:Lites*:*:*)
@@ -792,19 +783,19 @@ EOF
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit ;;
     sparc*:BSD/OS:*:*)
-	echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
 	case ${UNAME_MACHINE} in
 	    pc98)
-		echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    amd64)
-		echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -826,10 +817,10 @@ EOF
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    authenticamd | genuineintel | EM64T)
-		echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
+		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
-		echo ia64-${VENDOR}-interix${UNAME_RELEASE}
+		echo ia64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -848,21 +839,21 @@ EOF
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-${VENDOR}-cygwin
+	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
-	echo powerpcle-${VENDOR}-cygwin
+	echo powerpcle-unknown-cygwin
 	exit ;;
     prep*:SunOS:5.*:*)
-	echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -879,20 +870,20 @@ EOF
         esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
@@ -901,7 +892,7 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-${VENDOR}-linux-gnu
+    	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -912,16 +903,16 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -940,51 +931,51 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-${VENDOR}-linux-gnu
+	echo or32-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-${VENDOR}-linux-gnu
+	echo sparc-unknown-linux-gnu
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux-gnu
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
-	  *)    echo hppa-${VENDOR}-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux-gnu
+	echo powerpc64-unknown-linux-gnu
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux-gnu
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR}-linux-gnu
+	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1006,16 +997,16 @@ EOF
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit ;;
     i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-${VENDOR}-stop
+	echo ${UNAME_MACHINE}-unknown-stop
 	exit ;;
     i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-atheos
+	echo ${UNAME_MACHINE}-unknown-atheos
 	exit ;;
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
@@ -1035,7 +1026,7 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@@ -1074,7 +1065,7 @@ EOF
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-${VENDOR}-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
 	exit ;;
     mini*:CTIX:SYS*5:*)
@@ -1111,19 +1102,19 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit ;;
     TSUNAMI:LynxOS:2.*:*)
-	echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     rs6000:LynxOS:2.*:*)
-	echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
@@ -1173,7 +1164,7 @@ EOF
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-${VENDOR}-sysv${UNAME_RELEASE}
+	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
         exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
@@ -1264,13 +1255,13 @@ EOF
 	else
 	    UNAME_MACHINE="$cputype"
 	fi
-	echo ${UNAME_MACHINE}-${VENDOR}-plan9
+	echo ${UNAME_MACHINE}-unknown-plan9
 	exit ;;
     *:TOPS-10:*:*)
-	echo pdp10-${VENDOR}-tops10
+	echo pdp10-unknown-tops10
 	exit ;;
     *:TENEX:*:*)
-	echo pdp10-${VENDOR}-tenex
+	echo pdp10-unknown-tenex
 	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
@@ -1279,16 +1270,16 @@ EOF
 	echo pdp10-xkl-tops20
 	exit ;;
     *:TOPS-20:*:*)
-	echo pdp10-${VENDOR}-tops20
+	echo pdp10-unknown-tops20
 	exit ;;
     *:ITS:*:*)
-	echo pdp10-${VENDOR}-its
+	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
diff --git a/config.sub b/config.sub
index 2a55a50..c2d1257 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -380,7 +381,8 @@ case $basic_machine in
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
@@ -1085,6 +1087,11 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
 	tile*)
 		basic_machine=tile-unknown
 		os=-linux-gnu
@@ -1435,6 +1442,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
diff --git a/configure b/configure
index b4313ca..8a35a44 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.68 for tomboy 1.7.6.
+# Generated by GNU Autoconf 2.67 for tomboy 1.8.0.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -89,7 +89,6 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -215,18 +214,11 @@ IFS=$as_save_IFS
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -706,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tomboy'
 PACKAGE_TARNAME='tomboy'
-PACKAGE_VERSION='1.7.6'
-PACKAGE_STRING='tomboy 1.7.6'
+PACKAGE_VERSION='1.8.0'
+PACKAGE_STRING='tomboy 1.8.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1449,7 +1441,7 @@ Try \`$0 --help' for more information"
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -1587,7 +1579,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.7.6 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1661,7 +1653,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tomboy 1.7.6:";;
+     short | recursive ) echo "Configuration of tomboy 1.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1826,8 +1818,8 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tomboy configure 1.7.6
-generated by GNU Autoconf 2.68
+tomboy configure 1.8.0
+generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1873,7 +1865,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1919,7 +1911,7 @@ fi
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1932,7 +1924,7 @@ ac_fn_c_check_func ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1987,7 +1979,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_func
 
@@ -2023,7 +2015,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -2065,7 +2057,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -2079,7 +2071,7 @@ ac_fn_c_check_header_compile ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2097,7 +2089,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_compile
 
@@ -2109,10 +2101,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2175,7 +2167,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2184,15 +2176,15 @@ eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_mongrel
 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.7.6, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by tomboy $as_me 1.8.0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -2450,7 +2442,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
@@ -2588,7 +2580,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2675,11 +2667,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2765,7 +2757,7 @@ if test "$cross_compiling" != no; then
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2805,7 +2797,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2858,7 +2850,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2909,7 +2901,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2949,7 +2941,7 @@ done
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3007,7 +2999,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tomboy'
- VERSION='1.7.6'
+ VERSION='1.8.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3115,7 +3107,7 @@ do
 done
 rm -rf conftest.dir
 
-if ${am_cv_prog_tar_ustar+:} false; then :
+if test "${am_cv_prog_tar_ustar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_prog_tar_ustar=$_am_tool
@@ -3185,7 +3177,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -3228,7 +3220,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -3472,7 +3464,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3512,7 +3504,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3565,7 +3557,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3605,7 +3597,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3664,7 +3656,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3708,7 +3700,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3763,7 +3755,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3878,7 +3870,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3921,7 +3913,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3980,7 +3972,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
     fi
   fi
 fi
@@ -3991,7 +3983,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4032,7 +4024,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4042,7 +4034,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4079,7 +4071,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4157,7 +4149,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4256,7 +4248,7 @@ depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4408,7 +4400,7 @@ fi
 set dummy intltool-update; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_UPDATE in
@@ -4448,7 +4440,7 @@ fi
 set dummy intltool-merge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_MERGE in
@@ -4488,7 +4480,7 @@ fi
 set dummy intltool-extract; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_EXTRACT in
@@ -4649,7 +4641,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $XGETTEXT in
@@ -4689,7 +4681,7 @@ fi
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGMERGE in
@@ -4729,7 +4721,7 @@ fi
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -4769,7 +4761,7 @@ fi
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -4820,7 +4812,7 @@ fi
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_PERL in
@@ -4904,7 +4896,7 @@ else
   case $host in
     *-*-solaris*)
                         ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   DATADIRNAME=share
 else
   DATADIRNAME=lib
@@ -4934,7 +4926,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4974,7 +4966,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -5027,7 +5019,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -5067,7 +5059,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -5126,7 +5118,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -5170,7 +5162,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -5225,7 +5217,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -5254,7 +5246,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5291,7 +5283,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -5369,7 +5361,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -5468,7 +5460,7 @@ depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5593,7 +5585,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
+if test "${ac_cv_search_strerror+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -5627,11 +5619,11 @@ for ac_lib in '' cposix; do
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_strerror+:} false; then :
+  if test "${ac_cv_search_strerror+set}" = set; then :
   break
 fi
 done
-if ${ac_cv_search_strerror+:} false; then :
+if test "${ac_cv_search_strerror+set}" = set; then :
 
 else
   ac_cv_search_strerror=no
@@ -5659,7 +5651,7 @@ if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -5775,7 +5767,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -5787,7 +5779,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -5850,7 +5842,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5917,7 +5909,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6068,7 +6060,7 @@ esac
 
 
 macro_version='2.2.6b'
-macro_revision='1.3018'
+macro_revision='1.3017'
 
 
 
@@ -6090,7 +6082,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
@@ -6106,7 +6098,7 @@ fi
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -6124,7 +6116,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
@@ -6139,7 +6131,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -6157,7 +6149,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
+if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -6239,7 +6231,7 @@ Xsed="$SED -e 1s/^X//"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
+if test "${ac_cv_path_FGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -6370,7 +6362,7 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
+if test "${lt_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -6410,7 +6402,7 @@ fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -6437,7 +6429,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
+if test "${lt_cv_path_NM+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -6497,7 +6489,7 @@ else
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -6541,7 +6533,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -6604,18 +6596,18 @@ test -z "$NM" && NM=nm
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
+if test "${lt_cv_nm_interface+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6612: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6604: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6615: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6607: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6618: output\"" >&5)
+  (eval echo "\"\$as_me:6610: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6628,7 +6620,7 @@ $as_echo "$lt_cv_nm_interface" >&6; }
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
@@ -6820,7 +6812,7 @@ esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
@@ -6856,7 +6848,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -6896,7 +6888,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -6955,7 +6947,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -7070,11 +7062,11 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -7171,7 +7163,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -7211,7 +7203,7 @@ if test -z "$ac_cv_prog_AR"; then
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -7276,7 +7268,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -7316,7 +7308,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -7375,7 +7367,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -7415,7 +7407,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -7532,7 +7524,7 @@ compiler=$CC
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -7809,7 +7801,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7812 "configure"' > conftest.$ac_ext
+  echo '#line 7804 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7903,7 +7895,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -7979,7 +7971,7 @@ need_locks="$enable_libtool_lock"
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -8019,7 +8011,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
 set dummy dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -8071,7 +8063,7 @@ fi
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -8111,7 +8103,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
 set dummy nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -8163,7 +8155,7 @@ fi
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
+if test "${ac_cv_prog_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -8203,7 +8195,7 @@ if test -z "$ac_cv_prog_LIPO"; then
 set dummy lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -8255,7 +8247,7 @@ fi
 set dummy ${ac_tool_prefix}otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -8295,7 +8287,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
 set dummy otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -8347,7 +8339,7 @@ fi
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -8387,7 +8379,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
 set dummy otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -8462,7 +8454,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
@@ -8491,7 +8483,7 @@ fi
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
@@ -8577,7 +8569,7 @@ for ac_header in dlfcn.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
@@ -8731,7 +8723,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
+if test "${lt_cv_objdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -8839,7 +8831,7 @@ file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -8905,7 +8897,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -9038,7 +9030,7 @@ if test "$GCC" = yes; then
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -9054,11 +9046,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9057: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9049: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9061: \$? = $ac_status" >&5
+   echo "$as_me:9053: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9223,7 +9215,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -9377,7 +9369,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -9393,11 +9385,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9396: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9388: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9400: \$? = $ac_status" >&5
+   echo "$as_me:9392: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9436,7 +9428,7 @@ fi
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -9479,7 +9471,7 @@ fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9498,11 +9490,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9501: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9493: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9505: \$? = $ac_status" >&5
+   echo "$as_me:9497: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9534,7 +9526,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9553,11 +9545,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9556: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9548: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9560: \$? = $ac_status" >&5
+   echo "$as_me:9552: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9672,6 +9664,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs=no
+    ;;
   esac
 
   ld_shlibs=yes
@@ -9693,6 +9688,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -9784,7 +9780,7 @@ _LT_EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -9854,7 +9850,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -10029,6 +10025,7 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -10335,11 +10332,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo (void) { return 0; }
+int foo(void) {}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-
-          archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -10356,7 +10352,7 @@ rm -f core conftest.err conftest.$ac_objext \
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -11246,7 +11242,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -11301,6 +11297,18 @@ rm -f core conftest.err conftest.$ac_objext \
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -11663,7 +11671,7 @@ else
   # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11697,7 +11705,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -11711,12 +11719,12 @@ fi
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
+if test "x$ac_cv_func_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11750,16 +11758,16 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11793,12 +11801,12 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11832,12 +11840,12 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11871,7 +11879,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -11912,7 +11920,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
+if test "${lt_cv_dlopen_self+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -11921,7 +11929,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11924 "configure"
+#line 11932 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12008,7 +12016,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -12017,7 +12025,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12020 "configure"
+#line 12028 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12260,7 +12268,7 @@ _ACEOF
    for ac_header in locale.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = xyes; then :
+if test "x$ac_cv_header_locale_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LOCALE_H 1
 _ACEOF
@@ -12272,7 +12280,7 @@ done
     if test $ac_cv_header_locale_h = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if ${am_cv_val_LC_MESSAGES+:} false; then :
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12312,7 +12320,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
     INTLLIBS=
 
     ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = xyes; then :
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
   gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
 
@@ -12321,7 +12329,7 @@ if test "x$ac_cv_header_libintl_h" = xyes; then :
       #
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
 $as_echo_n "checking for ngettext in libc... " >&6; }
-if ${gt_cv_func_ngettext_libc+:} false; then :
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12352,7 +12360,7 @@ $as_echo "$gt_cv_func_ngettext_libc" >&6; }
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
 	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
 $as_echo_n "checking for dgettext in libc... " >&6; }
-if ${gt_cv_func_dgettext_libc+:} false; then :
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12385,7 +12393,7 @@ $as_echo "$gt_cv_func_dgettext_libc" >&6; }
         for ac_func in bind_textdomain_codeset
 do :
   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -12404,7 +12412,7 @@ done
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12438,10 +12446,10 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_ngettext+:} false; then :
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12475,10 +12483,10 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
 $as_echo_n "checking for dgettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_dgettext+:} false; then :
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12512,7 +12520,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
 $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
   gt_cv_func_dgettext_libintl=yes
 fi
 
@@ -12528,7 +12536,7 @@ $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
 $as_echo "" >&6; }
   	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_ngettext+:} false; then :
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12562,10 +12570,10 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
 $as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_dcgettext+:} false; then :
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12599,7 +12607,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
   gt_cv_func_dgettext_libintl=yes
 			libintl_extra_libs=-liconv
 else
@@ -12624,7 +12632,7 @@ fi
           for ac_func in bind_textdomain_codeset
 do :
   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -12662,7 +12670,7 @@ $as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -12699,7 +12707,7 @@ fi
 	  for ac_func in dcgettext
 do :
   ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = xyes; then :
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DCGETTEXT 1
 _ACEOF
@@ -12740,7 +12748,7 @@ fi
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -12781,7 +12789,7 @@ fi
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -12832,7 +12840,7 @@ else
   case $host in
 	    *-*-solaris*)
 	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   CATOBJEXT=.gmo
                DATADIRNAME=share
 else
@@ -12968,7 +12976,7 @@ $as_echo "$LINGUAS" >&6; }
 set dummy gconftool-2; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GCONFTOOL+:} false; then :
+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GCONFTOOL in
@@ -13041,7 +13049,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&
 if test "${enable_schemas_install+set}" = set; then :
   enableval=$enable_schemas_install; case ${enableval} in
        yes|no) ;;
-       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5  ;;
       esac
 fi
 
@@ -13062,7 +13070,7 @@ fi
 set dummy gmcs; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMCS+:} false; then :
+if test "${ac_cv_path_GMCS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMCS in
@@ -13187,7 +13195,7 @@ and MONO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	MONO_CFLAGS=$pkg_cv_MONO_CFLAGS
 	MONO_LIBS=$pkg_cv_MONO_LIBS
@@ -13302,7 +13310,7 @@ and LIBTOMBOY_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	LIBTOMBOY_CFLAGS=$pkg_cv_LIBTOMBOY_CFLAGS
 	LIBTOMBOY_LIBS=$pkg_cv_LIBTOMBOY_LIBS
@@ -13346,7 +13354,7 @@ if test "${enable_panelapplet_srvdir_check+set}" = set; then :
   enableval=$enable_panelapplet_srvdir_check; case "$enableval" in
 	      	yes) ENABLE_PANELAPPLET_SRVDIR_CHECK=yes ;;
 	      	no)  ENABLE_PANELAPPLET_SRVDIR_CHECK=no ;;
-	      	*)   as_fn_error $? "bad value ${enableval} for --enable-panelapplet-srvdir-check" "$LINENO" 5 ;;
+	      	*)   as_fn_error $? "bad value ${enableval} for --enable-panelapplet-srvdir-check" "$LINENO" 5  ;;
 	      esac
 else
   ENABLE_PANELAPPLET_SRVDIR_CHECK=yes
@@ -13468,7 +13476,7 @@ fi
 set dummy update-mime-database; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UPDATE_MIME_DATABASE+:} false; then :
+if test "${ac_cv_path_UPDATE_MIME_DATABASE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $UPDATE_MIME_DATABASE in
@@ -13709,7 +13717,7 @@ and DBUS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -13821,7 +13829,7 @@ and MONO_ADDINS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	MONO_ADDINS_CFLAGS=$pkg_cv_MONO_ADDINS_CFLAGS
 	MONO_ADDINS_LIBS=$pkg_cv_MONO_ADDINS_LIBS
@@ -13936,7 +13944,7 @@ and GNOME_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
 	GNOME_LIBS=$pkg_cv_GNOME_LIBS
@@ -14026,7 +14034,7 @@ and GNOME_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
 	GNOME_LIBS=$pkg_cv_GNOME_LIBS
@@ -14119,7 +14127,7 @@ and GTKSHARP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	GTKSHARP_CFLAGS=$pkg_cv_GTKSHARP_CFLAGS
 	GTKSHARP_LIBS=$pkg_cv_GTKSHARP_LIBS
@@ -14518,7 +14526,7 @@ fi
 set dummy nunit-console; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NUNIT+:} false; then :
+if test "${ac_cv_path_NUNIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $NUNIT in
@@ -14587,8 +14595,8 @@ if test "x$with_x" = xno; then
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
-    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
@@ -14865,7 +14873,7 @@ if ac_fn_c_try_link "$LINENO"; then :
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14899,14 +14907,14 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14940,7 +14948,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
@@ -14959,14 +14967,14 @@ rm -f core conftest.err conftest.$ac_objext \
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
     ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = xyes; then :
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
 
 fi
 
     if test $ac_cv_func_gethostbyname = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15000,14 +15008,14 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15041,7 +15049,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -15056,14 +15064,14 @@ fi
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
     ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
+if test "x$ac_cv_func_connect" = x""yes; then :
 
 fi
 
     if test $ac_cv_func_connect = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
 $as_echo_n "checking for connect in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_connect+:} false; then :
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15097,7 +15105,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
 $as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = xyes; then :
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
@@ -15105,14 +15113,14 @@ fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
     ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = xyes; then :
+if test "x$ac_cv_func_remove" = x""yes; then :
 
 fi
 
     if test $ac_cv_func_remove = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
 $as_echo_n "checking for remove in -lposix... " >&6; }
-if ${ac_cv_lib_posix_remove+:} false; then :
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15146,7 +15154,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
 $as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = xyes; then :
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
@@ -15154,14 +15162,14 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = xyes; then :
+if test "x$ac_cv_func_shmat" = x""yes; then :
 
 fi
 
     if test $ac_cv_func_shmat = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
 $as_echo_n "checking for shmat in -lipc... " >&6; }
-if ${ac_cv_lib_ipc_shmat+:} false; then :
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15195,7 +15203,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -15213,7 +15221,7 @@ fi
   # John Interrante, Karl Berry
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15247,7 +15255,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -15259,7 +15267,7 @@ CFLAGS="$CFLAGS $X_CFLAGS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
 ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xlib_h" = xyes; then :
+if test "x$ac_cv_header_X11_Xlib_h" = x""yes; then :
   HAVE_X="yes"
 else
   HAVE_X="no"
@@ -15371,21 +15379,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
+    test "x$cache_file" != "x/dev/null" &&
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
+    cat confcache >$cache_file
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -15513,7 +15510,7 @@ if test -z "${HAVE_NUNIT_TRUE}" && test -z "${HAVE_NUNIT_FALSE}"; then
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -15614,7 +15611,6 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -15921,8 +15917,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.7.6, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by tomboy $as_me 1.8.0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -15987,8 +15983,8 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-tomboy config.status 1.7.6
-configured by $0, generated by GNU Autoconf 2.68,
+tomboy config.status 1.8.0
+configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -16410,7 +16406,7 @@ do
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -16433,10 +16429,9 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
   trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -16444,13 +16439,12 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -16472,7 +16466,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -16500,7 +16494,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -16548,7 +16542,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -16580,7 +16574,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -16614,7 +16608,7 @@ fi # test -n "$CONFIG_FILES"
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -16626,8 +16620,8 @@ _ACEOF
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -16728,7 +16722,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -16747,7 +16741,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -16756,7 +16750,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -16782,8 +16776,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -16919,22 +16913,21 @@ s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -16945,20 +16938,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
+      mv "$tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
@@ -17116,6 +17109,7 @@ $as_echo X"$file" |
 
 # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
diff --git a/configure.in b/configure.in
index 72c9cbe..972c164 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 1.7.6)
+AC_INIT(tomboy, 1.8.0)
 AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
 AM_INIT_AUTOMAKE([foreign tar-ustar])
 AM_MAINTAINER_MODE
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
index 0da2cf9..bc2a61f 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -361,7 +361,7 @@ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
 
 ## @ _DOC_POT
 ## A pot file
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
 .PHONY: pot
 pot: $(_DOC_POT)
 $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
diff --git a/help/Makefile.in b/help/Makefile.in
index 59e53de..00a4a66 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -348,7 +348,7 @@ _DOC_SRC_FIGURES = \
 	$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS),	\
 		$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
 
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
 
 ################################################################################
 _DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
diff --git a/ltmain.sh b/ltmain.sh
index 950feee..fa4b1e1 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=2.2.6b
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
 TIMESTAMP=""
-package_revision=1.3018
+package_revision=1.3017
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@ $lt_unset CDPATH
 
 : ${CP="cp -f"}
 : ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/usr/bin/sed"}
+: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -5033,7 +5033,10 @@ func_mode_link ()
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5344,19 +5347,19 @@ func_mode_link ()
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_duplicate_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		esac
+	      fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
@@ -5893,6 +5896,7 @@ func_mode_link ()
 	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
+	      path=
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
@@ -6206,6 +6210,9 @@ func_mode_link ()
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
 	  esac
 	  ;;
 	no)
diff --git a/po/ar.po b/po/ar.po
index 4db538d..4996494 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,61 +1,66 @@
 # translation of tomboy.HEAD.ar.po to Arabic
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-#
 # Yousef Raffah <yousef at raffah.com>, 2006.
 # Djihed Afifi <djihed at gmail.com>, 2006.
 # Khaled Hosny <khaledhosny at eglug.org>, 2006, 2007.
 # Ahmad Farghal <ahmad.farghal at gmail.com>, 2007.
 # Anas Husseini <linux.anas at gmail.com>, 2007.
 # Anas Afif Emad <anas.e87 at gmail.com>, 2008.
+# Anass Ahmed <anass.1430 at gmail.com>, 2011.
+# Abdalrahim G. Fakhouri <abdilra7eem at yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 16:03+0000\n"
-"PO-Revision-Date: 2008-09-16 15:46+0300\n"
-"Last-Translator: Anas Afif Emad <anas.e87 at gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-20 20:09+0000\n"
+"PO-Revision-Date: 2011-09-21 19:10+0300\n"
+"Last-Translator: Abdalrahim G. Fakhouri <abdilra7eem at yahoo.com>\n"
 "Language-Team: Arabic <doc at arabeyes.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-DamnedLies-Scope: partial\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
 msgstr "كماليات"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:2
-#: ../data/tomboy.desktop.in.h:2
 msgid "Simple and easy to use note-taking"
-msgstr "تسجيل ملاحظات بسيط و سهل الاستخدام"
+msgstr "تسجيل ملاحظات بسيط وسهل الاستخدام"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:3
 msgid "Tomboy Applet Factory"
-msgstr "مصنع بريمجات Tomboy"
+msgstr "مصنع بريمجات تومبوي"
 
-#: ../data/GNOME_TomboyApplet.server.in.in.h:4
-#: ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:514
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
+#: ../Tomboy/Tray.cs:579
 msgid "Tomboy Notes"
-msgstr "ملاحظات Tomboy"
+msgstr "ملاحظات تومبوي"
+
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:274
+msgid "S_ynchronize Notes"
+msgstr "_زامن الملاحظات"
 
-#: ../data/GNOME_TomboyApplet.xml.h:1
-#: ../Tomboy/ActionManager.cs:164
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
 msgstr "_حول"
 
-#: ../data/GNOME_TomboyApplet.xml.h:2
-#: ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:223
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:288
 msgid "_Help"
 msgstr "م_ساعدة"
 
-#: ../data/GNOME_TomboyApplet.xml.h:3
-#: ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:218
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:283
 msgid "_Preferences"
 msgstr "ت_فضيلات"
 
@@ -63,234 +68,526 @@ msgstr "ت_فضيلات"
 msgid "Note-taker"
 msgstr "مسجل الملاحظات"
 
+#: ../data/tomboy.desktop.in.h:2
+msgid "Take notes, link ideas, and stay organized"
+msgstr "دوِّن ملاحظاتك، واربط أفكارك، وابقَ منظمًا"
+
 #: ../data/tomboy.schemas.in.h:1
-msgid "Create a new Note"
-msgstr "أنشئ ملاحظة جديدة"
+msgid "Accept SSL Certificates"
+msgstr "اقبل شهادات SSL"
 
 #: ../data/tomboy.schemas.in.h:2
-msgid "Custom Font Face"
-msgstr "وجه خط خاص"
+msgid "Automatic Background Synchronization Timeout"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:3
-msgid "Enable Auto bulleted lists."
-msgstr "فعّل الترتيب الآلي للقوائم."
+msgid "Create a new Note"
+msgstr "أنشئ ملاحظة جديدة"
 
 #: ../data/tomboy.schemas.in.h:4
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "فعّل أيقونة اللصق بالنقر الأوسط."
+msgid "Custom Font Face"
+msgstr "وجه خط خاص"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Enable WikiWord highlighting"
-msgstr "فعّل تظليل كلمات الويكي"
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"يحدد الإحداثيات السينيّة لنافذة \"البحث في كلّ الملاحظات\" ؛ تحفظ عند إغلاق "
+"تومبوي."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Enable closing notes with escape."
-msgstr "فعّل غلق الملاحظات بـالزر ESC"
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"يحدد الإحداثيات الصاديّة لنافذة \"البحث في كلّ الملاحظات\" ؛ تحفظ عند إغلاق "
+"تومبوي."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Enable custom font"
-msgstr "فعّل خط خاص"
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"تحدّد ارتفاع نافذة \"البحث في كل الملاحظات\" بوحدة البكسِل؛ تحفظ عند إغلاق "
+"تومبوي."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Enable global keybindings"
-msgstr "فعّل إرتباطات المفاتيح العامة"
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"تحدّد عرض نافذة \"البحث في كل الملاحظات\" بوحدة البكسِل؛ تحفظ عند إغلاق تومبوي."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable spellchecking"
-msgstr "فعّل المدقق الإملائي"
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "فعّل أيقونة اللصق بالنقر الأوسط."
 
 #: ../data/tomboy.schemas.in.h:10
-msgid "Enable startup notes"
-msgstr "فعّل ملاحظات البدء"
+msgid "Enable Tray Icon"
+msgstr "فعِّل أيقونة مساحة الإبلاغ"
 
 #: ../data/tomboy.schemas.in.h:11
-msgid "Enable this option if you want bulleted lists to be automatic when you place - or * at the beginning of a line."
-msgstr "فعّل هذه اذا أردت أن تكون كتابة القوائم آلية عند وضع - أو * في بداية السطر."
+msgid "Enable WikiWord highlighting"
+msgstr "فعّل تظليل كلمات الويكي"
 
 #: ../data/tomboy.schemas.in.h:12
-msgid "Enable this option if you want to be able to middle-click the Tomboy icon to paste timestamped content into the Start Here note."
-msgstr "فعّل هذه اذا أردت أن تكون قادرا على النقر الأوسط على ايقونة Tomboy للصق محتويات وقتية على ملاحظة \"ابدأ هنا\"."
+msgid "Enable automatic bulleted lists."
+msgstr "فعّل القوائم المنقطة آليًّا."
 
 #: ../data/tomboy.schemas.in.h:13
-msgid "Enable this option to highlight words ThatLookLikeThis. Clicking the word will create a note with that name."
-msgstr "فعّل هذا الخيار لتظليل الكلمات التي تبدو هكذا ThatLookLikeThis. بالضغط على الكلمة سيتم إنشاء ملاحظة جديدة بنفس الاسم."
+msgid "Enable closing notes with escape."
+msgstr "فعّل غلق الملاحظات بـالزر ESC."
 
 #: ../data/tomboy.schemas.in.h:14
-msgid "HTML Export All Linked Notes"
-msgstr "صدّر كل الملاحظات المرتبطة بصيغة HTML"
+msgid "Enable custom font"
+msgstr "فعّل خط خاص"
 
 #: ../data/tomboy.schemas.in.h:15
-msgid "HTML Export Last Directory"
-msgstr "آخر دليل لتصدير HTML"
+msgid "Enable global keybindings"
+msgstr "فعّل إرتباطات المفاتيح العامة"
 
 #: ../data/tomboy.schemas.in.h:16
-msgid "HTML Export Linked Notes"
-msgstr "صدّر الملاحظات المرتبطة بصيغة HTML"
+msgid "Enable spellchecking"
+msgstr "فعّل المدقق الإملائي"
 
 #: ../data/tomboy.schemas.in.h:17
-msgid "If enable_custom_font is true, the font name set here will be used as the font when displaying notes."
-msgstr "إن كان enable_custom_font true ، سيتم استخدام مجموعة اسم الخط هنا كاسم للخط عند إظهار الملاحظات"
+msgid "Enable startup notes"
+msgstr "فعّل ملاحظات البدء"
 
 #: ../data/tomboy.schemas.in.h:18
-msgid "If enabled, all notes that were open when Tomboy quit will automatically be reopened at startup."
-msgstr "عند تفعيله، ستُفتح آليًا عند بدء التشغيل كل الملاحظات التي كانت مفتوحة وقت إغلاق توم‌بوي"
+msgid "Enable the Delete Note confirmation dialog"
+msgstr "فعّل حوار تأكيد حذف الملاحظة"
 
 #: ../data/tomboy.schemas.in.h:19
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr "إذا كان مفعّلا، لا يمكن غلق ملاحظة مفتوحة بالضغط على الزر ESC"
+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:20
-msgid "If true, misspellings will be underlined in red, and correct spelling suggestions shown in the right-click menu."
-msgstr "إن كانت صحيحة، سيتم وضع سطر أحمر تحت الكلمات الخاطئة و الإقتراحات الصحيحة ستظهر في قائمة الزر الأيمن"
+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 ""
+"فعّل هذه اذا أردت أن تكون قادرا على النقر الأوسط على ايقونة تومبوي للصق "
+"محتويات وقتية على ملاحظة ابدأ هنا."
 
 #: ../data/tomboy.schemas.in.h:21
-msgid "If true, the desktop-global keybindings set in /apps/tomboy/global_keybindings will be enabled, allowing for useful Tomboy actions to be available from any application."
-msgstr "إن كانت صحيحة، مجموعة إرتباطات المفاتيح العامة لسطح المكتب في /apps/tomboy/ إرتباطات المفاتيح العامة سيتم تفعيلها، مما سيسمح لبعض إجراءات tomboy العملية بأن تكون متوفرة لأي تطبيق"
+msgid ""
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
+msgstr ""
+"فعّل هذا الخيار لتظليل الكلمات التي تبدو هكذا ThatLookLikeThis. بالضغط على "
+"الكلمة سيتم إنشاء ملاحظة جديدة بنفس الاسم."
 
 #: ../data/tomboy.schemas.in.h:22
-msgid "If true, the font name set in custom_font_face will be used as the font when displaying notes. Otherwise the desktop default font will be used."
-msgstr "إن كانت صحيحة، سيتم استخدام مجموعة اسم الخط في custom_font_face كاسم للخط عند إظهار الملاحظات. ما عدا ذلك سيتم استخدام الخط الإفتراضي للواجهة الرسومية"
+msgid "FUSE Mounting Timeout (ms)"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:23
-msgid "Indicates that the Sticky Note Importer plugin has not been run, so it should run automatically the next time Tomboy starts."
-msgstr "يشير إلى أن مستورد الملاحظات اللاصقة لم يتم تشغيله، إذن سيتم تشغيله آليا عند التشغيل التالي لتوم‌بوي"
+msgid "HTML Export All Linked Notes"
+msgstr "صدّر كل الملاحظات المرتبطة بصيغة HTML"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "Integer determining the minimum number of notes to show in the Tomboy note menu."
-msgstr "رقم صحيح يحدد العدد الأدنى من الملاحظات التي يتم إظهارها في قائمة ملاحظات Tomboy."
+msgid "HTML Export Linked Notes"
+msgstr "صدّر الملاحظات المرتبطة بصيغة HTML"
 
 #: ../data/tomboy.schemas.in.h:25
-msgid "Integer value indicating if there is a preference to always perform a specific behavior when a conflict is detected, instead of prompting the user. The values map to an internal enumeration. 0 indicates that the user wishes to be prompted when a conflict occurs, so that they may handle each conflict situation on a case-by-case basis."
-msgstr "قيمة عدد صحيح تشير إلى وجود تفضيل للتصرف دائمًا بسلوك معين في حال اكتشاف تضارب، عوضًا عن سؤال المستخدم. هذه القيم معينة وفق ترقيم داخلي. 0 يشير إلى أن المستخدم يريد أن يُسأل عندما يحدث التضارب، بحيث يمكنه التعامل مع كل تضارب حسب حالته."
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:26
+msgid ""
+"If enable_custom_font is true, the font name set here will be used as the "
+"font when displaying notes."
+msgstr ""
+"إن كان enable_custom_font true ، سيتم استخدام مجموعة اسم الخط هنا كاسم للخط "
+"عند إظهار الملاحظات."
+
+#: ../data/tomboy.schemas.in.h:27
+msgid ""
+"If enabled, all notes that were open when Tomboy quit will automatically be "
+"reopened at startup."
+msgstr ""
+"عند تفعيله، ستُفتح آليًا عند بدء التشغيل كل الملاحظات التي كانت مفتوحة وقت "
+"إغلاق تومبوي."
+
+#: ../data/tomboy.schemas.in.h:28
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr "إذا كان مفعّلا، لا يمكن غلق ملاحظة مفتوحة بالضغط على الزر ESC."
+
+#: ../data/tomboy.schemas.in.h:29
+msgid ""
+"If true, Tomboy's tray icon will be displayed in the notification area. "
+"Disabling this may be useful when another application is providing the "
+"functionality of the tray icon."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:30
+msgid ""
+"If true, misspellings will be underlined in red, and correct spelling "
+"suggestions shown in the right-click menu."
+msgstr ""
+"إن كانت صحيحة، سيتم وضع سطر أحمر تحت الكلمات الخاطئة و الإقتراحات الصحيحة "
+"ستظهر في قائمة الزر الأيمن."
+
+#: ../data/tomboy.schemas.in.h:31
+msgid ""
+"If true, the desktop-global keybindings set in /apps/tomboy/"
+"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
+"available from any application."
+msgstr ""
+"إن كانت صحيحة، مجموعة إرتباطات المفاتيح العامة لسطح المكتب في /apps/tomboy/"
+"global_keybindings سيتم تفعيلها، مما سيسمح لبعض إجراءات تومبوي العملية بأن "
+"تكون متوفرة لأي تطبيق."
+
+#: ../data/tomboy.schemas.in.h:32
+msgid ""
+"If true, the font name set in custom_font_face will be used as the font when "
+"displaying notes. Otherwise the desktop default font will be used."
+msgstr ""
+"إن كانت صحيحة، سيتم استخدام مجموعة اسم الخط في custom_font_face كاسم للخط "
+"عند إظهار الملاحظات. ما عدا ذلك سيتم استخدام الخط الإفتراضي للواجهة الرسومية."
+
+#: ../data/tomboy.schemas.in.h:33
+msgid ""
+"Indicates that the Sticky Note Importer plugin has not been run, so it "
+"should run automatically the next time Tomboy starts."
+msgstr ""
+"يشير إلى أن مستورد الملاحظات اللاصقة لم يتم تشغيله، إذن سيتم تشغيله آليا عند "
+"التشغيل التالي لتومبوي."
+
+#: ../data/tomboy.schemas.in.h:34
+msgid ""
+"Integer determining the minimum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"رقم صحيح يحدد العدد الأدنى من الملاحظات التي يتم إظهارها في قائمة ملاحظات "
+"تومبوي."
+
+#: ../data/tomboy.schemas.in.h:35
+msgid ""
+"Integer value indicating how frequently to perform a background sync of your "
+"notes (when sync is configured). Any value less than 1 indicates that "
+"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
+"minutes."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:36
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific behavior when a conflict is detected, instead of prompting the "
+"user. The values map to an internal enumeration. 0 indicates that the user "
+"wishes to be prompted when a conflict occurs, so that they may handle each "
+"conflict situation on a case-by-case basis."
+msgstr ""
+"قيمة عدد صحيح تشير إلى وجود تفضيل للتصرف دائمًا بسلوك معين في حال اكتشاف "
+"تضارب، عوضًا عن سؤال المستخدم. هذه القيم معينة وفق ترقيم داخلي. 0 يشير إلى أن "
+"المستخدم يريد أن يُسأل عندما يحدث التضارب، بحيث يمكنه التعامل مع كل تضارب حسب "
+"حالته."
+
+#: ../data/tomboy.schemas.in.h:37
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific link updating behavior when a note is renamed, instead of prompting "
+"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:38
+msgid "Last Directory used in HTML Export"
+msgstr "آخر مجلد مستخدم لتصدير HTML"
+
+#: ../data/tomboy.schemas.in.h:39
+msgid "Link Updating Behavior on Note Rename"
+msgstr "سلوك تحديث الروابط عند تغيير أسماء الملاحظات"
+
+#: ../data/tomboy.schemas.in.h:40
 msgid "List of pinned notes."
 msgstr "قائمة الملاحظات المثبتة."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:41
+msgid ""
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
+msgstr ""
+"أقصى طول لعنوان الملاحظة لإظهاره في قائمة أيقونة مساحة الإبلاغ أو بريمج "
+"الشريط التابع لتومبوي."
+
+#: ../data/tomboy.schemas.in.h:42
+msgid "Maximum note title length to show in tray menu."
+msgstr "أقصى طول لعنوان الملاحظة لإظهاره في قائمة مساحة الإبلاغ."
+
+#: ../data/tomboy.schemas.in.h:43
 msgid "Minimum number of notes to show in menu"
 msgstr "أقل عدد من الملاحظات يمكن إظهاره في القائمة"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:44
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "السلوك المحفوظ عند تصارب مزامنة الملاحظات"
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:45
 msgid "Open Recent Changes"
 msgstr "افتح التعديلات الأخيرة"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:46
 msgid "Open Search Dialog"
 msgstr "افتح مربع حوار البحث"
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:47
 msgid "Open Start Here"
 msgstr "افتح ابدأ هنا"
 
-#: ../data/tomboy.schemas.in.h:32
-msgid "Path to the synchronization server when using the filesystem synchronization service addin."
+#: ../data/tomboy.schemas.in.h:48
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr "مسار على خادوم SSH لمجلد مزامنة تومبوي (اختياري)."
+
+#: ../data/tomboy.schemas.in.h:49
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
 msgstr "المسار في الخادوم المزامن عند استخدام ملحقة خدمة مزامنة نظام الملفات."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:50
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "مجلد مزامنة SSHFS البعيد"
+
+#: ../data/tomboy.schemas.in.h:51
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "اسم مستخدم مزامنة SSHFS البعيد"
+
+#: ../data/tomboy.schemas.in.h:52
+msgid "SSHFS Synchronization Server Port"
+msgstr "منفذ خادوم مزامنة SSHFS"
+
+#: ../data/tomboy.schemas.in.h:53
+msgid "SSHFS Synchronization Server URL"
+msgstr "مسار خادوم مزامنة SSHFS"
+
+#: ../data/tomboy.schemas.in.h:54
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "الارتفاع المحفوظ لنافذة \"البحث في كافة الملاحظات\""
+
+#: ../data/tomboy.schemas.in.h:55
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "الموضع الأفقي المحفوظ لنافذة \"البحث في كافة الملاحظات\""
+
+#: ../data/tomboy.schemas.in.h:56
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "الموضع الرأسي المحفوظ لنافذة \"البحث في كافة الملاحظات\""
+
+#: ../data/tomboy.schemas.in.h:57
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "العرض المحفوظ لنافذة \"البحث في كافة الملاحظات\""
+
+#: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
 msgstr "ملحقة خدمة المزامنة المحددة"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:59
 msgid "Set to TRUE to activate"
 msgstr "اضبط إلى TRUE للتنشيط"
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:60
 msgid "Show applet menu"
 msgstr "اظهر قائمة البريمج"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:61
 msgid "Start Here Note"
 msgstr "ابدأ الملاحظة هنا"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:62
 msgid "Sticky Note Importer First Run"
 msgstr "التشغيل الأول لمستورد الملاحظات اللاصقة"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:63
 msgid "Synchronization Client ID"
 msgstr "مزامنة هوية العميل"
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:64
 msgid "Synchronization Local Server Path"
 msgstr "مزامنة مسار الخادوم المحلي"
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:65
 msgid "The date format that is used for the timestamp."
 msgstr "نسق التاريخ لقالب الوقت."
 
-#: ../data/tomboy.schemas.in.h:41
-msgid "The global keybinding for creating and displaying a new Note. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "إرتباط المفاتيح العالمي لإنشاء و عرض ملاحظة جديدة. النمط يكون على النحو التالي \"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي متحرر بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات مثل \"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled\"، فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية"
+#: ../data/tomboy.schemas.in.h:66
+msgid ""
+"The global keybinding for creating and displaying a new Note. The format "
+"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
+"parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
+msgstr ""
+"إرتباط المفاتيح العالمي لإنشاء و عرض ملاحظة جديدة. النمط يكون على النحو "
+"التالي \"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي "
+"متحرر بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات "
+"مثل \"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled"
+"\"، فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية."
 
-#: ../data/tomboy.schemas.in.h:42
-msgid "The global keybinding for opening the \"Start Here\" note. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "إرتباط المفاتيح العالمي لفتح ملاحظة \"ابدأ هنا\". النمط يكون على النحو التالي \"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي متحرر بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات مثل \"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled\"، فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية"
+#: ../data/tomboy.schemas.in.h:67
+msgid ""
+"The global keybinding for opening the \"Start Here\" note. The format looks "
+"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"إرتباط المفاتيح العالمي لفتح ملاحظة \"ابدأ هنا\" . النمط يكون على النحو "
+"التالي \"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي "
+"متحرر بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات "
+"مثل \"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled"
+"\"، فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية."
 
-#: ../data/tomboy.schemas.in.h:43
-msgid "The global keybinding for opening the Note Search dialog. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "إرتباط المفاتيح العالمي لفتح مربع حوار بحث الملاحظات. النمط يكون على النحو التالي \"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي متحرر بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات مثل \"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled\"، فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية"
+#: ../data/tomboy.schemas.in.h:68
+msgid ""
+"The global keybinding for opening the Note Search dialog. The format looks "
+"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"إرتباط المفاتيح العالمي لفتح مربع حوار بحث الملاحظات. النمط يكون على النحو "
+"التالي \"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي "
+"متحرر بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات "
+"مثل \"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled"
+"\"، فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية."
 
-#: ../data/tomboy.schemas.in.h:44
-msgid "The global keybinding for opening the Recent Changes dialog. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "إرتباط المفاتيح العالمي لفتح مربع حوار آخر التعديلات. النمط يكون على النحو التالي \"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي متحرر بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات مثل \"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled\"، فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية"
+#: ../data/tomboy.schemas.in.h:69
+msgid ""
+"The global keybinding for opening the Recent Changes dialog. The format "
+"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
+"parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
+msgstr ""
+"إرتباط المفاتيح العالمي لفتح مربع حوار آخر التعديلات. النمط يكون على النحو "
+"التالي \"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي "
+"متحرر بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات "
+"مثل \"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled"
+"\"، فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية."
 
-#: ../data/tomboy.schemas.in.h:45
-msgid "The global keybinding for showing the Tomboy applet's menu. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "إرتباط المفاتيح العالمي لعرض قائمة بريمج Tomboy. النمط يكون على النحو التالي \"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي متحرر بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات مثل \"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled\"، فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية"
+#: ../data/tomboy.schemas.in.h:70
+msgid ""
+"The global keybinding for showing the Tomboy applet's menu. The format looks "
+"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"إرتباط المفاتيح العالمي لعرض قائمة بريمج تومبوي. النمط يكون على النحو التالي "
+"\"<Control>a\" أو \"<Shift><Alt>F1\". المعرب اللغوي متحرر "
+"بإنصاف و يسمح بحالات الحروف الصغيرة أو الكبيرة، كما يسمح بالإختصارات مثل "
+"\"<Ctl>\" و \"<Ctrl>\". إذا ضبطت الخيار للنص الخاص \"disabled\"، "
+"فحينها لن يكون هناك إرتباط للمفاتيح لهذه العملية."
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:71
 msgid "The handler for \"note://\" URLs"
 msgstr "العامل الخاص لعناوين \"note://\""
 
-#: ../data/tomboy.schemas.in.h:47
-msgid "The last directory a note was exported to using the Export To HTML plugin."
-msgstr "آخر دليل تم تصدير ملاحظة إليه باستخدام الملحق تصدير بصيغة HTML"
+#: ../data/tomboy.schemas.in.h:72
+msgid ""
+"The last directory a note was exported to using the Export To HTML plugin."
+msgstr "آخر دليل تم تصدير ملاحظة إليه باستخدام الملحق تصدير بصيغة HTML."
 
-#: ../data/tomboy.schemas.in.h:48
-msgid "The last setting for the 'Export linked notes' checkbox in the Export to HTML plugin."
-msgstr "آخر الإعدادات لـصندوق الاختيار \"صدّر الملاحظات المرتبطة\" في ملحق التصدير بصيغة HTML"
+#: ../data/tomboy.schemas.in.h:73
+msgid ""
+"The last setting for the 'Export linked notes' checkbox in the Export to "
+"HTML plugin."
+msgstr ""
+"آخر الإعدادات لـصندوق الاختيار 'صدّر الملاحظات المرتبطة' في ملحق التصدير "
+"بصيغة HTML."
 
-#: ../data/tomboy.schemas.in.h:49
-msgid "The last setting for the 'Include all other linked notes' checkbox in the Export to HTML plugin. This setting is used in conjunction with the 'HTML Export Linked Notes' setting and is used to specify whether all notes (found recursively) should be included during an export to HTML."
-msgstr "آخر إعداد لخانة التأشير 'ضَمِّن كل الملاحظات المرتبطة' في ملحق التصدير لـHTML. يتم استخدام هذا الإعداد بالإضافة إلى الإعداد 'صدّر الملاحظات المرتبطة بصيغة HTML' لتحديد ما إذا كان سيتم تضمين كل الملاحظات (التي تم العثور عليها بصورة رجعية) عند التصدير لـHTML."
+#: ../data/tomboy.schemas.in.h:74
+msgid ""
+"The last setting for the 'Include all other linked notes' checkbox in the "
+"Export to HTML plugin. This setting is used in conjunction with the 'HTML "
+"Export Linked Notes' setting and is used to specify whether all notes (found "
+"recursively) should be included during an export to HTML."
+msgstr ""
+"آخر إعداد لخانة التأشير 'ضَمِّن كل الملاحظات المرتبطة' في ملحق التصدير لـHTML. "
+"يتم استخدام هذا الإعداد بالإضافة إلى الإعداد 'صدّر الملاحظات المرتبطة بصيغة "
+"HTML' لتحديد ما إذا كان سيتم تضمين كل الملاحظات (التي تم العثور عليها بصورة "
+"رجعية) عند التصدير لـHTML."
 
-#: ../data/tomboy.schemas.in.h:50
-msgid "The note URI of the note that should be considered the \"Start Here\" note, which is always placed at the bottom of the Tomboy note menu and also accessible by hotkey."
-msgstr "عنوان الملاحظة التي يجب اعتبارها ملاحظة \"ابدأ هنا\" والتي يتم وضعها دائمًا في آخر قائمة ملاحظات Tomboy ويمكن أيضًا الوصول لها بمفتاح اختصار."
+#: ../data/tomboy.schemas.in.h:75
+msgid ""
+"The note URI of the note that should be considered the \"Start Here\" note, "
+"which is always placed at the bottom of the Tomboy note menu and also "
+"accessible by hotkey."
+msgstr ""
+"عنوان الملاحظة التي يجب اعتبارها ملاحظة \"ابدأ هنا\" والتي يتم وضعها دائمًا "
+"في آخر قائمة ملاحظات تومبوي ويمكن أيضًا الوصول لها بمفتاح اختصار."
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:76
+#, fuzzy
+#| msgid ""
+#| "User name to use when connecting to the synchronization server via SSH."
+msgid ""
+"The port to use when connecting to the synchronization server via SSH. Set "
+"to -1 or less if default SSH port settings should be used instead."
+msgstr "اسم المستخدم عند الاتصال بخادوم مزامنة عبر SSH."
+
+#: ../data/tomboy.schemas.in.h:77
+msgid ""
+"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
+"mount a sync share."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:78
 msgid "Timestamp format"
 msgstr "تنسيق القالب الوقتي"
 
-#: ../data/tomboy.schemas.in.h:52
-msgid "Unique identifier for the currently configured note synchronization service addin."
-msgstr "معرّف فريد لملحقة خدمة مزامنة الملاحظات المعدّة حاليًا."
+#: ../data/tomboy.schemas.in.h:79
+msgid "URL of SSH server containing Tomboy synchronization directory."
+msgstr "مسار خادوم SSH يحتوي على مجلد مزامنة تومبوي."
 
-#: ../data/tomboy.schemas.in.h:53
-msgid "Unique identifier for this Tomboy client, used when communicating with a sychronization server."
-msgstr "معرّف فريد لعميل Tomboy هذا، يُستخدم عند الاتصال بخادوم مزامنة."
+#: ../data/tomboy.schemas.in.h:80
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr "معرّف فريد لملحقة خدمة مزامنة الملاحظات المعدّة حاليًا."
 
-#: ../data/tomboy.schemas.in.h:54
-msgid "Whitespace-separated list of note URIs for notes that should always appear in the Tomboy note menu."
-msgstr "قائمة تفصلها مساحات بيضاء تحتوي على عناوين الملاحظات التي يجب أن تظهر دائمًا في قائمة ملاحظات Tomboy."
+#: ../data/tomboy.schemas.in.h:81
+msgid ""
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
+msgstr "معرّف فريد لعميل تومبوي هذا، يُستخدم عند الاتصال بخادوم مزامنة."
 
-#: ../Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Add-in"
-msgstr "ملحق"
+#: ../data/tomboy.schemas.in.h:82
+msgid ""
+"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
+"user."
+msgstr "استخدم خيار ‪\"-ac\"‬ ل wdfs لقبول شهادات SSL دون سؤال المستخدم."
 
-#: ../Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-msgid "Version"
-msgstr "إصدار"
+#: ../data/tomboy.schemas.in.h:83
+msgid "User name to use when connecting to the synchronization server via SSH."
+msgstr "اسم المستخدم عند الاتصال بخادوم مزامنة عبر SSH."
 
-#. Default category name to use if no category is specified for this addin
-#: ../Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:169
-msgid "Other"
-msgstr "أخرى"
+#: ../data/tomboy.schemas.in.h:84
+msgid ""
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Tomboy note menu."
+msgstr ""
+"قائمة تفصلها مساحات بيضاء تحتوي على عناوين الملاحظات التي يجب أن تظهر دائمًا "
+"في قائمة ملاحظات تومبوي."
 
 #: ../Tomboy/ActionManager.cs:127
 msgid "_File"
@@ -300,8 +597,7 @@ msgstr "_ملف"
 msgid "_New"
 msgstr "_جديد"
 
-#: ../Tomboy/ActionManager.cs:131
-#: ../Tomboy/ActionManager.cs:172
+#: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
 msgid "Create a new note"
 msgstr "اصنع ملاحظة جديدة"
 
@@ -321,8 +617,7 @@ msgstr "_احذف"
 msgid "Delete the selected note"
 msgstr "احذف الملاحظة المختارة"
 
-#: ../Tomboy/ActionManager.cs:142
-#: ../Tomboy/NoteWindow.cs:412
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "اغل_ق"
 
@@ -330,23 +625,21 @@ msgstr "اغل_ق"
 msgid "Close this window"
 msgstr "أقفل هذه النافذة"
 
-#: ../Tomboy/ActionManager.cs:146
-#: ../Tomboy/Tray.cs:235
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
 msgid "_Quit"
 msgstr "إن_هي"
 
 #: ../Tomboy/ActionManager.cs:147
 msgid "Quit Tomboy"
-msgstr "_اخرج من توم‌بوي"
+msgstr "اخرج من تومبوي"
 
 #: ../Tomboy/ActionManager.cs:150
 msgid "_Edit"
 msgstr "_عدل"
 
-#: ../Tomboy/ActionManager.cs:154
-#: ../Tomboy/PreferencesDialog.cs:63
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
-msgstr "تقضيلات Tomboy"
+msgstr "تقضيلات تومبوي"
 
 #: ../Tomboy/ActionManager.cs:160
 msgid "_Contents"
@@ -356,7 +649,7 @@ msgstr "_المحتويات"
 msgid "Tomboy Help"
 msgstr "مساعدة توم‌بوي"
 
-#: ../Tomboy/ActionManager.cs:165
+#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
 msgid "About Tomboy"
 msgstr "حول توم‌بوي"
 
@@ -368,8 +661,7 @@ msgstr "رمز مساحة التبليغ"
 msgid "Create _New Note"
 msgstr "أ_نشيء ملاحظة جديدة"
 
-#: ../Tomboy/ActionManager.cs:175
-#: ../Tomboy/NoteWindow.cs:355
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "اب_حث في كل الملاحظات"
 
@@ -377,135 +669,151 @@ msgstr "اب_حث في كل الملاحظات"
 msgid "Open the Search All Notes window"
 msgstr "افتح نافذة البحث في كل الملاحظات"
 
-#: ../Tomboy/ActionManager.cs:179
-msgid "S_ynchronize Notes"
-msgstr "_زامن الملاحظات"
-
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
 msgstr "ابدأ مزامنة الملاحظات"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:25
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "متقدم"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "أقل عدد من الملاحظات يمكن إظهاره في قائمة الأحدث (الحد الأقصى 18)"
+
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "ماذا يربط هنا؟"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:83
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(لا شيء)"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:32
-msgid "You can use any bugzilla just by dragging links into notes.  If you want a special icon for certain hosts, add them here."
-msgstr "يمكنك استعمال وصلات بغزيلا في ملاحظاتك. اذا اردت ايقونا ما لموقع، اضفه هنا."
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:23
+msgid ""
+"You can use any bugzilla just by dragging links into notes.  If you want a "
+"special icon for certain hosts, add them here."
+msgstr ""
+"يمكنك استعمال أيّ متعقب علل بجزيلا بسحب الروابط إلى ملاحظاتك.  إذا أردت "
+"أيقونة خاصة لمواقع معينة، أضفها هنا."
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:50
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
 msgid "Host Name"
 msgstr "أسم المضيف"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:67
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:58
 msgid "Icon"
 msgstr "أيقونة"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:185
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:176
 msgid "Select an icon..."
 msgstr "أختر أيقونة..."
 
 #. Extra Widget
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:200
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:191
 msgid "_Host name:"
-msgstr "_أسم المضيف:"
+msgstr "_اسم المضيف:"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:229
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:220
 msgid "No host name specified"
 msgstr "لم يحدد أسم مضيف"
 
-#: ../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 "عليك أن تحدد اسم مضيف Bugzilla لاستخدامه مع هذه الأيقونة."
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:256
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
 msgid "Error saving icon"
 msgstr "خطأ أثناء حفظ الأيقونة"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:257
-msgid "Could not save the icon file.  "
-msgstr "غير قادر على حفظ ملف الأيقونة."
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
+msgid "Could not save the icon file."
+msgstr "تعذّر حفظ ملف الأيقونة."
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:310
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
 msgstr "هل تريد حقا حذف هذه الأيقونة؟"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:311
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
 msgid "If you remove an icon it is permanently lost."
 msgstr "إذا حذفت أيقونة فسوف تضيع للأبد."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:50
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "تعذر فتح البريد الإلكتروني"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "الهدف للتصدير بصيغة HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "صدّر الملاحظات المرتبطة"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "ضَمِّن كل الملاحظات المرتبطة"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "صدّر إلى HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:109
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "تم تصدير ملاحظتك إلى \"{0}\"."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:120
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
 msgid "Note exported successfully"
 msgstr "تم تصدير الملاحظة بنجاح"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "النفاذ ممنوع."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:128
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "المجلّد ليس موجودًا."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:143
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "غير قادر على حفظ الملف \"{0}\""
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "الهدف للتصدير بصيغة HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "صدّر الملاحظات المرتبطة"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "ضَمِّن كل الملاحظات المرتبطة"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:268
-msgid "Cannot open email"
-msgstr "تعذر فتح البريد الإلكتروني"
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:91
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "مسار الم_جلد:"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:101
-msgid "_Browse..."
-msgstr "ت_صفّح..."
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:120
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
 msgid "Select Synchronization Folder..."
 msgstr "اختر مجلد المزامنة..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:148
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "مجال مسار المجلد فارغ."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:157
-msgid "Specified folder path does not exist, and Tomboy was unable to create it."
-msgstr "مسار المجلد المحدد غير موجود، وعجز Tomboy عن إنشائه."
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
+msgid ""
+"Specified folder path does not exist, and Tomboy was unable to create it."
+msgstr "مسار المجلد المحدد غير موجود، وعجز تومبوي عن إنشائه."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:235
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "مجلّد محلي"
 
-#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:14
-msgid "_Fixed Width"
+#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
+msgid "Fixed Wid_th"
 msgstr "ثابت العر_ض"
 
 #: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
@@ -523,21 +831,20 @@ msgid "Insert Timestamp"
 msgstr "أدخل قالبا وقتيا"
 
 #. initial newline
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:30
-#: ../Tomboy/Applet.cs:205
-#: ../Tomboy/Preferences.cs:137
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd، MMMM d، h:mm tt"
 
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:55
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
 msgid "Choose one of the predefined formats or use your own."
 msgstr "استعمل الصيغ المعرّفة مسبّقا أو استعمل ما تريد."
 
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:63
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
 msgid "Use _Selected Format"
 msgstr "استعمل التنسيق الم_نتقى"
 
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:88
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:87
 msgid "_Use Custom Format"
 msgstr "اس_تعمل تنسيقا مخصّصا"
 
@@ -547,7 +854,7 @@ msgstr "اليوم: قالب"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:12
 msgid "Today: "
-msgstr "اليوم:"
+msgstr "اليوم: "
 
 #. Format: "Today: Friday, July 01 2005"
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
@@ -563,187 +870,83 @@ msgid "Appointments"
 msgstr "مواعيد"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-msgid "Change the <span weight=\"bold\">Today: Template</span> note to customize the text that new Today notes have."
-msgstr "غير ملاحظة <span weight=\"bold\">قالب: اليوم</span> لتشخيص النص."
+msgid ""
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
+msgstr "عدل ملاحظة <b>قالب: اليوم</b> لتخصيص النص الذي تحويه ملاحظات اليوم."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
 msgstr "م_فتوحة اليوم: قالب"
 
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:18
-#: ../Tomboy/Addins/PrintNotes/gedit-print.c:142
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:52
 msgid "Print"
 msgstr "اطبع"
 
-#: ../Tomboy/Addins/PrintNotes/gedit-print.c:240
-msgid "Preparing pages..."
-msgstr "يجري تحضير الصفحات..."
-
-#: ../Tomboy/Addins/PrintNotes/gedit-print.c:267
-#, c-format
-msgid "Rendering page %d of %d..."
-msgstr "يجري جعل الصفحة %d من %d..."
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:82
+msgid "Error printing note"
+msgstr "خطأ أثناء طباعة الملاحظة"
 
-#: ../Tomboy/Addins/PrintNotes/gedit-print.c:269
-#, c-format
-msgid "Printing page %d of %d..."
-msgstr "يجري طباعة الصفحة %d من %d..."
-
-#: ../Tomboy/Addins/PrintNotes/gedit-print.c:291
-msgid "Print preview"
-msgstr "معاينة الطباعة"
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:223
+#, csharp-format
+msgid "Page {0} of {1}"
+msgstr "الصفحة {0} من {1}"
 
-#: ../Tomboy/Addins/PrintNotes/gedit-print.c:442
-msgid "Page %N of %Q"
-msgstr "الصفحة %N من %Q"
+#. 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:242
+#, fuzzy
+#| msgid "dddd, MMMM d, h:mm tt"
+msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
+msgstr "dddd MM/dd/yyyy, hh:mm:ss tt"
 
-#: ../Tomboy/Addins/PrintNotes/gedit-print.c:445
-#, no-c-format
-msgid "%A %x, %X"
-msgstr "%A %x، %X"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:268
-msgid "Configuration"
-msgstr "إعدادات"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:269
-msgid "Configuration options for the print job"
-msgstr "اعدادات عملية الطبع"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:276
-msgid "Source Buffer"
-msgstr "البافر المصدر"
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "أزِل الروابط المكسورة"
 
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:277
-msgid "GtkTextBuffer object to print"
-msgstr "GtkTextBuffer للطباعة"
+#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
+msgid "Add a sketch"
+msgstr "أضِف شكلا"
 
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:283
-msgid "Tabs Width"
-msgstr "عرض Tab"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:284
-msgid "Width in equivalent space characters of tabs"
-msgstr "عدد المسافات المساوي لمفتاح Tab"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:291
-msgid "Wrap Mode"
-msgstr "نمط اللف"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:292
-msgid "Word wrapping mode"
-msgstr "نمط لف السطر"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:299
-msgid "Highlight"
-msgstr "ابراز"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:300
-msgid "Whether to print the document with highlighted syntax"
-msgstr "إن كان يُفترض طباعة الملف مع التركيبة البارزة لونيًا"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:308
-msgid "Font"
-msgstr "خط"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:309
-msgid "GnomeFont name to use for the document text (deprecated)"
-msgstr "اسم خط جنوم الذي يُستخدم لنص المستند (مهجور)"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:316
-msgid "Font Description"
-msgstr "وصف الخط"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:317
-msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-msgstr "الخط المستخدم لنص المستند (مثل \"Monospace 10\")"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:324
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:332
-msgid "Numbers Font"
-msgstr "خط الأرقام"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:325
-msgid "GnomeFont name to use for the line numbers (deprecated)"
-msgstr "اسم خط جنوم المستخدم لأرقام الأسطر (مهجور)"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:333
-msgid "Font description to use for the line numbers"
-msgstr "وصف الخط المستخدم لأرقام السطور"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:340
-msgid "Print Line Numbers"
-msgstr "اطبع أرقام السطور"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:341
-msgid "Interval of printed line numbers (0 means no numbers)"
-msgstr "المسافة بين أرقام الأسطر المطبوعة (0 يعني لا أرقام)"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:348
-msgid "Print Header"
-msgstr "اطبع الترويسة"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:349
-msgid "Whether to print a header in each page"
-msgstr "ما إذا تطبع ترويسة في كل صفحة"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:356
-msgid "Print Footer"
-msgstr "اطبع التذييل"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:357
-msgid "Whether to print a footer in each page"
-msgstr "ما إذا يطبع تذييل في كل صفحة"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:364
-msgid "Header and Footer Font"
-msgstr "خط الترويسة و التذييل"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:365
-msgid "GnomeFont name to use for the header and footer (deprecated)"
-msgstr "اسم خط جنوم المستخدم في الترويسة والتذييل (مهجور)"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:372
-msgid "Header and Footer Font Description"
-msgstr "وصف خط الترويسة والتذييل"
-
-#: ../Tomboy/Addins/PrintNotes/gtksourceprintjob.c:373
-msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-msgstr "الخط المستخدم في الترويسات والتذييلات (مثل \"Monospace 10\")"
-
-#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
-msgid "Add a sketch"
-msgstr "أضِف شكلا"
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:43
-msgid "Se_rver:"
-msgstr "ال_خادوم:"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
+msgid "Se_rver:"
+msgstr "ال_خادوم:"
 
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:60
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "اس_م المستخدم:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:61
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "م_سار المجلد (خياري):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:71
-msgid "SSH synchronization requires an existing SSH key for this server and user, added to a running SSH daemon."
-msgstr "مزامنة SSH تتطلب مفتاح SSH موجود لهذا الخادوم والمستخدم، مضافًا إلى عفريت SSH شغال."
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
+msgid ""
+"SSH synchronization requires an existing SSH key for this server and user, "
+"added to a running SSH daemon."
+msgstr ""
+"مزامنة SSH تتطلب مفتاح SSH موجود لهذا الخادوم والمستخدم، مضافًا إلى عفريت SSH "
+"شغال."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:95
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "حقل الخادوم أو اسم المستخدم فارغ."
 
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:191
-msgid "Timeout connecting to server. Please ensure that your SSH key has been added to a running SSH daemon."
-msgstr "انتهت مهلة الاتصال بالخادوم. رجاءً تأكد أن مفتاح SSH الخاص بك قد أُضيف إلى عفريت SSH شغال."
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
+msgid ""
+"Timeout connecting to server. Please ensure that your SSH key has been added "
+"to a running SSH daemon."
+msgstr ""
+"انتهت مهلة الاتصال بالخادوم. رجاءً تأكد أن مفتاح SSH الخاص بك قد أُضيف إلى "
+"عفريت SSH شغال."
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
 msgid "Import from Sticky Notes"
@@ -764,18 +967,25 @@ msgstr "تم استيراد الملاحظات اللاصقة"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "تم استيراد <b>{0}</b> من <b>{1}</b>  ملاحظات لاصقة بنجاح."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> من <b>{1}</b> لم يستورد أية ملاحظات لاصقة."
+msgstr[1] "استورد <b>{0}</b> من <b>{1}</b> ملاحظة لاصقة بنجاح."
+msgstr[2] "استورد <b>{0}</b> من <b>{1}</b> ملاحظتين لاصقتين بنجاح."
+msgstr[3] "استورد <b>{0}</b> من <b>{1}</b> ملاحظات لاصقة بنجاح."
+msgstr[4] "استورد <b>{0}</b> من <b>{1}</b> ملاحظة لاصقة بنجاح."
+msgstr[5] "استورد <b>{0}</b> من <b>{1}</b> ملاحظة لاصقة بنجاح."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "بدون عنوان"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
-msgstr "ملاحظة لاصقة:"
+msgstr "ملاحظة لاصقة: "
 
-#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:60
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:62
 msgid "Tasque"
 msgstr "المهمة"
 
@@ -783,45 +993,229 @@ msgstr "المهمة"
 #. category translation in Tasque for this to work properly.  "All"
 #. is used here to allow Tasque to decide which default category
 #. will be used to create the new task.
-#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:84
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:86
 msgid "All"
 msgstr "الكل"
 
-#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:143
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:145
 msgid "--- Tasque is not running ---"
 msgstr "--- المهمة لا تعمل---"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:51
+#: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
+msgid "_Underline"
+msgstr "_سطِّر"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "ال_عنوان:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:69
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_كلمة السّر:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:90
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "حقل ال URL أو اسم المستخدم أو كلمة السر فارغ."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:132
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:190
-msgid "There was an error connecting to the server.  This may be caused by using an incorrect user name and/or password."
-msgstr "حصل خطأ أثناء الاتصال بالخادوم. قد يكون سبب هذا هو اسم مستخدم و/أو كلمة سر خطأ."
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
+msgid ""
+"There was an error connecting to the server.  This may be caused by using an "
+"incorrect user name and/or password."
+msgstr ""
+"حصل خطأ أثناء الاتصال بالخادوم.  قد يكون سبب هذا هو اسم مستخدم و/أو كلمة سر "
+"خطأ."
 
 #. TODO: If the above fails (no keyring daemon), save all but password
 #. to GConf, and notify user.
 #. 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:266
-msgid "Saving configuration to the GNOME keyring failed with the following message:"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
+msgid ""
+"Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "حفظ الإعدادات إلى حلقة مفاتيح جنوم فشل مع إعطاء الرسالة التالية:"
 
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
+msgid "Connect to Server"
+msgstr "اتصل بالخادوم"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
+msgid "Connected"
+msgstr "مُتصل"
+
+#. Translators: The web service supporting Tomboy WebSync is not responding as expected
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
+msgid "Server not responding. Try again later."
+msgstr "الخادوم لا يستجيب. حاول مرة أخرى."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
+msgid "Authorization Failed, Try Again"
+msgstr "فشلت المصادقة، حاول مرة أخرى"
+
+#. Translators: Title of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
+msgid "Tomboy Web Authorization Successful"
+msgstr "نجح تخويل اومبوي للوصول إلى الشنكبوتية"
+
+#. Translators: Body of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
+msgid ""
+"Please return to the Tomboy Preferences window and press Save to start "
+"synchronizing."
+msgstr "من فضلك عد لنافذة التفضيلات ببرنامج تومبوي واضغط احفظ لبدء المزامنة."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
+msgid "Connected. Press Save to start synchronizing"
+msgstr "متصل. اضغط احفظ لبدء المزامنة"
+
+#. Translators: The user must take action in their web browser to continue the authorization process
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
+msgid "Authorizing in browser (Press to reset connection)"
+msgstr "المصادقة في المتصفح (اضغط لإعادة تعيين الاتصال)"
+
+#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
+msgid "Set the default browser and try again"
+msgstr "اضبط المتصفح الافتراضي ثم أعد المحاولة"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "شنكبوتية تومبوي"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "صدِّر كافة الملاحظات إلى {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "ابدأ تصدير الملاحظات إلى {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "صدر الكتيِب المحدد إلى {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "ابدأ تصدير الكتيب إلى {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "أد_وات"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "صدِّر"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "صدّر ملاحظاتك."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "صدِّر كافة الملاحظات إلى {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "صدِّر الكتيِّب المحدد إلى {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "تصدير كلّ {0} الملاحظات"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "تعذَر التصدير، الوصول ممنوع."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "تعذَر التصدير، المجلد غير موجود."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "تعذّر تصدير: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "خطأ مجهول."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "ملاحظات غير مصنّفة"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "صُدِّرت ملاحظاتك إلى \"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "صُدِّرت ملاحظاتك بنجاح"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "تعذّر حفظ الملفات في \"{0}\""
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "أنشئ مجلد وجهة لتصدير {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
+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:106
+msgid "Create New Note"
+msgstr "أنشئ ملاحظة جديدة"
+
+#: ../Tomboy/JumpListManager.cs:136
+#, csharp-format
+msgid "{0} (new)"
+msgstr "{0} (جديد)"
+
+#: ../Tomboy/JumpListManager.cs:158
+msgid "Recent Notes"
+msgstr "الملاحظات الأحدث"
+
+#. Translators: This is the name of "Window" menu in the Mac menubar
+#: ../Tomboy/MacApplication.cs:215
+msgid "_Window"
+msgstr "_نافذة"
+
+#: ../Tomboy/MacApplication.cs:234
+msgid "Preferences..."
+msgstr "تفضيلات..."
+
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:24
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:42
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
 msgid "Create a new notebook"
 msgstr "انشئ كتيّبا جديدا"
 
@@ -831,7 +1225,7 @@ msgstr "اكتب اسم الكتيب الذي تريد إنشاءه."
 
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:31
 msgid "N_otebook name:"
-msgstr "_أسم الكتيّب:"
+msgstr "_اسم الكتيّب:"
 
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:45
 msgid "Name already taken"
@@ -843,76 +1237,80 @@ msgstr "الاسم مأخوذ مسبّقا"
 msgid "C_reate"
 msgstr "أن_شيء"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "قالب كتيّب {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "كلّ الملاحظات"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "ملاحظات غير مصنّفة"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:37
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "_كتيّبات"
 
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:38
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:58
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:69
 msgid "Create a new note in a notebook"
 msgstr "اصنع ملاحظة جديدة في كتيّب"
 
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:41
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:201
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:52
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:223
 msgid "New Note_book..."
-msgstr "_كتيّب جديد"
+msgstr "_كتيّب جديد..."
 
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:45
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:56
 msgid "_New Note"
 msgstr "_ملاحظة جديدة"
 
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:57
 msgid "Create a new note in this notebook"
 msgstr "اصنع ملاحظة جديدة في هذا الكتيّب"
 
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:60
 msgid "_Open Template Note"
 msgstr "ا_فتح قالب ملاحظة"
 
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:50
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:61
 msgid "Open this notebook's template note"
 msgstr "افتح قالب الملاحظات لهذا الكتيّب"
 
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:64
 msgid "Delete Note_book"
 msgstr "ا_حذف الكتيّب"
 
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:54
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:65
 msgid "Delete the selected notebook"
 msgstr "احذف الكتيّب المنتقى"
 
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:57
-#: ../Tomboy/RecentChanges.cs:250
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "كتيّبات"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:356
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "قالب كتيّب {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "ملاحظة جديدة"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "كلّ الملاحظات"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "هل تريد حقا حذف هذا الكتيّب؟"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:358
-msgid "The notes that belong to this notebook will not be deleted, but they will no longer be associated with this notebook.  This action cannot be undone."
-msgstr "لن يتم حذف الملاحظات التي تنتمي لهذا الكتيب، لكنها لن تكون مرتبطة به. لا يمكن استرجاع هذه العملية."
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
+msgid ""
+"The notes that belong to this notebook will not be deleted, but they will no "
+"longer be associated with this notebook.  This action cannot be undone."
+msgstr ""
+"لن يتم حذف الملاحظات التي تنتمي لهذا الكتيب، لكنها لن تكون مرتبطة به.  لا "
+"يمكن استرجاع هذه العملية."
 
 #: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
 msgid "No notebook"
@@ -927,45 +1325,117 @@ msgstr "لا كتيّب"
 msgid "New \"{0}\" Note"
 msgstr "ملاحظة \"{0}\" جديدة"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:36
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "ضع هذه الملاحظة في كتيّب"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:112
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "كتيّب"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:141
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
-msgstr "_كتيّب جديد"
+msgstr "_كتيّب جديد..."
 
-#: ../Tomboy/Note.cs:1430
-msgid "Really delete this note?"
-msgstr "هل تريد حقا حذف هذه الملاحظة؟"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "ملاحظة جديدة {0}"
 
-#: ../Tomboy/Note.cs:1432
-msgid "Really delete these notes?"
-msgstr "هل تريد فعلا حذف هذه الملاحظات؟"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "هل تريد حقا حذف الملاحظة \"{0}\"؟"
 
-#: ../Tomboy/Note.cs:1441
+#: ../Tomboy/Note.cs:1610
+#, csharp-format
+msgid "Really delete this {0} note?"
+msgid_plural "Really delete these {0} notes?"
+msgstr[0] "هل تريد حقًا حذف {0} الملاحظة؟"
+msgstr[1] "هل تريد حقا حذف هذه {0} الملاحظة؟"
+msgstr[2] "هل تريد حقا حذف هاتين {0} الملاحظتين؟"
+msgstr[3] "هل تريد حقا حذف هاته {0} الملاحظات؟"
+msgstr[4] "هل تريد حقا حذف هاته {0} ملاحظة؟"
+msgstr[5] "هل تريد حقا حذف هاته {0} ملاحظة؟"
+
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
-msgstr "إذا حذفت الملاحظة فسوف تفقد للأبد"
+msgstr "إذا حذفت الملاحظة فسوف تفقد للأبد."
+
+#: ../Tomboy/Note.cs:1655
+#, 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 {1}."
+msgstr ""
+"حدث خطأ عند محاولة حفظ ملاحظاتك. الرجاء التحقق من أن لديك مساحة كافية على "
+"القرص، وأن لديك التصاريح المناسبة على {0}. تستطيع إيجاد تفاصيل الخطأ في {1}."
 
-#: ../Tomboy/Note.cs:1475
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "خطأ أثناء حفظ بيانات الملاحظات."
 
-#: ../Tomboy/Note.cs:1476
-msgid "An error occurred while saving your notes. Please check that you have sufficient disk space, and that you have appropriate rights on ~/.tomboy. Error details can be found in ~/.tomboy.log."
-msgstr "حدث خطأ عند محاولة حفظ ملاحظاتك. الرجاء التحقق من أن لديك مساحة القرص الكافية، وأن لديك التصاريح الصحيحة على ~/.tomboy. تستطيع إيجاد تفاصيل الخطأ في ~/.tomboy.log."
-
 #. New Note Template
-#: ../Tomboy/NoteManager.cs:20
-#: ../Tomboy/PreferencesDialog.cs:210
+#. Translators: This is 'New Note' Template, not New 'Note Template'
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "قالب ملاحظة جديد"
 
-#: ../Tomboy/NoteManager.cs:138
+#. Create migration notification note
+#. Translators: The title of the data migration note
+#: ../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: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 ""
+"في الإصدارة الأخيرة من تومبوي، نُقِلت ملفات ملاحظاتك. قد لا تكون مهتمًا بمعرفة "
+"مكان حفظ ملاحظاتك، وإذا ما زلت غير مهتم، من فضلك قم <bold>بحذف هذه الملاحظة</"
+"bold>. :)\n"
+"\n"
+"دليل ملاحظاتك القديم ما زال آمنًا كما هو في <link:url>{0}</link:url> . إذا "
+"عُدت لإصدارة قديمة من تومبوي فإنها ستبحث عن ملاحظاتك هناك.\n"
+"\n"
+"لكننا قمنا بنسخ ملاحظاتك ومعلومات إعداداتك إلى أدلة جديدة، والتي ستستخدم من "
+"الآن فصاعدًا:\n"
+"\n"
+"<list><list-item dir=\"rtl\">تستطيع إيجاد الملاحظات في <link:url>{1}</link:"
+"url></list-item>\n"
+"<list-item dir=\"rtl\">ملفات الإعدادات في <link:url>{2}</link:url></list-"
+"item>\n"
+"<list-item dir=\"rtl\">يمكنك تثبيت الملحقات في <link:url>{3}</link:url></"
+"list-item>\n"
+"<list-item dir=\"rtl\">تستطيع إيجاد السجلات في <link:url>{4}</link:url></"
+"list-item></list>\n"
+"\n"
+"وداعًا!"
+
+#: ../Tomboy/NoteManager.cs:265
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -973,187 +1443,296 @@ msgid ""
 "\n"
 "Use this \"Start Here\" note to begin organizing your ideas and thoughts.\n"
 "\n"
-"You can create new notes to hold your ideas by selecting the \"Create New Note\" item from the Tomboy Notes menu in your GNOME Panel. Your note will be saved automatically.\n"
+"You can create new notes to hold your ideas by selecting the \"Create New "
+"Note\" item from the Tomboy Notes menu in your GNOME Panel. Your note will "
+"be saved automatically.\n"
 "\n"
-"Then organize the notes you create by linking related notes and ideas together!\n"
+"Then organize the notes you create by linking related notes and ideas "
+"together!\n"
 "\n"
-"We've created a note called <link:internal>Using Links in Tomboy</link:internal>.  Notice how each time we type <link:internal>Using Links in Tomboy</link:internal> it automatically gets underlined?  Click on the link to open the note.</note-content>"
+"We've created a note called <link:internal>Using Links in Tomboy</link:"
+"internal>.  Notice how each time we type <link:internal>Using Links in "
+"Tomboy</link:internal> it automatically gets underlined?  Click on the link "
+"to open the note.</note-content>"
 msgstr ""
 "<note-content>ابدأ هنا\n"
 "\n"
-"<bold>مرحبًا بكم في Tomboy!</bold>\n"
+"<bold>مرحبًا بكم في تومبوي!</bold>\n"
 "\n"
-"استخدم هذه الصفحة كصفحة بداية لتنظيم الملاحظات و الأفكار.\n"
+"استخدم هذه الصفحة \"ابدأ هنا\" كصفحة بداية لتنظيم الملاحظات و الأفكار.\n"
 "\n"
-"يمكنك إنشاء ملاحظات جديدة لتنظيم أفكارك عن طريق انتقاء العنصر \"أنشئ ملاحظة جديدة\" من قائمة ملاحظات  Tomboy في لوحة جنوم.\n"
+"يمكنك إنشاء ملاحظات جديدة لتنظيم أفكارك عن طريق انتقاء العنصر \"أنشئ ملاحظة "
+"جديدة\" من قائمة ملاحظات  تومبوي في لوحة جنوم. ملاحظتك ستُحفظ تلقائيًا.\n"
 "\n"
-"يمكنك بعدها تنظيم الملاحظات التي تنشئها عن طريق ربط الملاحظات والأفكار التي لها علاقة ببعضها!\n"
+"يمكنك بعدها تنظيم الملاحظات التي تنشئها عن طريق ربط الملاحظات والأفكار التي "
+"لها علاقة ببعضها!\n"
 "\n"
-"لقد أنشأنا ملاحظة تسمى <link:internal>استخدام الروابط في Tomboy</link:internal>.  لاحظ كيف أننا كلما نكتب <link:internal>استخدام الروابط في Tomboy</link:internal> يتم تسطيرها تلقائيًا؟ انقر الرابط لفتح الملاحظة.</note-content>"
+"لقد أنشأنا ملاحظة تسمى <link:internal>استخدام الروابط في تومبوي</link:"
+"internal>.  لاحظ كيف أننا كلما نكتب <link:internal>استخدام الروابط في "
+"تومبوي</link:internal> يتم تسطيرها تلقائيًا؟ انقر الرابط لفتح الملاحظة.</note-"
+"content>"
 
-#: ../Tomboy/NoteManager.cs:157
+#: ../Tomboy/NoteManager.cs:284
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
-"Notes in Tomboy can be linked together by highlighting text in the current note and clicking the <bold>Link</bold> button above in the toolbar.  Doing so will create a new note and also underline the note's title in the current note.\n"
+"Notes in Tomboy can be linked together by highlighting text in the current "
+"note and clicking the <bold>Link</bold> button above in the toolbar.  Doing "
+"so will create a new note and also underline the note's title in the current "
+"note.\n"
 "\n"
-"Changing the title of a note will update links present in other notes.  This prevents broken links from occurring when a note is renamed.\n"
+"Changing the title of a note will update links present in other notes.  This "
+"prevents broken links from occurring when a note is renamed.\n"
 "\n"
-"Also, if you type the name of another note in your current note, it will automatically be linked for you.</note-content>"
+"Also, if you type the name of another note in your current note, it will "
+"automatically be linked for you.</note-content>"
 msgstr ""
-"<note-content>استخدام الروابط في Tomboy\n"
+"<note-content>استخدام الروابط في تومبوي\n"
 "\n"
-"يمكن ربط الملاحظات في Tomboy ببعضها عن طريق انتقاء نص في الملاحظة الحالية ثم نقر زر <bold>إربط</bold> أعلاه في شريط الأدوات. سيتم انشاء ملاحظة جديدة نتيجة لهذا، وسيتم أيضًا تسطير عنوان الملاحظة الجديدة في الملاحظة الحالية.\n"
+"يمكن ربط الملاحظات في تومبوي ببعضها عن طريق انتقاء نص في الملاحظة الحالية ثم "
+"نقر زر <bold>إربط</bold> أعلاه في شريط الأدوات. سيتم انشاء ملاحظة جديدة "
+"نتيجة لهذا، وسيتم أيضًا تسطير عنوان الملاحظة الجديدة في الملاحظة الحالية.\n"
 "\n"
-"يتم تحديث الروابط الموجودة في الملاحظات الأخرى عند تغيير عنوان إحدى الملاحظات. يمنع هذا وجود روابط مكسورة في الملاحظات الأخرى عند إعادة تسمية ملاحظة.\n"
+"يتم تحديث الروابط الموجودة في الملاحظات الأخرى عند تغيير عنوان إحدى "
+"الملاحظات. يمنع هذا وجود روابط مكسورة في الملاحظات الأخرى عند إعادة تسمية "
+"ملاحظة.\n"
 "\n"
-"بالإضافة إلى هذا، سيتم الربط إلى ملاحظة موجودة تلقائيًا من أجلك إن كتبت اسمها في ملاحظة أخرى.</note-content>"
+"بالإضافة إلى هذا، سيتم الربط إلى ملاحظة موجودة تلقائيًا من أجلك إن كتبت اسمها "
+"في ملاحظة أخرى.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:172
-#: ../Tomboy/NoteManager.cs:239
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "ابدأ هنا"
 
-#: ../Tomboy/NoteManager.cs:177
+#: ../Tomboy/NoteManager.cs:304
 msgid "Using Links in Tomboy"
-msgstr "استخدام الروابط في Tomboy"
-
-#: ../Tomboy/NoteManager.cs:316
-#, csharp-format
-msgid "New Note {0}"
-msgstr "ملاحظة جديدة {0}"
+msgstr "استخدام الروابط في تومبوي"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:388
-#: ../Tomboy/NoteManager.cs:480
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "صِف ملاحظتك الجديدة هنا."
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../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:83
+msgid "Rename Links"
+msgstr "غير تسمية الروابط"
+
+#: ../Tomboy/NoteRenameDialog.cs:95
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "عنوان الملاحظة"
+
+#. Translators: This button causes all notes in the list to be selected
+#: ../Tomboy/NoteRenameDialog.cs:118
+msgid "Select All"
+msgstr "اختر الكل"
+
+#. Translators: This button causes all notes in the list to be unselected
+#: ../Tomboy/NoteRenameDialog.cs:127
+msgid "Select None"
+msgstr "اختر لا شيء"
+
+#: ../Tomboy/NoteRenameDialog.cs:144
+msgid "Ad_vanced"
+msgstr "م_تقدم"
+
+#: ../Tomboy/NoteRenameDialog.cs:147
+msgid "Always show this _window"
+msgstr "أ_ظهر هذه النافذة دائما"
+
+#: ../Tomboy/NoteRenameDialog.cs:155
+msgid "Never rename _links"
+msgstr "لا تغير أ_سماء الروابط أبدا"
+
+#: ../Tomboy/NoteRenameDialog.cs:163
+msgid "Alwa_ys rename links"
+msgstr "غيّر أسماء الروابط _دائما"
+
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "جِد في هذه الملاحظة"
 
-#: ../Tomboy/NoteWindow.cs:367
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "ا_ربط إلى ملاحظة جديدة"
 
-#: ../Tomboy/NoteWindow.cs:379
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "_نص"
 
-#: ../Tomboy/NoteWindow.cs:387
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_جِد في هذه الملاحظة"
 
-#: ../Tomboy/NoteWindow.cs:402
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "أ_غلق جميع الملاحظات"
 
-#: ../Tomboy/NoteWindow.cs:442
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "ابحث"
 
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
 #: ../Tomboy/NoteWindow.cs:445
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "ابحث في ملاحظاتك (Ctrl-Shift-F)"
+msgid "Search your notes"
+msgstr "ابحث في ملاحظاتك"
 
 #: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "إربط"
 
-#: ../Tomboy/NoteWindow.cs:463
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "إربط النص المنتقى بملاحظة جديدة (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "إربط النص المنتقى بملاحظة جديدة"
 
-#: ../Tomboy/NoteWindow.cs:476
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_نص"
 
-#: ../Tomboy/NoteWindow.cs:481
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "حدّد خصائص النص"
 
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "أ_دوات"
 
-#: ../Tomboy/NoteWindow.cs:490
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "استخدم الأدوات على هذه الملاحظة"
 
-#: ../Tomboy/NoteWindow.cs:498
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "احذف هذه الملاحظة"
 
-#: ../Tomboy/NoteWindow.cs:507
-#: ../Tomboy/Synchronization/SyncManager.cs:161
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "زامن الملاحظات"
 
-#: ../Tomboy/NoteWindow.cs:550
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"هذه الملاحظة هي نموذج للملاحظات. فهي تحدد شكل المحتوى الافتراضي للملاحظات "
+"العادية، ولن تظهر في قائمة الملاحظات أو نافذة البحث."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "حوِّل إلى ملاحظة عادية"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "احفظ ال_حجم"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "احفظ ال_تحديد"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "احفظ ال_عنوان"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_جد..."
 
-#: ../Tomboy/NoteWindow.cs:561
-#: ../Tomboy/NoteWindow.cs:763
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "جِد ال_تالي"
 
-#: ../Tomboy/NoteWindow.cs:574
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "جِد ال_سابق"
 
-#: ../Tomboy/NoteWindow.cs:662
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "تعذر إنشاء ملاحظة جديدة"
 
-#: ../Tomboy/NoteWindow.cs:743
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_جِد:"
 
-#: ../Tomboy/NoteWindow.cs:754
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "ال_سابق"
 
-#: ../Tomboy/NoteWindow.cs:1238
+#: ../Tomboy/NoteWindow.cs:852
+msgid "_Next"
+msgstr "ال_تالي"
+
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_عريض"
 
-#: ../Tomboy/NoteWindow.cs:1250
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_مائل"
 
-#: ../Tomboy/NoteWindow.cs:1262
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_شطب"
 
-#: ../Tomboy/NoteWindow.cs:1274
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "أ_برِز"
 
-#: ../Tomboy/NoteWindow.cs:1287
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "حجم الخط"
 
-#: ../Tomboy/NoteWindow.cs:1290
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_عادي"
 
-#: ../Tomboy/NoteWindow.cs:1297
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "_ضخم"
 
-#: ../Tomboy/NoteWindow.cs:1305
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_كبير"
 
-#: ../Tomboy/NoteWindow.cs:1313
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "ص_غير"
 
-#: ../Tomboy/NoteWindow.cs:1324
+#: ../Tomboy/NoteWindow.cs:1429
+msgid "Increase Font Size"
+msgstr "زد حجم الخط"
+
+#: ../Tomboy/NoteWindow.cs:1447
+msgid "Decrease Font Size"
+msgstr "قلل حجم الخط"
+
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "عناصر"
 
@@ -1161,712 +1740,997 @@ msgstr "عناصر"
 msgid "Editing"
 msgstr "يجري التعديل"
 
-#: ../Tomboy/PreferencesDialog.cs:83
+#: ../Tomboy/PreferencesDialog.cs:84
 msgid "Hotkeys"
 msgstr "مفاتيح ساخنة"
 
-#: ../Tomboy/PreferencesDialog.cs:85
+#: ../Tomboy/PreferencesDialog.cs:86
 msgid "Synchronization"
 msgstr "مزامنة"
 
-#: ../Tomboy/PreferencesDialog.cs:87
+#: ../Tomboy/PreferencesDialog.cs:88
 msgid "Add-ins"
 msgstr "ملحقات"
 
-#: ../Tomboy/PreferencesDialog.cs:146
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "دقّق التّهجئة أثناء ال_كتابة"
 
-#: ../Tomboy/PreferencesDialog.cs:155
-msgid "Misspellings will be underlined in red, with correct spelling suggestions shown in the context menu."
-msgstr "سيتم وضع سطر أحمر تحت الكلمات المتهجأة بشكل خاطئ و الإقتراحات الصحيحة ستظهر في قائمة السياق."
+#: ../Tomboy/PreferencesDialog.cs:183
+msgid ""
+"Misspellings will be underlined in red, with correct spelling suggestions "
+"shown in the context menu."
+msgstr ""
+"سيتم وضع سطر أحمر تحت الكلمات المتهجأة بشكل خاطئ و الإقتراحات الصحيحة ستظهر "
+"في قائمة السياق."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:166
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "أبرِز _كلمات الويكي"
 
-#: ../Tomboy/PreferencesDialog.cs:174
-msgid "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the word will create a note with that name."
-msgstr "فعّل الخيار لإبراز الكلمات  مث <b>ThatLookLikeThis</b> بالنقر على الكلمة سيتم إنشاء ملاحظة جديدة بنفس الاسم"
+#: ../Tomboy/PreferencesDialog.cs:202
+msgid ""
+"Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
+"word will create a note with that name."
+msgstr ""
+"فعّل الخيار لإبراز الكلمات مثل <b>ThatLookLikeThis</b>. بالنقر على الكلمة "
+"سيتم إنشاء ملاحظة جديدة بنفس الاسم."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:181
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "فعّل التر_تيب الآلي للقوائم"
 
-#. Custom font...
-#: ../Tomboy/PreferencesDialog.cs:190
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "استخدم _خط مخصّص"
 
-#: ../Tomboy/PreferencesDialog.cs:214
-msgid "Use the new note template to specify the text that should be used when creating a new note."
-msgstr "استعمل قالب الملاحظات الجديدة لكتابة النص الذي سيظهر في كل ملاحظة جديدة"
+#: ../Tomboy/PreferencesDialog.cs:236
+msgid "When renaming a linked note: "
+msgstr "عند تغيير اسم ملاحظة مرتبطة: "
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Ask me what to do"
+msgstr "اسأل ما الذي يجب فعله"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Never rename links"
+msgstr "لا تغير أسماء الروابط أبدًا"
 
-#: ../Tomboy/PreferencesDialog.cs:224
+#: ../Tomboy/PreferencesDialog.cs:241
+msgid "Always rename links"
+msgstr "غيّر أسماء الروابط دائمًا"
+
+#: ../Tomboy/PreferencesDialog.cs:261
+msgid ""
+"Use the new note template to specify the text that should be used when "
+"creating a new note."
+msgstr ""
+"استعمل قالب الملاحظات الجديدة لكتابة النص الذي سيظهر في كل ملاحظة جديدة."
+
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "افتح قالب ملاحظة جديد"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:281
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "إستمع إلى الم_فاتيح الساخنة"
 
-#: ../Tomboy/PreferencesDialog.cs:290
-msgid "Hotkeys allow you to quickly access your notes from anywhere with a keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
-msgstr "المفاتيح الساخنة تتيح لك سرعة الوصول من أي مكان من خلال الضغط على المفاتيح. مثال على المفاتيح الساخنة: <br><Control><Shift>F11</b>، <b><Alt>N</b>"
+#: ../Tomboy/PreferencesDialog.cs:336
+msgid ""
+"Hotkeys allow you to quickly access your notes from anywhere with a "
+"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
+"Alt>N</b>"
+msgstr ""
+"المفاتيح الساخنة تتيح لك سرعة الوصول من أي مكان من خلال الضغط على المفاتيح. "
+"مثال على المفاتيح الساخنة: <b><Control><Shift>F11</b>, <b><"
+"Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:310
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "اظهر _قائمة الملاحظات"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:327
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "افتح \"ملاحظة ا_بدأ هنا\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:344
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "أنشئ ملاحظة _جديدة"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:361
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "افتح \"ابحث في _كل الملاحظات\""
 
-#: ../Tomboy/PreferencesDialog.cs:388
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "خ_دمة:"
 
-#: ../Tomboy/PreferencesDialog.cs:441
-#: ../Tomboy/PreferencesDialog.cs:1019
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "غير قابل للإعداد"
 
+#: ../Tomboy/PreferencesDialog.cs:513
+msgid "Automaticall_y Sync in Background Every"
+msgstr "زامن في الخلفية _تلقائيًا كل"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:519
+msgid "Minutes"
+msgstr "دقائق"
+
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:461
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "مت_قدّم..."
 
-#: ../Tomboy/PreferencesDialog.cs:522
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "الملحقات التالية مثبتة"
 
-#: ../Tomboy/PreferencesDialog.cs:553
+#: ../Tomboy/PreferencesDialog.cs:623
+msgid "Get More Add-Ins..."
+msgstr "احصل على المزيد من الملحقات..."
+
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_فعّل"
 
-#: ../Tomboy/PreferencesDialog.cs:559
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "ع_طّل"
 
-#: ../Tomboy/PreferencesDialog.cs:690
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "غير مطبق"
 
-#: ../Tomboy/PreferencesDialog.cs:704
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} تفضيلات"
 
-#: ../Tomboy/PreferencesDialog.cs:843
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "اختر خط الملاحظات"
 
-#: ../Tomboy/PreferencesDialog.cs:887
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "خيارات المزامنة الأخرى"
 
-#: ../Tomboy/PreferencesDialog.cs:894
-msgid "When a conflict is detected between a local note and a note on the configured synchronization server:"
+#: ../Tomboy/PreferencesDialog.cs:981
+msgid ""
+"When a conflict is detected between a local note and a note on the "
+"configured synchronization server:"
 msgstr "عندما يُكتشف تضارب بين ملاحظة محلية وملاحظة على خادوم المزامنة المُعدّ:"
 
-#: ../Tomboy/PreferencesDialog.cs:901
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "اسألني دائمًا ماذا يجب أن أفعل."
 
-#: ../Tomboy/PreferencesDialog.cs:905
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "أعد تسمية الملاحظة المحلية."
 
-#: ../Tomboy/PreferencesDialog.cs:909
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "أبدل ملاحظة الخادوم مكان الملاحظة المحلية."
 
-#: ../Tomboy/PreferencesDialog.cs:1055
-msgid "WARNING: Are you sure?"
-msgstr "تحذير: هل أنت متأكد؟"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "أمتأكّد أنت؟"
 
-#: ../Tomboy/PreferencesDialog.cs:1057
-msgid "Clearing your synchronization settings is not recommended.  You may be forced to synchronize all of your notes again when you save new settings."
-msgstr "مسح إعدادات المزامنة لديك غير منصوح به. قد تضطر إلى مزامنة كل الملاحظات لديك مجددًا عندما تحفظ الإعدادات الجديدة."
+#: ../Tomboy/PreferencesDialog.cs:1144
+msgid ""
+"Clearing your synchronization settings is not recommended.  You may be "
+"forced to synchronize all of your notes again when you save new settings."
+msgstr ""
+"مسح إعدادات المزامنة لديك غير منصوح به.  قد تضطر إلى مزامنة كل الملاحظات "
+"لديك مجددًا عندما تحفظ الإعدادات الجديدة."
 
-#: ../Tomboy/PreferencesDialog.cs:1070
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "جارٍ إعادة ضبط إعدادات المزامنة"
 
-#: ../Tomboy/PreferencesDialog.cs:1072
-msgid "You have disabled the configured synchronization service.  Your synchronization settings will now be cleared.  You may be forced to synchronize all of your notes again when you save new settings"
-msgstr "لقد عطلت خدمة المزامنة المعدة. ستـُمسح الآن إعدادات المزامنة لديك. قد تضطر إلى مزامنة كل ملاحظاتك مجدًا عندما تحفظ الإعدادات الجديدة."
+#: ../Tomboy/PreferencesDialog.cs:1159
+msgid ""
+"You have disabled the configured synchronization service.  Your "
+"synchronization settings will now be cleared.  You may be forced to "
+"synchronize all of your notes again when you save new settings."
+msgstr ""
+"لقد عطلت خدمة المزامنة المعدة.  ستـُمسح الآن إعدادات المزامنة لديك.  قد تضطر "
+"إلى مزامنة كل ملاحظاتك مجددًا عندما تحفظ الإعدادات الجديدة."
 
-#: ../Tomboy/PreferencesDialog.cs:1169
-msgid "Success! You're connected!"
-msgstr "لقد نحجت! أنت الآن متصل!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "نجح الاتصال"
 
-#: ../Tomboy/PreferencesDialog.cs:1171
-msgid "Tomboy is ready to synchronize your notes."
-msgstr "Tomboy جاهز لمزامنة ملاحظاتك."
+#: ../Tomboy/PreferencesDialog.cs:1239
+msgid ""
+"Tomboy is ready to synchronize your notes. Would you like to synchronize "
+"them now?"
+msgstr "تومبوي جاهز لمزامنة ملاحظاتك. هل تودّ مزامنتهن الآن؟"
 
-#: ../Tomboy/PreferencesDialog.cs:1190
-msgid "Sorry, but something went wrong.  Please check your information and try again.  The ~/.tomboy.log might be useful too."
-msgstr "عذرًا، ولكن حصل خطأ في مكان ما. رجاءً تحقق من معلوماتك وحاول ثانية. الملف ~/.tomboy.log قد يكون مفيدًا أيضًا."
+#: ../Tomboy/PreferencesDialog.cs:1262
+#, csharp-format
+msgid ""
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
+msgstr ""
+"من فضلك تحقّق من معلوماتك ثم حاول مرة أخرى.  قد يحتوي ملف السجل {0} معلومات "
+"أكثر عن هذا الخطأ."
 
-#: ../Tomboy/PreferencesDialog.cs:1199
-msgid "Error connecting :("
-msgstr "خطأ في الاتصال :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "خطأ في الاتصال"
 
-#: ../Tomboy/PreferencesDialog.cs:1275
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "النسخة:"
 
-#: ../Tomboy/PreferencesDialog.cs:1282
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "المؤلف:"
 
-#: ../Tomboy/PreferencesDialog.cs:1289
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "حقوق النسخ:"
 
-#: ../Tomboy/PreferencesDialog.cs:1295
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "متطلبات الملحقات:"
 
-#: ../Tomboy/RecentChanges.cs:77
-msgid "Search All Notes"
-msgstr "ابحث في كل الملاحظات"
-
-#: ../Tomboy/RecentChanges.cs:94
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_ابحث:"
 
-#: ../Tomboy/RecentChanges.cs:115
-msgid "C_ase Sensitive"
-msgstr "ح_ساس لحالة الأحرف"
-
-#: ../Tomboy/RecentChanges.cs:315
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "ملاحظة"
 
-#: ../Tomboy/RecentChanges.cs:337
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "آخر تعديلات"
 
-#: ../Tomboy/RecentChanges.cs:469
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "مطابقات"
 
-#: ../Tomboy/RecentChanges.cs:521
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "عنوان مطابق"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
-msgstr[0] "{0} مطابقة"
-msgstr[1] "{0} مطابقتين"
-msgstr[2] "{0} مطابقة"
-msgstr[3] "{0} مطابقة"
-
-#: ../Tomboy/RecentChanges.cs:535
+msgstr[0] "{0} لا توجد مطابقة"
+msgstr[1] "{0} مطابقة واحدة"
+msgstr[2] "{0} مطابقتان"
+msgstr[3] "{0} مطابقات"
+msgstr[4] "{0} مطابقة"
+msgstr[5] "{0} مطابقة"
+
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
-msgstr[0] "المجموع: ملاحظة"
-msgstr[1] "المجموع: ملاحظتين"
-msgstr[2] "المجموع: {0} ملاحظات"
-msgstr[3] "المجموع: {0} ملاحظة"
-
-#: ../Tomboy/RecentChanges.cs:545
+msgstr[0] "المجموع: {0} لا ملاحظة"
+msgstr[1] "المجموع: {0} ملاحظة واحدة"
+msgstr[2] "المجموع: {0} ملاحظتين"
+msgstr[3] "المجموع: {0} ملاحظات"
+msgstr[4] "المجموع: {0} ملاحظة"
+msgstr[5] "المجموع: {0} ملاحظة"
+
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
-msgstr[0] "يطابق: ملاحظة"
-msgstr[1] "يطابق: ملاحظتين"
-msgstr[2] "يطابق: {0} ملاحظات"
-msgstr[3] "يطابق: {0} ملاحظة"
+msgstr[0] "يطابق: {0} لا ملاحظة"
+msgstr[1] "يطابق: {0} ملاحظة واحدة"
+msgstr[2] "يطابق: {0} ملاحظتين"
+msgstr[3] "يطابق: {0} ملاحظات"
+msgstr[4] "يطابق: {0} ملاحظة"
+msgstr[5] "يطابق: {0} ملاحظة"
+
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"لا نتائج وُجِدت في الكتيِّب المنتقى.\n"
+"اضغط هنا للبحث في كافة الملاحظات."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "اضغط هنا للبحث في كافة الملاحظات"
 
-#: ../Tomboy/RecentChanges.cs:676
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "ملاحظات"
 
-#: ../Tomboy/Tomboy.cs:193
-msgid "Cannot create new note"
-msgstr "تعذر إنشاء ملاحظة جديدة"
-
-#: ../Tomboy/Tomboy.cs:276
-msgid "translator-credits"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
 msgstr ""
-"جهاد عفيفي\t<djihed at gmail.com>\n"
-"يوسف رفة\t<yousef at raffah.com>\n"
-"خالد حسني\t<khaledhosny at eglug.org>\n"
-"أحمد فرغل\t<ahmad.farghal at gmail.com>\n"
-"أنس عفيف عماد\t<anas.e87 at gmail.com>"
+"ملحقة المزامنة غير مدعومة على حاسوبك. رجاءً تأكد أنك تملك FUSE وأنّ {0} مثبت "
+"ومُعدّ بشكل صحيح"
 
-#: ../Tomboy/Tomboy.cs:285
-msgid "Copyright © 2004-2007 Alex Graveley"
-msgstr "حقوق النسخ © 2004-2007 أليكس جرافيلي"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "تعذّر قراءة ملف الاختبار."
 
-#: ../Tomboy/Tomboy.cs:286
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "تطبيق سطح مكتب بسيط و سهل الاستخدام لتسجيل الملاحظات."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "فشل اختبار الكتابة."
 
-#: ../Tomboy/Tomboy.cs:289
-msgid "Homepage"
-msgstr "الرئيسيّة"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "انتهت مهلة الاتصال بالخادوم."
 
-#: ../Tomboy/Tomboy.cs:396
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: تطبيق بسيط و سهل الاستخدام لتسجيل الملاحظات.\n"
-"حقوق النسخ (c) 2004-2006 أليكس جرافيلي <alex at beatniksoftware.com> \n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "خطأ في الاتصال بالخادوم."
 
-#: ../Tomboy/Tomboy.cs:408
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"الإستخدام:\n"
-"  --version\t\t\tلطباعة معلومات عن الإصدارة\n"
-"  --help\t\t\tلطباعة رسالة الإستخدام هذه\n"
-"  --note-path [path]\t\tحمّل/خزّن معلومات الملاحظة في هذا الديل.\n"
-"  --search [text]\t\tافتح نافذة البحث في كل الملاحظات والبحث عن النص المحدد.\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "تعذر تفعيل FUSE."
 
-#: ../Tomboy/Tomboy.cs:419
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tأنشئ و اعرض ملاحظة جديدة\n"
-"  --new-note [title]\t\tأنشئ و اعرض ملاحظة جديدة بعنوان title\n"
-"  --open-note [title/url]\tاعرض الملاحظة ذات العنوان title\n"
-"  --start-here\t\t\tاعرض ابدأ هنا\n"
-"  --highlight-search [text]\tابحث و ظلل النص text في الملاحظات المفتوحة\n"
-
-#. TODO: Restore this functionality with addins
-#. usage +=
-#. Catalog.GetString (
-#. "  --check-plugin-unloading\tCheck if plugins are " +
-#. "unloaded properly.\n");
-#: ../Tomboy/Tomboy.cs:436
-msgid "D-BUS remote control disabled.\n"
-msgstr "D-BUS للتحكم عن بعد معطلة\n"
-
-#: ../Tomboy/Tomboy.cs:444
-#, csharp-format
-msgid "Version {0}"
-msgstr "النسخة {0}"
-
-#: ../Tomboy/Tomboy.cs:514
-#, csharp-format
-msgid ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
-msgstr ""
-"Tomboy: الخيار غير مدعوم '{0}'\n"
-"حاول تجربة الأمر tomboy --help للمزيد من المعلومات.\n"
-"<br> التحكم عن بعد لـ D-BUS معطل"
-
-#: ../Tomboy/Tray.cs:64
-msgid " (new)"
-msgstr "(جديد)"
-
-#: ../Tomboy/Tray.cs:228
-msgid "_About Tomboy"
-msgstr "_حول Tomboy"
-
-#: ../Tomboy/Utils.cs:148
-msgid "The \"Tomboy Notes Manual\" could not be found.  Please verify that your installation has been completed successfully."
-msgstr "غير قادر على إيجاد \"تعليمات ملاحظات Tomboy\".  رجاءً تأكد من أن البرنامج مثبت بشكل صحيح."
-
-#: ../Tomboy/Utils.cs:157
-msgid "Help not found"
-msgstr "غير قادر على إيجاد المساعدة"
-
-#: ../Tomboy/Utils.cs:180
-#, csharp-format
-msgid "Today, {0}"
-msgstr "اليوم، {0}"
-
-#: ../Tomboy/Utils.cs:182
-msgid "Today"
-msgstr "اليوم"
-
-#: ../Tomboy/Utils.cs:186
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "أمس، {0}"
-
-#: ../Tomboy/Utils.cs:188
-msgid "Yesterday"
-msgstr "أمس"
-
-#: ../Tomboy/Utils.cs:192
-#, csharp-format
-msgid "{0} days ago, {1}"
-msgstr "{0} يوم مضى، {1}"
-
-#: ../Tomboy/Utils.cs:194
-#, csharp-format
-msgid "{0} days ago"
-msgstr "{0} أيام مضت"
-
-#: ../Tomboy/Utils.cs:199
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "غدًا، {0}"
-
-#: ../Tomboy/Utils.cs:201
-msgid "Tomorrow"
-msgstr "غدًا"
-
-#: ../Tomboy/Utils.cs:205
-#, csharp-format
-msgid "In {0} days, {1}"
-msgstr "في {0} أيام، {1}"
-
-#: ../Tomboy/Utils.cs:207
-#, csharp-format
-msgid "In {0} days"
-msgstr "في {0} أيام"
-
-#: ../Tomboy/Utils.cs:211
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM، h:mm tt"
-
-#: ../Tomboy/Utils.cs:212
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:214
-msgid "No Date"
-msgstr "لا تاريخ"
-
-#: ../Tomboy/Utils.cs:217
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy، h:mm tt"
-
-#: ../Tomboy/Utils.cs:218
-msgid "MMMM d yyyy"
-msgstr "d MMMM  yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(غير مسمى {0})"
-
-#: ../Tomboy/Watchers.cs:188
-#, csharp-format
-msgid "A note with the title <b>{0}</b> already exists. Please choose another name for this note before continuing."
-msgstr "هناك ملاحظة بنفس الاسم <b>{0}</b> موجودة مسبقًا. رجاء اختر اسم آخر لهذه الملاحظة قبل الاستمرار"
-
-#: ../Tomboy/Watchers.cs:203
-msgid "Note title taken"
-msgstr "عنوان الملاحظة مأخوذ"
-
-#: ../Tomboy/Watchers.cs:472
-msgid "Cannot open location"
-msgstr "تعذر فتح الموقع"
-
-#: ../Tomboy/Watchers.cs:566
-msgid "_Copy Link Address"
-msgstr "انس_خ عنوان الرابط"
-
-#: ../Tomboy/Watchers.cs:571
-msgid "_Open Link"
-msgstr "ا_فتح رابط"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid "This synchronization addin is not supported on your computer. Please make sure you have FUSE and {0} correctly installed and configured"
-msgstr "ملحقة المزامنة غير مدعومة على حاسوبك. رجاءً تأكد أنك تملك FUSE وأنّ {0} مثبت ومُعدّ بشكل صحيح"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:178
-msgid "Timeout connecting to server."
-msgstr "انتهت مهلة الاتصال بالخادوم."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:186
-msgid "Error connecting to server."
-msgstr "خطأ في الاتصال بالخادوم."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:200
-msgid "FUSE could not be enabled."
-msgstr "تعذر تفعيل FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:235
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
 msgid "An error ocurred while connecting to the specified server:"
-msgstr "حصل خطأ أثناء الاتصال بالخادوم المحدد."
+msgstr "حصل خطأ أثناء الاتصال بالخادوم المحدد:"
 
 #. Expander containing TreeView
 #: ../Tomboy/Synchronization/SyncDialog.cs:89
 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
-msgid "One of your other computers is currently synchronizing.  Please wait 2 minutes and try again."
-msgstr "أحد حواسيبك يزامن حاليًا. رجاءً انتظر دقيقتين ثم حاول ثانية."
+#: ../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 "تعذرت مزامنة الملاحظات. تحقق من التفاصيل في الأسفل وحاول ثانية."
+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] "ملاحظة واحدة حُدّثت."
-msgstr[1] "ملاحظاتان حُدّثتا."
-msgstr[2] "{0} ملاحظات حُدّثت."
-msgstr[3] "{0} ملاحظة حُدّثت."
+msgstr[0] "{0} لم تُحدّث أية ملاحظة."
+msgstr[1] "{0} ملاحظة واحدة حُدّثت."
+msgstr[2] "{0} ملاحظتان حُدّثتا."
+msgstr[3] "{0} ملاحظات حُدّثت."
+msgstr[4] "{0} ملاحظة حُدّثت."
+msgstr[5] "{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 "لقد ألغيتَ المزامنة. قد ترغب بإغلاق النافذة الآن."
+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 "خطأ أثناء الاتصال بخدمة المزامنة. رجاءً حاول ثانية."
+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 "(قديم)"
+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 want to do with your local note?"
-msgstr "نسخة الخادوم من \"{0}\" تضاربت مع ملاحظتك المحلية. ماذا تريد أن تفعل بملاحظتك المحلية؟"
-
-#: ../Tomboy/Synchronization/SyncManager.cs:159
-msgid "_Tools"
-msgstr "أد_وات"
+msgid ""
+"The server version of \"{0}\" conflicts with your local note.  What do you "
+"want to do with your local note?"
+msgstr ""
+"نسخة الخادوم من \"{0}\" تضاربت مع ملاحظتك المحلية.  ماذا تريد أن تفعل "
+"بملاحظتك المحلية؟"
 
-#: ../Tomboy/Synchronization/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"
 
-#: ../Tomboy/Synchronization/SyncUtils.cs:134
-#: ../Tomboy/Synchronization/SyncUtils.cs:178
-msgid "The FUSE module could not be loaded. Please check that it is installed properly and try again."
+#: ../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."
 msgstr "تعذر تحميل وحدة FUSE. تأكد من أنها مثبتة بشكل صحيح ثم حاول مجددًا."
 
-#: ../Tomboy/Synchronization/SyncUtils.cs:149
+#: ../Tomboy/Synchronization/SyncUtils.cs:135
 msgid "Enable FUSE?"
 msgstr "هل تريد تفعيل FUSE؟"
 
 #. 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"
-"To avoid getting this prompt in the future, you should load FUSE at startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /etc/modules."
+"To avoid getting this prompt in the future, you should load FUSE at "
+"startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
+"etc/modules."
 msgstr ""
 "المزامنة التي اخترتها تتطلب تحميل وحدة FUSE.\n"
 "\n"
-"لتجنب الحصول على هذا المحث في المستقبل، عليك أن تحمّل FUSE عند بدء التشغيل. أضف \"modprobe fuse\" إلى الملف /etc/init.d/boot.local أو \"fuse\" إلى الملف /etc/modules."
+"لتجنب الحصول على هذا المحث في المستقبل،  عليك أن تحمّل FUSE عند بدء التشغيل. "
+"أضف \"modprobe fuse\" إلى الملف /etc/init.d/boot.local أو \"fuse\" إلى "
+"الملف /etc/modules."
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "تعذر إنشاء ملاحظة جديدة"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "التطوير الأوّلي:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "المساهمون:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"جهاد عفيفي\t<djihed at gmail.com>\n"
+"يوسف رفة\t<yousef at raffah.com>\n"
+"خالد حسني\t<khaledhosny at eglug.org>\n"
+"أحمد فرغل\t<ahmad.farghal at gmail.com>\n"
+"أنس عفيف عماد\t<anas.e87 at gmail.com>\n"
+"أنس أحمد\t<anass.1430 at gmail.com>\n"
+"عبدالرحيم الفاخوري\t<abdilra7eem at yahoo.com>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"حقوق النسخ © 2004-2007 أليكس جرافيلي\n"
+"حقوق النسخ © 2004-2011 آخرون\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "تطبيق سطح مكتب بسيط و سهل الاستخدام لتسجيل الملاحظات."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "الرئيسيّة"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"تومبوي: تطبيق مكتبي بسيط و سهل الاستخدام لتسجيل الملاحظات.\n"
+"حقوق النسخ © 2004-2007 أليكس جرافيلي\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"حقوق النسخ © 2004-2011 آخرون\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"الإستخدام:\n"
+"  --version\t\t\tلطباعة معلومات عن الإصدارة.\n"
+"  --help\t\t\tلطباعة رسالة الاستخدام هذه.\n"
+"  --note-path [path]\t\tحمّل/خزّن معلومات الملاحظة في هذا الدليل.\n"
+"  --search [text]\t\tافتح نافذة البحث في كل الملاحظات والبحث عن النص "
+"المحدد.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tأنشئ و اعرض ملاحظة جديدة.\n"
+"  --new-note [title]\t\tأنشئ و اعرض ملاحظة جديدة بعنوان title.\n"
+"  --open-note [title/url]\tاعرض الملاحظة ذات العنوان title.\n"
+"  --start-here\t\t\tاعرض ملاحظة 'ابدأ هنا' .\n"
+"  --highlight-search [text]\tابحث و ظلل النص text في الملاحظات المفتوحة.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "الإصدارة {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (جديد)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_حول تومبوي"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"غير قادر على إيجاد \"تعليمات ملاحظات تومبوي\" .  رجاءً تأكد من أن البرنامج "
+"مثبت بشكل صحيح."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "غير قادر على إيجاد المساعدة"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "تعذر فتح الموقع"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "اليوم، {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "اليوم"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "أمس، {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "أمس"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} لم يمضِ يوم بعد، {1}"
+msgstr[1] "{0} يوم واحد مضى، {1}"
+msgstr[2] "{0} يومان مضيا، {1}"
+msgstr[3] "{0} أيام مضت، {1}"
+msgstr[4] "{0} يومًا مضت، {1}"
+msgstr[5] "{0} يومٍ مضت، {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} لم يمضِ يوم بعد"
+msgstr[1] "{0} يوم واحد مضى"
+msgstr[2] "{0} يومان مضيا"
+msgstr[3] "{0} أيام مضت"
+msgstr[4] "{0} يومًا مضت"
+msgstr[5] "{0} يومٍ مضت"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "غدًا، {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "غدًا"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "في {0} أقل من يوم، {1}"
+msgstr[1] "في {0} يومٍ واحد، {1}"
+msgstr[2] "في {0} يومين، {1}"
+msgstr[3] "في {0} أيام، {1}"
+msgstr[4] "في {0} يومًا، {1}"
+msgstr[5] "في {0} يومٍ، {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "في {0} أقل من يوم"
+msgstr[1] "في {0} يومٍ واحد"
+msgstr[2] "في {0} يومين"
+msgstr[3] "في {0} أيام"
+msgstr[4] "في {0} يومًا"
+msgstr[5] "في {0} يومٍ"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM، h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "لا تاريخ"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy، h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(غير مسمى {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"هناك ملاحظة بنفس الاسم <b>{0}</b> موجودة مسبقًا. رجاء اختر اسم آخر لهذه "
+"الملاحظة قبل الاستمرار."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "عنوان الملاحظة مأخوذ"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "انس_خ عنوان الرابط"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "ا_فتح رابط"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "آخر دليل لتصدير HTML"
+
+#~ msgid "Add-in"
+#~ msgstr "ملحق"
+
+#~ msgid "Version"
+#~ msgstr "إصدار"
+
+#~ msgid "Other"
+#~ msgstr "أخرى"
+
+#~ msgid "_Browse..."
+#~ msgstr "ت_صفّح..."
+
+#~ msgid "Preparing pages..."
+#~ msgstr "يجري تحضير الصفحات..."
+
+#~ msgid "Rendering page %d of %d..."
+#~ msgstr "يجري جعل الصفحة %d من %d..."
+
+#~ msgid "Printing page %d of %d..."
+#~ msgstr "يجري طباعة الصفحة %d من %d..."
+
+#~ msgid "Print preview"
+#~ msgstr "معاينة الطباعة"
+
+#~ msgid "%A %x, %X"
+#~ msgstr "%A %x، %X"
+
+#~ msgid "Configuration"
+#~ msgstr "إعدادات"
+
+#~ msgid "Configuration options for the print job"
+#~ msgstr "اعدادات عملية الطبع"
+
+#~ msgid "Source Buffer"
+#~ msgstr "البافر المصدر"
+
+#~ msgid "GtkTextBuffer object to print"
+#~ msgstr "GtkTextBuffer للطباعة"
+
+#~ msgid "Tabs Width"
+#~ msgstr "عرض Tab"
+
+#~ msgid "Width in equivalent space characters of tabs"
+#~ msgstr "عدد المسافات المساوي لمفتاح Tab"
+
+#~ msgid "Wrap Mode"
+#~ msgstr "نمط اللف"
+
+#~ msgid "Word wrapping mode"
+#~ msgstr "نمط لف السطر"
+
+#~ msgid "Highlight"
+#~ msgstr "ابراز"
+
+#~ msgid "Whether to print the document with highlighted syntax"
+#~ msgstr "إن كان يُفترض طباعة الملف مع التركيبة البارزة لونيًا"
+
+#~ msgid "Font"
+#~ msgstr "خط"
+
+#~ msgid "GnomeFont name to use for the document text (deprecated)"
+#~ msgstr "اسم خط جنوم الذي يُستخدم لنص المستند (مهجور)"
+
+#~ msgid "Font Description"
+#~ msgstr "وصف الخط"
+
+#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
+#~ msgstr "الخط المستخدم لنص المستند (مثل \"Monospace 10\")"
+
+#~ msgid "Numbers Font"
+#~ msgstr "خط الأرقام"
+
+#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
+#~ msgstr "اسم خط جنوم المستخدم لأرقام الأسطر (مهجور)"
+
+#~ msgid "Font description to use for the line numbers"
+#~ msgstr "وصف الخط المستخدم لأرقام السطور"
+
+#~ msgid "Print Line Numbers"
+#~ msgstr "اطبع أرقام السطور"
+
+#~ msgid "Interval of printed line numbers (0 means no numbers)"
+#~ msgstr "المسافة بين أرقام الأسطر المطبوعة (0 يعني لا أرقام)"
+
+#~ msgid "Print Header"
+#~ msgstr "اطبع الترويسة"
+
+#~ msgid "Whether to print a header in each page"
+#~ msgstr "ما إذا تطبع ترويسة في كل صفحة"
+
+#~ msgid "Print Footer"
+#~ msgstr "اطبع التذييل"
+
+#~ msgid "Whether to print a footer in each page"
+#~ msgstr "ما إذا يطبع تذييل في كل صفحة"
+
+#~ msgid "Header and Footer Font"
+#~ msgstr "خط الترويسة و التذييل"
+
+#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
+#~ msgstr "اسم خط جنوم المستخدم في الترويسة والتذييل (مهجور)"
+
+#~ msgid "Header and Footer Font Description"
+#~ msgstr "وصف خط الترويسة والتذييل"
+
+#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
+#~ msgstr "الخط المستخدم في الترويسات والتذييلات (مثل \"Monospace 10\")"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete these notes?"
+#~ msgstr "هل تريد فعلا حذف هذه الملاحظات؟"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "ابحث في ملاحظاتك (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "لقد نحجت! أنت الآن متصل!"
+
+#~ msgid ""
+#~ "Sorry, but something went wrong.  Please check your information and try "
+#~ "again.  The ~/.tomboy.log might be useful too."
+#~ msgstr ""
+#~ "عذرًا، ولكن حصل خطأ في مكان ما. رجاءً تحقق من معلوماتك وحاول ثانية. الملف "
+#~ "~/.tomboy.log قد يكون مفيدًا أيضًا."
+
+#~ msgid "C_ase Sensitive"
+#~ msgstr "ح_ساس لحالة الأحرف"
+
+#~ msgid "D-BUS remote control disabled.\n"
+#~ msgstr "D-BUS للتحكم عن بعد معطلة\n"
+
+#~ msgid ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+#~ msgstr ""
+#~ "Tomboy: الخيار غير مدعوم '{0}'\n"
+#~ "حاول تجربة الأمر tomboy --help للمزيد من المعلومات.\n"
+#~ "<br> التحكم عن بعد لـ D-BUS معطل"
 
 #~ msgid "_Open New Note Template..."
 #~ msgstr "ا_فتح قالب ملاحظة جديد..."
+
 #~ msgid "NoteOfTheDay"
 #~ msgstr "ملاحظة اليوم"
+
 #~ msgid "Case _sensitive"
 #~ msgstr "حساس ل_حالة الأحرف"
 
 #, fuzzy
 #~ msgid "Tags in Tomboy"
 #~ msgstr "استخدام الروابط في Tomboy"
+
 #~ msgid "Delete"
 #~ msgstr "احذف"
+
 #~ msgid "Currently enabled plugins."
 #~ msgstr "الملحقات المُمَكَّنَة حاليًا."
+
 #~ msgid "List containing the names of currently enabled plugins."
 #~ msgstr "قائمة تحتوي على أسماء الملحقات المُمَكَّنَة حاليًا."
+
 #~ msgid "Add/Remove note tags"
 #~ msgstr "إضافة وإزالة علامات الملاحظات"
+
 #~ msgid "Tags:"
 #~ msgstr "علامات:"
+
 #~ msgid "Tomboy Project"
 #~ msgstr "مشروع توم‌بوي"
+
 #~ msgid "Cannot fully disable {0}."
 #~ msgstr "غير قادر على تعطيل {0} بصورة كاملة."
+
 #~ msgid ""
 #~ "Cannot fully disable {0} as there still are at least {1} reference to "
 #~ "this plugin. This indicates a programming error. Contact the plugin's "
@@ -1883,21 +2747,27 @@ msgstr ""
 #~ "<b>معلومات للمطورين:</b> تحدث هذه المشكلة عادةً عندما تكون تفشل طريقة "
 #~ "التخلص من الملحق في فصل اتصال كل مراقبي الأحداث. يمكن لمحلل العلل ({2}) "
 #~ "مساعدتك في معرفة الإشارات التالفة."
+
 #~ msgid "Plugins"
 #~ msgstr "ملحقات"
+
 #~ msgid "Written by:"
 #~ msgstr "كتب بواسطة:"
+
 #~ msgid "Web site:"
 #~ msgstr "موقع ويب:"
+
 #~ msgid "Settings"
 #~ msgstr "الاعدادات"
+
 #~ msgid "_Open Plugins Folder"
 #~ msgstr "ا_فتح مجلد الملحقات"
+
 #~ msgid "{0} Settings"
 #~ msgstr "{0} الاعدادات"
+
 #~ msgid ""
 #~ "  --check-plugin-unloading\tCheck if plugins are unloaded properly.\n"
 #~ msgstr ""
 #~ "  --check-plugin-unloading\tتحقق من أن الملحقات تم إلغاء تحميلها بصورة "
 #~ "صحيحة.\n"
-
diff --git a/po/as.po b/po/as.po
index e82a6d1..a0daf41 100644
--- a/po/as.po
+++ b/po/as.po
@@ -8,11 +8,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: as\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&component=general\n"
-"POT-Creation-Date: 2010-10-23 10:33+0000\n"
-"PO-Revision-Date: 2011-03-24 10:46+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-08-30 20:22+0000\n"
+"PO-Revision-Date: 2011-08-11 16:50+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami at redhat.com>\n"
-"Language-Team: Assamese <kde-i18n-doc at kde.org>\n"
+"Language-Team: as_IN <kde-i18n-doc at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,11 +22,11 @@ msgstr ""
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
-msgstr "আনুষঙ্গিক"
+msgstr "সৰঞ্জামসমূহ"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:2
 msgid "Simple and easy to use note-taking"
-msgstr "নোট তৈয়াৰ কৰাৰ সহজ সৰল উপায়"
+msgstr "টোকা সৃষ্টি কৰাৰ সৰল আৰু সহজে ব্যৱহাৰ কৰিব পৰা পদ্ধতি"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:3
 msgid "Tomboy Applet Factory"
@@ -34,12 +35,12 @@ msgstr "Tomboy এপ্লেট ফেক্টৰি"
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
 #: ../Tomboy/Tray.cs:579
 msgid "Tomboy Notes"
-msgstr "Tomboy Notes"
+msgstr "Tomboy টোকাসমূহ"
 
 #: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
 #: ../Tomboy/Tray.cs:274
 msgid "S_ynchronize Notes"
-msgstr "নোট সুসংগত কৰক (_y)"
+msgstr "টোকাসমূহ সংমিহলি কৰক (_y)"
 
 #: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
@@ -48,24 +49,24 @@ msgstr "বিষয়ে (_A)"
 #: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
 #: ../Tomboy/Tray.cs:288
 msgid "_Help"
-msgstr "সাহায্য (_H)"
+msgstr "সহায় (_H)"
 
 #: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
 #: ../Tomboy/Tray.cs:283
 msgid "_Preferences"
-msgstr "পছন্দ (_P)"
+msgstr "পছন্দসমূহ (_P)"
 
 #: ../data/tomboy.desktop.in.h:1
 msgid "Note-taker"
-msgstr "নোট-গ্ৰহণ ব্যৱস্থা"
+msgstr "টোকা-গ্ৰহণকাৰী"
 
 #: ../data/tomboy.desktop.in.h:2
 msgid "Take notes, link ideas, and stay organized"
-msgstr "Take notes, link ideas, and stay organized"
+msgstr "টোকা লওক, পৰিকল্পনাসমূহ সংযোগ কৰক, আৰু সংঘটিত থাকক"
 
 #: ../data/tomboy.schemas.in.h:1
 msgid "Accept SSL Certificates"
-msgstr "Accept SSL Certificates"
+msgstr "SSL প্ৰমাণপত্ৰসমূহ গ্ৰহন কৰক"
 
 #: ../data/tomboy.schemas.in.h:2
 msgid "Automatic Background Synchronization Timeout"
@@ -73,64 +74,76 @@ msgstr "স্বচালিত পটভূমি সংমিহলি সম
 
 #: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
-msgstr "নতুন নোট লিখক"
+msgstr "এটা নতুন টোকা সৃষ্টি কৰক"
 
 #: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
-msgstr "স্বনিৰ্বাচিত ফন্ট-ফেস"
+msgstr "স্বনিৰ্বাচিত ফন্ট-ফেইচ"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"\"সকলো টোকা সন্ধান কৰক\" উইন্ডোৰ X অক্ষ নিৰ্ধাৰন কৰে; Tomboy প্ৰস্থানত সংৰক্ষীত।"
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"\"সকলো টোকা সন্ধান কৰক\" উইন্ডোৰ Y অক্ষ নিৰ্ধাৰন কৰক; Tomboy প্ৰস্থানত সংৰক্ষীত।"
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"\"সকলো টোকা সন্ধান কৰক\" উইন্ডোৰ লিক্সেল উচ্চতা নিৰ্ধাৰন কৰক; Tomboy প্ৰস্থানত "
+"সংৰক্ষীত।"
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
-msgstr "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"\"সকলো টোকা সন্ধান কৰক\" উইন্ডোৰ পিক্সেল প্ৰস্থ নিৰ্ধাৰন কৰে; Tomboy প্ৰস্থানত "
+"সংৰক্ষীত।"
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "সক্ৰিয় স্বয়ংক্ৰিয়."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
-msgstr "সক্ৰিয় পেস্ট কৰক আইকন."
+msgstr "আইকনত মিডিল-ক্লিক পেইস্ট সামৰ্থবান কৰক।"
 
-#: ../data/tomboy.schemas.in.h:11
-#| msgid "TrayIcon"
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "ট্ৰে-আইকন সামৰ্থবান কৰক"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
-msgstr "WikiWord উজ্জ্বল কৰা হ'ব"
+msgstr "WikiWord উজ্জ্বলকৰণ সামৰ্থবান কৰক"
+
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "স্বচালিত বুলেট তালিকাসমূহ সামৰ্থবান কৰক।"
 
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
-msgstr "সক্ৰিয়."
+msgstr "escape -ৰ সৈতে টোকাসমূহ বন্ধ কৰা সামৰ্থবান কৰক।"
 
 #: ../data/tomboy.schemas.in.h:14
 msgid "Enable custom font"
-msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ সক্ৰিয় কৰা হ'ব"
+msgstr "স্বনিৰ্বাচিত ফন্ট সামৰ্থবান কৰক"
 
 #: ../data/tomboy.schemas.in.h:15
 msgid "Enable global keybindings"
-msgstr "গ্ৰোবাল কি-বাইন্ডিং সক্ৰিয় কৰা হ'ব"
+msgstr "বিশ্বব্যাপী কিবাইন্ডিং সামৰ্থবান কৰক"
 
 #: ../data/tomboy.schemas.in.h:16
 msgid "Enable spellchecking"
-msgstr "বানান পৰীক্ষণ ব্যৱস্থা সক্ৰিয় কৰা হ'ব"
+msgstr "বানান পৰীক্ষণ সামৰ্থবান কৰক"
 
 #: ../data/tomboy.schemas.in.h:17
 msgid "Enable startup notes"
-msgstr "প্ৰাৰম্ভিক নোট ব্যৱস্থা সক্ৰিয় কৰা হ'ব"
+msgstr "আৰম্ভৰ টোকাসমূহ সামৰ্থবান কৰক"
 
 #: ../data/tomboy.schemas.in.h:18
 msgid "Enable the Delete Note confirmation dialog"
@@ -140,140 +153,138 @@ msgstr "মচি পেলোৱা টোকা নিশ্চিতকৰণ
 msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
-msgstr "সক্ৰিয় সৰ্বমোট a."
+msgstr ""
+"এই বিকল্প সামৰ্থবান কৰক যদি আপুনি বুলেটেড তালিকাসমূহক স্বচালিত কৰিব বিচাৰে যেতিয়া "
+"আপুনি এটা শাৰীৰআৰম্ভত - অথবা * অৱস্থিত কৰে।"
 
 #: ../data/tomboy.schemas.in.h:20
 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 "সক্ৰিয় ক্লিক কৰক আৰম্ভ."
+msgstr ""
+"এই বিকল্প ক্লিক কৰক যদি আপুনি ইয়াত আৰম্ভ কৰক টোকাত সময়মোহৰ সমল পেইস্ট কৰিবলে "
+"Tomboy আইকনমিডিল-ক্লিক কৰাটো সক্ষম কৰিব বিচাৰে।"
 
 #: ../data/tomboy.schemas.in.h:21
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
 msgstr ""
-"ThatLookLikeThis'ৰ অনুৰূপ শব্দ উজ্জ্বল কৰাৰ বাবে এই বিকল্প সক্ৰিয় কৰক  । চিহ্নিত "
-"শব্দেৰ উপৰ ক্লিক কৰা হ'লে ঐ নাম একটি নোট তৈয়াৰ কৰা হ'ব  ।"
+"ThatLookLikeThis -ৰ অনুৰূপ শব্দ উজ্জ্বল কৰাৰ বাবে এই বিকল্প সামৰ্থবান কৰক। শব্দৰ "
+"উপৰত ক্লিক কৰিলে সেই নামৰ এটা টোকা সৃষ্টি হ'ব।"
 
 #: ../data/tomboy.schemas.in.h:22
 msgid "FUSE Mounting Timeout (ms)"
-msgstr "FUSE Mounting Timeout (ms)"
+msgstr "FUSE মাউন্টিং সময়অন্ত (ms)"
 
 #: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export All Linked Notes"
-msgstr "লিঙ্ক কৰা সকলোো নোট HTML এক্সপোৰ্ট কৰা হ'ব"
+msgstr "লিঙ্ক কৰা সকলো টোকা HTML এক্সপোৰ্ট কৰক"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "HTML Export সৰ্বশেষ পঞ্জিকা"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
-msgstr "HTML Export'এ লিঙ্ক কৰা নোট"
+msgstr "HTML এক্সপোৰ্ট সংযুক্ত টোকাসমূহ"
 
-#: ../data/tomboy.schemas.in.h:26
-msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+#: ../data/tomboy.schemas.in.h:25
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr "যদি অসামৰ্থবান থাকে, \"মচি পেলোৱা টোকা\" নিশ্চিতকৰণ ডাইলগ সংকুচিত হব।"
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
 msgstr ""
-"enable_custom_font মান true(সত্য) হ'লে এই স্থানে নিৰ্বাচিত ফন্ট নোট প্ৰদৰ্শনে "
-"ব্যৱহৃত হ'ব  ।"
+"enable_custom_font মান সত্য,  হ'লে এই স্থানত সংহিত ফন্ট টোকা প্ৰদৰ্শনত ব্যৱহৃত হ'ব।"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
 msgstr ""
-"সক্ৰিয় কৰা হ'লে, Tomboy প্ৰস্থানসময়ত খোলা অৱস্থায় থাকা সকলোো নোটসমূহ পুনৰাম্ভৰ সময় "
-"খোলা হ'ব  ।"
+"যদি সামৰ্থবান থাকে, Tomboy প্ৰস্থানসময়ত খোলা অৱস্থাত থকা সকলো টোকাসমূহ পুনৰাম্ভৰ "
+"সময় খোলা হ'ব।"
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr "If enabled, an opened note can be closed by hitting the escape key."
+msgstr "যদি সামৰ্থবান থাকে, এটা খোলা টোকাক escape কি দবাই বন্ধ কৰিব পাৰি।"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
 "functionality of the tray icon."
 msgstr ""
-"যদি সত্য, Tomboy -ৰ ট্ৰে আইকন সতৰ্কিকৰণ স্থানত প্ৰদৰ্শিত হব। "
-"এইটো অসামৰ্থবান কৰি দিয়া লাভদায়ক হব যেতিয়া অন্য অনুপ্ৰয়োগে ট্ৰে "
-"আইকনৰ কাৰ্য্যকাৰীতাৰ যোগান দি আছে।"
+"যদি সত্য, Tomboy -ৰ ট্ৰে আইকন সতৰ্কিকৰণ স্থানত প্ৰদৰ্শিত হব। এইটো অসামৰ্থবান কৰি "
+"দিয়া লাভদায়ক হব যেতিয়া অন্য অনুপ্ৰয়োগে ট্ৰে আইকনৰ কাৰ্য্যকাৰীতাৰ যোগান দি আছে।"
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
 msgstr ""
-"মান true (সত্য) হ'লে, ভুল বানান লাল ৰং দ্বাৰা ৰেখাঙ্কিত কৰা হ'ব আৰু প্ৰস্তাবিত সঠিক "
-"বানানসমূহ মাউসৰ ডান-বাটনে প্ৰদৰ্শিত মেনুতে দেখানো হ'ব  ।"
+"মান সত্য হ'লে, ভুল বানান ৰঙা ৰঙ দ্বাৰা ৰেখাঙ্কিত থাকিব, আৰু প্ৰস্তাবিত সঠিক "
+"বানানসমূহ মাউচৰ ৰাইট-ক্লিক মেনুত দেখুৱা হব।"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
 "available from any application."
 msgstr ""
-"মান true (সত্য) হ'লে, /apps/tomboy/global_keybindings'এ নিৰ্ধাৰিত desktop-"
-"global কি-বাইন্ডিং সক্ৰিয় কৰা হ'ব যাৰ ফলে অন্যান্য এপ্লিকেশনৰ পৰা Tomboy'ৰ "
-"গুৰুত্বপূৰ্ণ কৰ্ম প্ৰয়োগ কৰা যাব  ।"
+"মান সত্য হ'লে, /apps/tomboy/global_keybindings -ত নিৰ্ধাৰিত desktop-global "
+"কিবাইন্ডিং সামৰ্থবান থাকিব,  যাৰ ফলত অন্য অনুপ্ৰয়োগৰ পৰা Tomboy -ৰ গুৰুত্বপূৰ্ণ "
+"কাৰ্য্যসমূহ উপলব্ধ হব।"
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
 msgstr ""
-"মান true (সত্য) হ'লে, নোট প্ৰদৰ্শনেৰ বাবে custom_font_face'এ নিৰ্ধাৰিত ফন্ট ব্যৱহৃত "
-"হ'ব  । অন্যথা ডেস্কটপেৰ অবিকল্পিত ফন্ট ব্যৱহাৰ কৰা হ'ব  ।"
+"মান সত্য হ'লে, টোকা প্ৰদৰ্শনৰ বাবে custom_font_face -ত নিৰ্ধাৰিত ফন্ট ব্যৱহৃত হ'ব। "
+"অন্যথা ডেস্কটপৰ অবিকল্পিত ফন্ট ব্যৱহাৰ কৰা হব।"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
 msgstr ""
-"Sticky Note Importer প্লাগ-ইন পূৰ্বে কেতিয়া সঞ্চালিত না হওয়াৰ ইঙ্গিত দেয়  । এই "
-"কাৰণে Tomboy পৰবৰ্তীবাৰ আৰম্ভ হ'লে এটি স্বয়ংক্ৰিয়ৰূপে চালানো হ'ব  ।"
+"স্টিকি টোকা ইমপোৰ্টাৰ প্লাগিন পূৰ্বে কেতিয়া চলোৱা হোৱা নাই। এই কাৰণে Tomboy "
+"পৰবৰ্তীবাৰ আৰম্ভ হ'লে ই স্বচালিতভাৱে আৰম্ভ হব।"
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
-msgstr "Tomboy নোটৰ মেনুত প্ৰদৰ্শনযোগ্য সৰ্বনিম্ন নোট সংখ্যা নিৰ্ধাৰণকৰ্তা পূৰ্ণসংখ্যা মান  ।"
+msgstr ""
+"Tomboy টোকাৰ মেনুত প্ৰদৰ্শনযোগ্য সৰ্বনিম্ন টোকা সংখ্যা নিৰ্ধাৰণকৰ্তা পূৰ্ণসংখ্যা মান।"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
 "autosync is disabled. The lowest acceptable positive value is 5. Value is in "
 "minutes."
 msgstr ""
-"পূৰ্ণ সংখ্যা মান যোনে ইংগিত দি আছে কিমান বাৰ আপোনাৰ টোকাসমূহৰ (যেতিয়া সংমিহলি সংৰূপিত) "
-"পটভূমি সংমিহলি কৰা হব। যিকোনো মান ১ -ত কম হলে ই বুজায় যে "
-"স্বচালিত সংমিহলি অসামৰ্থবান। নুন্যতম গ্ৰহনযোগ্য ধনাত্মক মান ৫। মান "
-"মিনিটসমূহত আছে।"
+"পূৰ্ণ সংখ্যা মান যোনে ইংগিত দি আছে কিমান বাৰ আপোনাৰ টোকাসমূহৰ (যেতিয়া সংমিহলি "
+"সংৰূপিত) পটভূমি সংমিহলি কৰা হব। যিকোনো মান ১ -ত কম হলে ই বুজায় যে স্বচালিত "
+"সংমিহলি অসামৰ্থবান। নুন্যতম গ্ৰহনযোগ্য ধনাত্মক মান ৫। মান মিনিটসমূহত আছে।"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
 "user. The values map to an internal enumeration. 0 indicates that the user "
 "wishes to be prompted when a conflict occurs, so that they may handle each "
 "conflict situation on a case-by-case basis."
-msgstr "মান হলো a a a হলো সৰ্বমোট ম্যাপ a চলি আছে a."
+msgstr ""
+"পূৰ্ণ সংখ্যা মান যোনে ইংগিত দিয়ে যে যেতিয়া এটা দন্দ ধৰা পেলোৱা  হয় ব্যৱহাৰকাৰীক "
+"নোসোধাকৈ তেতিয়া এটা ধাৰ্য্যত ব্যৱহাৰ সদায় কৰিবলৈ কোনো পছন্ধ আছে নেকি। মানসমূহ এটা "
+"অভ্যন্তৰীক ইনুমাৰেষণলৈ সংযুক্ত। ০ য় বুজায় যে ব্যৱহাৰকাৰীজনে সকিয়নী বিচাৰে যেতিয়া "
+"এটা দন্দ হয়, যাতে তেওলোকে প্ৰতিটো দন্দ পৰিস্থিতিক এটা ক্ষেত্ৰৰ পৰা ক্ষেত্ৰ ভিত্তিত "
+"ব্যৱস্থাপনা কৰিব পাৰে।"
 
-#: ../data/tomboy.schemas.in.h:38
-#| msgid ""
-#| "Integer value indicating if there is a preference to always perform a "
-#| "specific behavior when a conflict is detected, instead of prompting the "
-#| "user. The values map to an internal enumeration. 0 indicates that the "
-#| "user wishes to be prompted when a conflict occurs, so that they may "
-#| "handle each conflict situation on a case-by-case basis."
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -283,99 +294,103 @@ msgid ""
 "indicates that link text should be updated to the new note name so that it "
 "will continue linking to the renamed note."
 msgstr ""
-"পূৰ্ণ সংখ্যা মান যোনে ইংগিত দিয়ে যে যেতিয়া এটা টোকা পুনৰ নাম দিয়া হয় "
-"ব্যৱহাৰকাৰীক নোসোধাকৈ তেতিয়া এটা ধাৰ্য্যত লিংক আপডেইট কৰা ব্যৱহাৰ "
-"সদায় কৰিবলৈ কোনো পছন্ধ আছে নেকি। মানসমূহ এটা অভ্যন্তৰীক ইনুমাৰেষণলৈ সংযুক্ত। ০ য় বুজায় "
-"যে ব্যৱহাৰকাৰীজনে সকিয়নী বিচাৰে যেতিয়া এটা টোকাৰ পুনৰ নামাকৰনে অন্য টোকাসমূহৰ "
-"লগত থতা লিংকসমূহ প্ৰভাৱ পেলাব পাৰে। ১ এ বুজায় লিংকসমূহ স্বচালিতভাৱে আতৰি যাব লাগে। ২ "
-"এ বুজায় লিংকৰ লিখনী নতুন টোকাৰ নামলে আপডেইট হৈ যাব লাগে যাতে ই নতুনকে নাম দিয়া টোকাৰ "
-"লগত লিংক বজায় ৰাখে।"
+"পূৰ্ণ সংখ্যা মান যোনে ইংগিত দিয়ে যে যেতিয়া এটা টোকা পুনৰ নাম দিয়া হয় ব্যৱহাৰকাৰীক "
+"নোসোধাকৈ তেতিয়া এটা ধাৰ্য্যত লিঙ্ক আপডেইট কৰা ব্যৱহাৰ সদায় কৰিবলৈ কোনো পছন্ধ আছে "
+"নেকি। মানসমূহ এটা অভ্যন্তৰীক ইনুমাৰেষণলৈ সংযুক্ত। ০ য় বুজায় যে ব্যৱহাৰকাৰীজনে সকিয়নী "
+"বিচাৰে যেতিয়া এটা টোকাৰ পুনৰ নামাকৰনে অন্য টোকাসমূহৰ লগত থতা লিঙ্কসমূহ প্ৰভাৱ "
+"পেলাব পাৰে। ১ এ বুজায় লিঙ্কসমূহ স্বচালিতভাৱে আতৰি যাব লাগে। ২ এ বুজায় লিঙ্কৰ লিখনী "
+"নতুন টোকাৰ নামলে আপডেইট হৈ যাব লাগে যাতে ই নতুনকে নাম দিয়া টোকাৰ লগত লিঙ্ক বজায় "
+"ৰাখে।"
+
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "HTML এক্সপোৰ্টত ব্যৱহৃত সেহতীয়া ডাইৰেকটৰি"
 
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
-msgstr "টোকা পুনৰ নামাকৰনত লিংক আপডেটিং ব্যৱহাৰ"
+msgstr "টোকা পুনৰ নামাকৰনত লিঙ্ক আপডেটিং ব্যৱহাৰ"
 
 #: ../data/tomboy.schemas.in.h:40
 msgid "List of pinned notes."
-msgstr "তালিকা সৰ্বমোট."
+msgstr "পিন্ন্ড টোকাসমূহৰ তালিকা।"
 
 #: ../data/tomboy.schemas.in.h:41
 msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
 msgstr ""
-"Tomboy-ৰ ট্ৰে অথবা পেনেল এপ্লেটৰ নোট মেনুত নোটৰ শিৰোনামৰ বাবে ব্যৱহাৰযোগ্য অক্ষৰৰ "
-"সৰ্বাধিক সংখ্যা  ।"
+"Tomboy-ৰ ট্ৰে অথবা পেনেল এপ্লেটৰ টোকা মেনুত টোকাৰ শীৰ্ষকৰ বাবে ব্যৱহাৰযোগ্য অক্ষৰৰ "
+"সৰ্বাধিক সংখ্যা।"
 
 #: ../data/tomboy.schemas.in.h:42
 msgid "Maximum note title length to show in tray menu."
-msgstr "ট্ৰে মেনুত প্ৰদৰ্শনযোগ্য নোটৰ শিৰোনামৰ সৰ্বাধিক দৈৰ্ঘ্য  ।"
+msgstr "ট্ৰে মেনুত প্ৰদৰ্শনযোগ্য টোকাৰ শীৰ্ষকৰ সৰ্বাধিক দৈৰ্ঘ্য।"
 
 #: ../data/tomboy.schemas.in.h:43
 msgid "Minimum number of notes to show in menu"
-msgstr "মেনুত প্ৰদৰ্শনযোগ্য সৰ্বনিম্ন নোট সংখ্যা"
+msgstr "মেনুত প্ৰদৰ্শনযোগ্য সৰ্বনিম্ন টোকা সংখ্যা"
 
 #: ../data/tomboy.schemas.in.h:44
 msgid "Note Synchronization Conflict Saved Behavior"
-msgstr "নোট সামঞ্জস্য Conflict"
+msgstr "টোকা সংমিহলি দন্দ সংৰক্ষণ ব্যৱহাৰ"
 
 #: ../data/tomboy.schemas.in.h:45
 msgid "Open Recent Changes"
-msgstr "সৰ্বশেষ পৰিবৰ্তনেৰ তথ্য প্ৰদৰ্শন"
+msgstr "সেহতীয়া পৰিবৰ্তনসমূহ খোলক"
 
 #: ../data/tomboy.schemas.in.h:46
 msgid "Open Search Dialog"
-msgstr "অনুসন্ধানেৰ ডায়লগ খুলুন"
+msgstr "সন্ধানৰ ডাইলগ খোলক"
 
 #: ../data/tomboy.schemas.in.h:47
 msgid "Open Start Here"
-msgstr "প্ৰাৰম্ভিক স্থান খুলুন"
+msgstr "আৰম্ভৰ স্থান ইয়াত খোলক"
 
 #: ../data/tomboy.schemas.in.h:48
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr "Tomboy সংমিহলি ডাইৰেকটৰি (বিকল্প) -লে SSH চাৰ্ভাৰত পথ।"
 
 #: ../data/tomboy.schemas.in.h:49
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
-msgstr "পাথ."
+msgstr "নথিপত্ৰপ্ৰণালী সংমিহলি সেৱা এডিন ব্যৱহাৰ কৰোতে সংমিহলি চাৰ্ভাৰলে পথ।"
 
 #: ../data/tomboy.schemas.in.h:50
 msgid "SSHFS Remote Synchronization Folder"
-msgstr "সামঞ্জস্য ফোল্ডাৰ."
+msgstr "SSHFS দূৰৱৰ্তী সংমিহলি ফোল্ডাৰ।"
 
 #: ../data/tomboy.schemas.in.h:51
 msgid "SSHFS Remote Synchronization User Name"
-msgstr "নিৰ্বাচিত সামঞ্জস্য পৰিসেবা"
+msgstr "SSHFS দূৰৱৰ্তী সংমিহলি ব্যৱহাৰকাৰী নাম"
 
 #: ../data/tomboy.schemas.in.h:52
 msgid "SSHFS Synchronization Server Port"
-msgstr "সামঞ্জস্য পৰিসেবা ত্ৰুটি"
+msgstr "SSHFS সংমিহলি চাৰ্ভাৰ পোৰ্ট"
 
 #: ../data/tomboy.schemas.in.h:53
 msgid "SSHFS Synchronization Server URL"
-msgstr "সামঞ্জস্য পৰিসেবা ত্ৰুটি"
+msgstr "SSHFS সংমিহলি চাৰ্ভাৰ URL"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Saved height of Search window"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "\"সকলো টোকা সন্ধান কৰক\" উইন্ডোৰ সংৰক্ষীত উচ্চতা"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Saved horizontal position of Search window"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "\"সকলো টোকা সন্ধান কৰক\" উইন্ডোৰ সংৰক্ষীত আনুভূমিক অৱস্থান"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Saved vertical position of Search window"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "\"সকলো টোকা সন্ধান কৰক\" উইন্ডোৰ সংৰক্ষীত উলম্ব অৱস্থান"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "সকলো নোট অনুসন্ধানেৰ উইন্ডো খুলুন"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "\"সকলো টোকা সন্ধান কৰক\" উইন্ডোৰ সংৰক্ষীত প্ৰস্থ"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
-msgstr "নিৰ্বাচিত সামঞ্জস্য পৰিসেবা"
+msgstr "নিৰ্বাচিত সংমিহলি সেৱা এডিন"
 
 #: ../data/tomboy.schemas.in.h:59
 msgid "Set to TRUE to activate"
@@ -383,27 +398,27 @@ msgstr "সক্ৰিয় কৰাৰ বাবে মান TRUE ধাৰ্
 
 #: ../data/tomboy.schemas.in.h:60
 msgid "Show applet menu"
-msgstr "এপ্লেট মেনু প্ৰদৰ্শন কৰা হ'ব"
+msgstr "এপ্লেট মেনু দেখুৱাওক"
 
 #: ../data/tomboy.schemas.in.h:61
 msgid "Start Here Note"
-msgstr "প্ৰাৰম্ভিক নোট"
+msgstr "ইয়াত আৰম্ভ কৰক টোকা"
 
 #: ../data/tomboy.schemas.in.h:62
 msgid "Sticky Note Importer First Run"
-msgstr "Sticky Notes ইম্পোৰ্ট প্ৰথম চালনা"
+msgstr "স্টিকি টোকা ইমপোৰ্টাৰ প্ৰথম চালনা"
 
 #: ../data/tomboy.schemas.in.h:63
 msgid "Synchronization Client ID"
-msgstr "সামঞ্জস্য ID"
+msgstr "সংমিহলি ক্লাএন্ট ID"
 
 #: ../data/tomboy.schemas.in.h:64
 msgid "Synchronization Local Server Path"
-msgstr "সামঞ্জস্য স্থানীয় সেৱক পাথ"
+msgstr "সংমিহলি স্থানীয় চাৰ্ভাৰ পথ"
 
 #: ../data/tomboy.schemas.in.h:65
 msgid "The date format that is used for the timestamp."
-msgstr "হলো উল্লিখিত সময় অবধি."
+msgstr "সময়মোহৰৰ বাবে ব্যৱহৃত তাৰিখ বিন্যাস।"
 
 #: ../data/tomboy.schemas.in.h:66
 msgid ""
@@ -414,11 +429,11 @@ msgid ""
 "option to the special string \"disabled\", then there will be no keybinding "
 "for this action."
 msgstr ""
-"নতুন নোট নিৰ্মাণ আৰু প্ৰদৰ্শনেৰ বাবে ব্যৱহৃত গ্লোবাল কি-বাইন্ডিং  । সম্ভাব্য বিন্যাস "
-"\"<Control>a\" অথবা \"<Shift><Alt>F1\"  । পাৰ্সাৰেত বড় আৰু "
-"ছোট ছাঁদেৰ হৰফ আৰু \"<Ctl>\" আৰু \"<Ctrl>\"'ৰ মত সংক্ষিপ্ত ৰূপ প্ৰয়োগ "
-"কৰা যাব  । বিকল্পেৰ মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কৰ্মৰ বাবে কোনো কি-"
-"বাইন্ডিং উপলব্ধ কৰা হ'ব না  ।"
+"নতুন টোকা নিৰ্মাণ আৰু প্ৰদৰ্শনৰ বাবে ব্যৱহৃত বিশ্বব্যাপী কিবাইন্ডিং। সম্ভাব্য বিন্যাস "
+"\"<Control>a\" অথবা \"<Shift><Alt>F1\"। বিশ্লেষকত ডাঙৰ আৰু  "
+"সৰু ফলা আৰু \"<Ctl>\" আৰু \"<Ctrl>\" -ৰ নিচিনা সংক্ষিপ্ত ৰূপ প্ৰয়োগ কৰা "
+"যাব। বিকল্পৰ মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কাৰ্য্যৰ বাবে কোনো কি-"
+"বাইন্ডিং উপলব্ধ নাথাকিব।"
 
 #: ../data/tomboy.schemas.in.h:67
 msgid ""
@@ -429,11 +444,11 @@ msgid ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 msgstr ""
-"\"প্ৰাৰম্ভিক স্থান\" শীৰ্ষক নোট প্ৰদৰ্শনেৰ গ্লোবাল কি-বাইন্ডিং  । সম্ভাব্য বিন্যাস "
-"\"<Control>a\" অথবা \"<Shift><Alt>F1\"  । পাৰ্সাৰেত বড় আৰু "
-"ছোট ছাঁদেৰ হৰফ আৰু \"<Ctl>\" আৰু \"<Ctrl>\"'ৰ মত সংক্ষিপ্ত ৰূপ প্ৰয়োগ "
-"কৰা যাব  । বিকল্পেৰ মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কৰ্মৰ বাবে কোনো কি-"
-"বাইন্ডিং উপলব্ধ কৰা হ'ব না  ।"
+"\"আৰম্ভৰ স্থান\" শীৰ্ষক টোকা প্ৰদৰ্শনৰ বিশ্বব্যাপী কিবাইন্ডিং। সম্ভাব্য বিন্যাস \"<"
+"Control>a\" অথবা \"<Shift><Alt>F1\"। বিশ্লেষকত ডাঙৰ আৰু  সৰু ফলা "
+"আৰু \"<Ctl>\" আৰু \"<Ctrl>\" -ৰ নিচিনা সংক্ষিপ্ত ৰূপ প্ৰয়োগ কৰা যাব। "
+"বিকল্প মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কাৰ্য্যৰ বাবে কোনো কি-বাইন্ডিং "
+"উপলব্ধ নাথাকিব।"
 
 #: ../data/tomboy.schemas.in.h:68
 msgid ""
@@ -444,11 +459,11 @@ msgid ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 msgstr ""
-"নোট অনুসন্ধানেৰ ডায়লগ প্ৰদৰ্শনেৰ বাবে ব্যৱহৃত গ্লোবাল কি-বাইন্ডিং  । সম্ভাব্য বিন্যাস "
-"\"<Control>a\" অথবা \"<Shift><Alt>F1\"  । পাৰ্সাৰেত বড় আৰু "
-"ছোট ছাঁদেৰ হৰফ আৰু \"<Ctl>\" আৰু \"<Ctrl>\"'ৰ মত সংক্ষিপ্ত ৰূপ প্ৰয়োগ "
-"কৰা যাব  । বিকল্পেৰ মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কৰ্মৰ বাবে কোনো কি-"
-"বাইন্ডিং উপলব্ধ কৰা হ'ব না  ।"
+"টোকা সন্ধানৰ ডাইলগ প্ৰদৰ্শনৰ বাবে ব্যৱহৃত বিশ্বব্যাপী কিবাইন্ডিং। সম্ভাব্য বিন্যাস "
+"\"<Control>a\" অথবা \"<Shift><Alt>F1\"। বিশ্লেষকত ডাঙৰ আৰু  "
+"সৰু ফলা আৰু \"<Ctl>\" আৰু \"<Ctrl>\" -ৰ নিচিনা সংক্ষিপ্ত ৰূপ প্ৰয়োগ কৰা "
+"যাব। বিকল্প মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কাৰ্য্যৰ বাবে কোনো কি-"
+"বাইন্ডিং উপলব্ধ নাথাকিব।"
 
 #: ../data/tomboy.schemas.in.h:69
 msgid ""
@@ -459,11 +474,11 @@ msgid ""
 "option to the special string \"disabled\", then there will be no keybinding "
 "for this action."
 msgstr ""
-"সাম্প্ৰতিক পৰিবৰ্তনেৰ ডায়লগ প্ৰদৰ্শনেৰ বাবে গ্লোবাল কি-বাইন্ডিং  । সম্ভাব্য বিন্যাস "
-"\"<Control>a\" অথবা \"<Shift><Alt>F1\"  । পাৰ্সাৰেত বড় আৰু "
-"ছোট ছাঁদেৰ হৰফ আৰু \"<Ctl>\" আৰু \"<Ctrl>\"'ৰ মত সংক্ষিপ্ত ৰূপ প্ৰয়োগ "
-"কৰা যাব  । বিকল্পেৰ মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কৰ্মৰ বাবে কোনো কি-"
-"বাইন্ডিং উপলব্ধ কৰা হ'ব না  ।"
+"সেহতীয়া পৰিবৰ্তনৰ ডাইলগ প্ৰদৰ্শনৰ বাবে বিশ্বব্যাপী কিবাইন্ডিং। সম্ভাব্য বিন্যাস \"<"
+"Control>a\" অথবা \"<Shift><Alt>F1\"। বিশ্লেষকত ডাঙৰ আৰু  সৰু ফলা "
+"আৰু \"<Ctl>\" আৰু \"<Ctrl>\" -ৰ নিচিনা সংক্ষিপ্ত ৰূপ প্ৰয়োগ কৰা যাব। "
+"বিকল্প মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কাৰ্য্যৰ বাবে কোনো কি-বাইন্ডিং "
+"উপলব্ধ নাথাকিব।"
 
 #: ../data/tomboy.schemas.in.h:70
 msgid ""
@@ -474,25 +489,30 @@ msgid ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 msgstr ""
-"Tomboy এপ্লেটৰ মেনু প্ৰদৰ্শনেৰ বাবে গ্লোবাল কি-বাইন্ডিং  । সম্ভাব্য বিন্যাস \"<"
-"Control>a\" অথবা \"<Shift><Alt>F1\"  । পাৰ্সাৰেত বড় আৰু ছোট "
-"ছাঁদেৰ হৰফ আৰু \"<Ctl>\" আৰু \"<Ctrl>\"'ৰ মত সংক্ষিপ্ত ৰূপ প্ৰয়োগ কৰা "
-"যাব  । বিকল্পেৰ মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কৰ্মৰ বাবে কোনো কি-"
-"বাইন্ডিং উপলব্ধ কৰা হ'ব না  ।"
+"Tomboy এপ্লেটৰ মেনু প্ৰদৰ্শনৰ বাবে বিশ্বব্যাপী কিবাইন্ডিং। সম্ভাব্য বিন্যাস \"<"
+"Control>a\" অথবা \"<Shift><Alt>F1\"। বিশ্লেষকত ডাঙৰ আৰু সৰু ফলা "
+"আৰু \"<Ctl>\" আৰু \"<Ctrl>\" -ৰ নিচিনা সংক্ষিপ্ত ৰূপ প্ৰয়োগ কৰা যাব। "
+"বিকল্প মান \"disabled\" ৰূপে স্থাপন কৰা হ'লে এই কাৰ্য্যৰ বাবে কোনো কি-বাইন্ডিং "
+"উপলব্ধ নাথাকিব।"
 
 #: ../data/tomboy.schemas.in.h:71
 msgid "The handler for \"note://\" URLs"
-msgstr "\"note://\" URL'ৰ বাবে হ্যান্ডলাৰ"
+msgstr "\"note://\" URL -ৰ বাবে ব্যৱস্থাপক"
 
 #: ../data/tomboy.schemas.in.h:72
-msgid "The last directory a note was exported to using the Export To HTML plugin."
-msgstr "Export To HTML প্লাগ-ইন সহযোগে সৰ্বশেষ যে পঞ্জিকাত নোট এক্সপোৰ্ট কৰা হৈছে  ।"
+msgid ""
+"The last directory a note was exported to using the Export To HTML plugin."
+msgstr ""
+"HTML  -লে এক্সপোৰ্ট কৰক প্লাগিন সহযোগে সৰ্বশেষ যি ডাইৰেকটৰিত টোকা এক্সপোৰ্ট কৰা "
+"হৈছে।"
 
 #: ../data/tomboy.schemas.in.h:73
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
-msgstr "Export to HTML প্লাগ-ইনেৰ 'Export linked notes' চেকবক্সৰ সৰ্বশেষ নিৰ্ধাৰিত মান  ।"
+msgstr ""
+"HTML -লে এক্সপোৰ্ট কৰক প্লাগিনৰ 'সংযুক্ত টোকাসমূহ এক্সপোৰ্ট কৰক'' চেকবাকচৰ সৰ্বশেষ "
+"নিৰ্ধাৰিত মান।"
 
 #: ../data/tomboy.schemas.in.h:74
 msgid ""
@@ -500,69 +520,79 @@ msgid ""
 "Export to HTML plugin. This setting is used in conjunction with the 'HTML "
 "Export Linked Notes' setting and is used to specify whether all notes (found "
 "recursively) should be included during an export to HTML."
-msgstr "শেষ উল্লিখিত সময় অবধি হলো নোট আৰু হলো."
+msgstr ""
+"HTML -ত এক্সপোৰ্ট কৰক প্লাগিনত 'অন্য সকলো টোকা অন্তৰ্ভুক্ত কৰক' -ৰ বাবে সেহতীয়া "
+"সংহতিএই সংহতি 'সংযুক্ত টোকাসমূহলক HTML এক্সপোৰ্ট কৰক'  সংহতিৰ লগত ব্যৱহৃত আৰু ধাৰ্য্য "
+"কৰিবলেব্যৱহাৰ কৰা হয় যে সকলো টোকা (বাৰংবাৰতাৰে উপলব্ধ) HTML লে এক্সপোৰ্ট কৰোতে "
+"অন্তৰ্ভুক্ত কৰা হব নে।"
 
 #: ../data/tomboy.schemas.in.h:75
 msgid ""
 "The note URI of the note that should be considered the \"Start Here\" note, "
 "which is always placed at the bottom of the Tomboy note menu and also "
 "accessible by hotkey."
-msgstr "সৰ্বমোট আৰম্ভ হলো তলত সৰ্বমোট আৰু."
+msgstr ""
+"টোকাৰ টোকা URI যাক \"ইয়াত আৰম্ভ কৰক\" টোকা বুলি ধৰিব লাগিব।যাক সদায় Tomboy "
+"টোকা মেনুৰ তলত অৱস্থিত কৰা হয় আৰু যি হটকিৰেও অভিগম কৰিব পাৰি।"
 
 #: ../data/tomboy.schemas.in.h:76
 msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
 msgstr ""
-"SSH-ৰ মাধ্যমে সুসংগতিৰ সেৱকৰ সৈতে সংযোগ স্থাপনসময়ত ব্যৱহাৰযোগ্য পোৰ্ট  । বিকল্প "
+"SSH-ৰ মাধ্যমে সংমিহলিৰ চাৰ্ভাৰৰ সৈতে সংযোগ স্থাপনসময়ত ব্যৱহাৰযোগ্য পোৰ্ট। বিকল্প "
 "হিচাপে অবিকল্পিত SSH পোৰ্টৰ বৈশিষ্ট্য ব্যৱহাৰ কৰিবলৈ ইচ্ছুক হ'লে ইয়াৰ বাবে -1 অথবা "
-"কম মান নিৰ্ধাৰণ কৰক  ।"
+"কম মান নিৰ্ধাৰণ কৰক।"
 
 #: ../data/tomboy.schemas.in.h:77
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
 msgstr ""
-"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
-"mount a sync share."
+"Tomboy -এ সংমিহলি অংশীদাৰী মাউন্ট কৰিবলে FUSE ব্যৱহাৰৰ বাবে অপেক্ষা কৰা সময় "
+"(মিলিছেকেণ্ডত)।"
 
 #: ../data/tomboy.schemas.in.h:78
 msgid "Timestamp format"
-msgstr "Timestamp format"
+msgstr "সময়মোহৰ বিন্যাস"
 
 #: ../data/tomboy.schemas.in.h:79
 msgid "URL of SSH server containing Tomboy synchronization directory."
-msgstr "URL of SSH server containing Tomboy synchronization directory."
+msgstr "Tomboy সংমিহলি ডাইৰেকটৰি অন্তৰ্ভুক্ত কৰা SSH চাৰ্ভাৰৰ URL।"
 
 #: ../data/tomboy.schemas.in.h:80
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
-msgstr "উল্লিখিত সময় অবধি."
+msgstr "বৰ্তমানে সংৰূপীত টোকা সংমিহলি সেৱা এডিনৰ বাবে অবিকল্পিত পৰিচয়ক।"
 
 #: ../data/tomboy.schemas.in.h:81
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
-msgstr "উল্লিখিত সময় অবধি a."
+msgstr ""
+"এই  Tomboy ক্লাএন্টৰ বাবে অবিকল্প পৰিচয়ক, এটা সংমিহলি চাৰ্ভাৰৰ লগত সংযোগ কৰোতে "
+"ব্যৱহৃত।"
 
 #: ../data/tomboy.schemas.in.h:82
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr ""
-"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
-"user."
+"ব্যৱহাৰকাৰীৰক নসোধাকে SSL প্ৰমাণপত্ৰসমূহ গ্ৰহণ কৰিবলে wdfs বিকল্প \"-ac\" ব্যৱহাৰ "
+"কৰক।"
 
 #: ../data/tomboy.schemas.in.h:83
 msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr "ত্ৰুটি."
+msgstr "SSH -ৰে সংমিহলি চাৰ্ভাৰলে সংযৌগ কৰোতে ব্যৱহাৰ কৰিব লগিয়া ব্যৱহাৰকাৰী নাম।"
 
 #: ../data/tomboy.schemas.in.h:84
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
-msgstr "তালিকা সৰ্বমোট উল্লিখিত সময় অবধি."
+msgstr ""
+"Tomboy টোকা মেনুত সদায় উপস্থিত হবলে টোকাসমূহৰ বাবে টোকা URIসমূহৰ খালিস্থান-পৃথকিত "
+"তালিকা।"
 
 #: ../Tomboy/ActionManager.cs:127
 msgid "_File"
@@ -574,59 +604,59 @@ msgstr "নতুন (_N)"
 
 #: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
 msgid "Create a new note"
-msgstr "নতুন নোট লিখক"
+msgstr "এটা নতুন টোকা সৃষ্টি কৰক"
 
 #: ../Tomboy/ActionManager.cs:134
 msgid "_Open..."
-msgstr "খুলুন(_O)..."
+msgstr "খোলক (_O)..."
 
 #: ../Tomboy/ActionManager.cs:135
 msgid "Open the selected note"
-msgstr "নিৰ্বাচিত নোট খুলুন"
+msgstr "নিৰ্বাচিত টোকা খোলক"
 
 #: ../Tomboy/ActionManager.cs:138
 msgid "_Delete"
-msgstr "মুছে ফেলুন (_D)"
+msgstr "মচি পেলাওক (_D)"
 
 #: ../Tomboy/ActionManager.cs:139
 msgid "Delete the selected note"
-msgstr "নিৰ্বাচিত নোট মুছে ফেলুন"
+msgstr "নিৰ্বাচিত টোকা মচি পেলাওক"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
-msgstr "বন্ধ (_C)"
+msgstr "বন্ধ কৰক (_C)"
 
 #: ../Tomboy/ActionManager.cs:143
 msgid "Close this window"
-msgstr "এই উইন্ডোটি বন্ধ কৰক"
+msgstr "এই উইন্ডোটো বন্ধ কৰক"
 
 #: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
 msgid "_Quit"
-msgstr "প্ৰস্থান (_Q)"
+msgstr "প্ৰস্থান কৰক (_Q)"
 
 #: ../Tomboy/ActionManager.cs:147
 msgid "Quit Tomboy"
-msgstr "Tomboyৰ পৰা প্ৰস্থান"
+msgstr "Tomboy -ৰ পৰা প্ৰস্থান"
 
 #: ../Tomboy/ActionManager.cs:150
 msgid "_Edit"
-msgstr "সম্পাদনা (_E)"
+msgstr "সম্পাদনা কৰক (_E)"
 
 #: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
-msgstr "Tomboy সংক্ৰান্ত বৈশিষ্ট্য"
+msgstr "Tomboy পছন্দসমূহ"
 
 #: ../Tomboy/ActionManager.cs:160
 msgid "_Contents"
-msgstr "বিষয়বস্তু (_C)"
+msgstr "সমলসমূহ (_C)"
 
 #: ../Tomboy/ActionManager.cs:161
 msgid "Tomboy Help"
-msgstr "Tomboy সাহায্য"
+msgstr "Tomboy সহায়"
 
 #: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
 msgid "About Tomboy"
-msgstr "Tomboy পৰিচিতি"
+msgstr "Tomboy -ৰ বিষয়ে"
 
 #: ../Tomboy/ActionManager.cs:168
 msgid "TrayIcon"
@@ -634,25 +664,36 @@ msgstr "ট্ৰে-আইকন"
 
 #: ../Tomboy/ActionManager.cs:171
 msgid "Create _New Note"
-msgstr "নতুন নোট লিখক (_N)"
+msgstr "নতুন টোকা সৃষ্টি কৰক (_N)"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
-msgstr "সকলো নোট অনুসন্ধান কৰক (_S)"
+msgstr "সকলো টোকা সন্ধান কৰক (_S)"
 
 #: ../Tomboy/ActionManager.cs:176
 msgid "Open the Search All Notes window"
-msgstr "সকলো নোট অনুসন্ধানেৰ উইন্ডো খুলুন"
+msgstr "সকলো টোকা সন্ধানৰ উইন্ডো খোলক"
 
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
-msgstr "নোট সুসংগতি আৰম্ভ কৰক"
+msgstr "টোকা সংমিহলি আৰম্ভ কৰক"
+
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "উন্নত"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "সেহতীয়া তালিকাত দেখুৱাব লগিয়া টোকাসমূহৰ নূন্যতম সংখ্যা (সৰ্বাধিক ১৮)"
 
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
-msgstr "What links here?"
+msgstr "ইয়াত কি সংযোগ কৰে?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(শূণ্য)"
 
@@ -660,7 +701,9 @@ msgstr "(শূণ্য)"
 msgid ""
 "You can use any bugzilla just by dragging links into notes.  If you want a "
 "special icon for certain hosts, add them here."
-msgstr "You a উল্লিখিত সময় অবধি."
+msgstr ""
+"আপুনি টোকাসমূহত লিঙ্কসমূহ ড্ৰেগ কৰি যিকোনো bugzilla ব্যৱহাৰ কৰিব পাৰিব। যদি আপুনি "
+"কিছুমান হস্টৰ বাবেএটা বিশেষ হস্ট বিচাৰে, সিহতক তাত যোগ কৰক।"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
 msgid "Host Name"
@@ -672,58 +715,82 @@ msgstr "আইকন"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:176
 msgid "Select an icon..."
-msgstr "একটি আইকন নিৰ্বাচন কৰক..."
+msgstr "এটা আইকন নিৰ্বাচন কৰক..."
 
 #. Extra Widget
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:191
 msgid "_Host name:"
-msgstr "হোস্টৰ নাম: (_H)"
+msgstr "হোস্টৰ নাম (_H):"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:220
 msgid "No host name specified"
-msgstr "হোস্টৰ নাম উল্লিখিত হয়নি"
+msgstr "হোস্টৰ নাম উল্লিখিত হোৱা নাই"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
 msgid "You must specify the Bugzilla host name to use with this icon."
-msgstr "চিহ্নিত আইকনেৰ সৈতে ব্যৱহাৰযোগ্য Bugzilla হোস্টৰ নাম উল্লেখ কৰা আবশ্যক  ।"
+msgstr "চিহ্নিত আইকনৰ সৈতে ব্যৱহাৰযোগ্য Bugzilla হোস্টৰ নাম উল্লেখ কৰা আবশ্যক।"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
 msgid "Error saving icon"
-msgstr "আইকন সংৰক্ষণ কৰিবলৈ ব্যৰ্থ"
+msgstr "আইকন সংৰক্ষণ কৰোতে ত্ৰুটি"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
 msgid "Could not save the icon file."
-msgstr "আইকন নথিপত্ৰ সংৰক্ষণ কৰিবলৈ ব্যৰ্থ  ।  "
+msgstr "আইকন নথিপত্ৰ সংৰক্ষণ কৰিব পৰা নগল।  "
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
-msgstr "চিহ্নিত আইকন নিশ্চিতৰূপে আঁতৰুৱা হ'ব নেকি ?"
+msgstr "এই আইকন নিশ্চিতৰূপে আঁতৰুৱা হ'ব নেকি ?"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
 msgid "If you remove an icon it is permanently lost."
-msgstr "আইকন আঁতৰুৱা হ'লে তা পুনৰুদ্ধাৰ কৰা সম্ভৱ নয়  ।"
+msgstr "আপুনি এটা আইকন আতৰালে ই চিৰস্থায়ীভাৱে হেৰাই যাব।"
+
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "ই-মেইল খোলিব নোৱাৰি"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "HTML এক্সপোৰ্টৰ উদ্দেশ্যে গন্তব্য"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "সংযুক্ত টোকা এক্সপোৰ্ট কৰক"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "অন্য সকলো সংযুক্ত টোকা অন্তৰ্ভুক্ত কৰক"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
-msgstr "Export to HTML"
+msgstr "HTML লে পঠিৱাওক"
 
 # # , csharp-format
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
-msgstr "আপোনাৰ নোট \"{0}\" ত এক্সপোৰ্ট কৰা হৈছে  ।"
+msgstr "আপোনাৰ টোকা \"{0}\" ত এক্সপোৰ্ট কৰা হৈছে।"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
 msgid "Note exported successfully"
-msgstr "সফলতাৰে সৈতে নোট এক্সপোৰ্ট কৰা হৈছে"
+msgstr "সফলতাৰে সৈতে টোকা এক্সপোৰ্ট কৰা হৈছে"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
-msgstr "ব্যৱহাৰাধিকাৰ প্ৰত্যাখ্যাত  ।"
+msgstr "অভিগম নাকচ কৰা হৈছে।"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
-msgstr "ফোল্ডাৰ অনুপস্থিত  ।"
+msgstr "ফোল্ডাৰ অনুপস্থিত।"
 
 # # , csharp-format
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
@@ -731,45 +798,31 @@ msgstr "ফোল্ডাৰ অনুপস্থিত  ।"
 msgid "Could not save the file \"{0}\""
 msgstr "\"{0}\" নথিপত্ৰ সংৰক্ষণ কৰিবলৈ ব্যৰ্থ"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "HTML এক্সপোৰ্টৰ উদ্দেশ্যে গন্তব্য পঞ্জিকা"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "লিঙ্ক কৰা নোট এক্সপোৰ্ট কৰা হ'ব"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "লিঙ্ক কৰা সকলোো নোট এক্সপোৰ্ট অন্তৰ্ভুক্ত কৰক"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "ই-মেইল খুলতে ব্যৰ্থ"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
-msgstr "ফোল্ডাৰ পাথ:"
+msgstr "ফোল্ডাৰ পথ (_F):"
 
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
 msgid "Select Synchronization Folder..."
-msgstr "সামঞ্জস্য ফোল্ডাৰ."
+msgstr "সংমিহলি ফোল্ডাৰ বাছক..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
-msgstr "ফোল্ডাৰৰ পাথ চিহ্নকৰ্তা ক্ষেত্ৰে মান অনুপস্থিত  ।"
+msgstr "ফোল্ডাৰৰ পথ ক্ষেত্ৰ ৰিক্ত।"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
-msgid "Specified folder path does not exist, and Tomboy was unable to create it."
-msgstr "উল্লিখিত ফোল্ডাৰৰ পাথ অনুপস্থিত আৰু Tomboy দ্বাৰা এটি নিৰ্মাণ কৰা সম্ভৱ হয়নি  ।"
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
+msgid ""
+"Specified folder path does not exist, and Tomboy was unable to create it."
+msgstr ""
+"উল্লিখিত ফোল্ডাৰৰ পথ অনুপস্থিত আৰু Tomboy দ্বাৰা ইয়াক নিৰ্মাণ কৰা সম্ভৱ হোৱা নাই।"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "স্থানীয় ফোল্ডাৰ"
 
 #: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
 msgid "Fixed Wid_th"
-msgstr "প্ৰস্থৰ সুনিৰ্দিষ্ট মাপ (_t)"
+msgstr "প্ৰস্থৰ সুনিৰ্দিষ্ট আকাৰ (_t)"
 
 # # , csharp-format
 #: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
@@ -781,11 +834,11 @@ msgstr "'{0}'-ৰ সৈতে সংযোগ কৰিবলৈ ব্যৰ
 #: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
 #, csharp-format
 msgid "Error running gaim-remote: {0}"
-msgstr "gaim-remote সঞ্চালনে সমস্যা: {0}"
+msgstr "gaim-remote চলোৱাৰ ত্ৰুটি: {0}"
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs:29
 msgid "Insert Timestamp"
-msgstr "Insert Timestamp"
+msgstr "সময়মোহৰ সোমাওক"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
@@ -795,23 +848,23 @@ msgstr "dddd, MMMM d, h:mm tt"
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
 msgid "Choose one of the predefined formats or use your own."
-msgstr "সৰ্বমোট."
+msgstr "যিকোনো এটা পূৰ্বনিৰ্ধাৰিত বিন্যাস বাছক অথবা নিজৰ এটা ব্যৱহাৰ কৰক।"
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
 msgid "Use _Selected Format"
-msgstr "নিৰ্বাচিত ফৰম্যাট"
+msgstr "নিৰ্বাচিত বিন্যাস বাছক (_S)"
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:87
 msgid "_Use Custom Format"
-msgstr "স্বনিৰ্বাচিত ফৰম্যাট"
+msgstr "স্বনিৰ্বাচিত বিন্যাস ব্যৱহাৰ কৰক (_U)"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:10
 msgid "Today: Template"
-msgstr "আজ: টেমপ্লেট"
+msgstr "আজি: টেমপ্লেইট"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:12
 msgid "Today: "
-msgstr "আজ: "
+msgstr "আজি: "
 
 #. Format: "Today: Friday, July 01 2005"
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
@@ -820,21 +873,21 @@ msgstr "dddd, MMMM d yyyy"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:43
 msgid "Tasks"
-msgstr "কৰ্ম"
+msgstr "কাৰ্য্যসমূহ"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:44
 msgid "Appointments"
-msgstr "সাক্ষাৎকাৰ"
+msgstr "সাক্ষাৎকাৰসমূহ"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
-msgstr "Change<span weight=\"bold\"> আজ ছাঁচ</span> আজ."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
+msgstr "<b>আজি: টেমপ্লেইট</b> টোকাক নতুন আজি টোকাসমূহ থকা দৰে স্বনিৰ্বাচিত কৰক।"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
-msgstr "আজ: টেমপ্লেট খুলুন (_O)"
+msgstr "আজি: টেমপ্লেইট খোলক (_O)"
 
 #: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:52
 msgid "Print"
@@ -842,7 +895,7 @@ msgstr "প্ৰিন্ট কৰক"
 
 #: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:82
 msgid "Error printing note"
-msgstr "ত্ৰুটি"
+msgstr "টোকা প্ৰিন্ট কৰোতে ত্ৰুটি"
 
 # , csharp-format
 #: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:223
@@ -854,78 +907,90 @@ msgstr "পৃষ্ঠা {0}, সৰ্বমোট {1}"
 #. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
 #: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:242
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
-msgstr "dddd, MMMM d, h:mm tt"
+msgstr "dddd MM/dd/yyyy, hh:mm:ss tt"
+
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "ভঙা লিঙ্কসমূহ আতৰাওক"
 
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
-msgstr "যোগ কৰক a"
+msgstr "এটা নক্সা যোগ কৰক"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
-msgstr "Se_rver:"
+msgstr "চাৰ্ভাৰ (_r):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
-msgstr "ব্যৱহাৰকৰ্তাৰ নাম (_n):"
+msgstr "ব্যৱহাৰকাৰীৰ নাম (_n):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
-msgstr "ফোল্ডাৰ পাথ:"
+msgstr "ফোল্ডাৰ পথ (বৈক্লপিক) (_F):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
-msgstr "SSH SSH উল্লিখিত সময় অবধি আৰু a চলমান SSH."
+msgstr ""
+"SSH সংমিহলিয়ে  এটা চলি থকা SSH ডিমনলে সংযুক্ত, এই চাৰ্ভাৰ আৰু ব্যৱহাৰকাৰীৰ বাবে "
+"এটা স্থায়ী SSH চাবি বিচাৰে। "
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
-msgstr "সেৱক অথবা ব্যৱহাৰকৰ্তাৰ নাম উল্লিখিত হয়নি  ।"
+msgstr "চাৰ্ভাৰ অথবা ব্যৱহাৰকাৰীৰ নাম উল্লিখিত হোৱা নাই।"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
-msgstr "Timeout SSH a চলমান SSH."
+msgstr ""
+"এটা চাৰ্ভাৰলে সংযোগ কৰোতে সময়অন্ত। অনুগ্ৰহ কৰি সুনিশ্চিত কৰক যে আপোনাৰ SSH চাবি "
+"এটা চলি থকাSSH ডিমনলে যোগ কৰা আছে।"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
 msgid "Import from Sticky Notes"
-msgstr "Sticky Notesৰ পৰা ইম্পোৰ্ট কৰক"
+msgstr "স্টিকি টোকাসমূহৰ পৰা ইম্পোৰ্ট কৰক"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:133
 msgid "No Sticky Notes found"
-msgstr "কোনো স্টিকি-নোট পোৱা নাযায়"
+msgstr "কোনো স্টিকি-টোকা পোৱা নাযায়"
 
 # # , csharp-format
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
 #, csharp-format
 msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "\"{0}\" অৱস্থানে যথাযত কোনো Sticky Notes নথিপত্ৰ পোৱা নাযায়  ।"
+msgstr "\"{0}\" অৱস্থানত যথাযত কোনো স্টিকি টোকাসমূহ নথিপত্ৰ পোৱা নাযায়।"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
 msgid "Sticky Notes import completed"
-msgstr "Sticky Notes ইম্পোৰ্ট সমাপ্ত"
+msgstr "স্টিকি টোকাসমূহৰ ইমপোৰ্ট সম্পূৰ্ণ"
 
 # # , csharp-format
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b>, সৰ্বমোট<b>{1}</b> স্টিকি নোট সফলতাৰে সৈতে ইম্পোৰ্ট কৰা হৈছে  ।"
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{1}</b> স্টিকি টোকাক <b>{0}</b> সফলভাৱে ইমপোৰ্ট কৰা হৈছে।"
+msgstr[1] "<b>{1}</b> স্টিকি টোকাসমূহক <b>{0}</b> সফলভাৱে ইমপোৰ্ট কৰা হৈছে।"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
-msgstr "শিৰোনামহীন"
+msgstr "শীৰ্ষকহীন"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
-msgstr "স্টিকি নোট: "
+msgstr "স্টিকি টোকা: "
 
 #: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:62
 msgid "Tasque"
@@ -941,112 +1006,218 @@ msgstr "সকলো"
 
 #: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:145
 msgid "--- Tasque is not running ---"
-msgstr "--- Tasque বৰ্তমানে চলছে না ---"
+msgstr "--- Tasque বৰ্তমানে চলি থকা নাই ---"
 
 #: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
 msgid "_Underline"
 msgstr "নিম্নৰেখাঙ্কন (_U)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
-msgstr "_URL:"
+msgstr "URL: (_U)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
-msgstr "পাসওয়াৰ্ড: (_P)"
+msgstr "পাছৱাৰ্ড: (_P)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
-msgstr "URL হলো."
+msgstr "URL, ব্যৱহাৰকাৰীনাম, অথবা পাছৱাৰ্ড ক্ষেত্ৰ ৰিক্ত।"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
-msgstr "ত্ৰুটি আৰু."
+msgstr ""
+"চাৰ্ভাৰলে সংযোগ কৰোতে এটা ত্ৰুটি হৈছিল। ই এটা ভুল ব্যৱহাৰকাৰীনাম আৰু/অথবা পাছৱাৰ্ড "
+"ব্যৱহাৰকৰাৰ কাৰণে হব পাৰে।"
 
 #. TODO: If the above fails (no keyring daemon), save all but password
 #. to GConf, and notify user.
 #. 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:254
-msgid "Saving configuration to the GNOME keyring failed with the following message:"
-msgstr "GNOME following বাৰ্তা:"
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy ৱেব"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
+msgid ""
+"Saving configuration to the GNOME keyring failed with the following message:"
+msgstr "GNOME কিৰিংলে সংৰূপ সংৰক্ষণ কৰা নিম্নলিখিত বাৰ্তাৰ হৈতে ব্যৰ্থ হল:"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
-msgstr "সেৱকৰ সৈতে সংযোগ স্থাপন কৰা হ'ব"
+msgstr "চাৰ্ভাৰৰ সৈতে সংযোগ স্থাপন কৰক"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
 msgid "Connected"
 msgstr "সংযুক্ত"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
-msgstr "সেৱকৰ পৰা কোনো উত্তৰ পোৱা নাযায়  । কিছুক্ষণ পিছত পুনৰায় চেষ্টা কৰক  ।"
+msgstr "চাৰ্ভাৰৰ পৰা কোনো উত্তৰ পোৱা নাযায়। কিছুসময় পিছত পুনৰ চেষ্টা কৰক।"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
-msgstr "অনুমোদন কৰিবলৈ ব্যৰ্থ, পুনৰায় প্ৰচেষ্টা কৰক"
+msgstr "প্ৰমাণীকৰণ  ব্যৰ্থ, পুনৰ প্ৰচেষ্টা কৰক"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
-msgstr "Tomboy সহযোগে সফলতাৰে ৱেবত অনুমোদন কৰা হৈছে"
+msgstr "Tomboy ৱেব প্ৰমাণীকৰণ সফল"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
 msgstr ""
-"অনুগ্ৰহ কৰি Tomboy সংক্ৰান্ত বৈশিষ্ট্য শীৰ্ষল উইন্ডোত প্ৰত্যাবৰ্তন কৰক আৰু সুসংগত কৰাৰ "
-"বাবে সংৰক্ষণ টিপক  ।"
+"অনুগ্ৰহ কৰি Tomboy পছন্দসমূহ উইন্ডোত প্ৰত্যাবৰ্তন কৰক আৰু সংমিহলি কৰাৰ বাবে সংৰক্ষণ "
+"টিপক।"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
-msgstr "সংযুক্ত  । সুসংগতি আৰম্ভৰ বাবে সংৰক্ষণ টিপক"
+msgstr "সংযুক্ত। সংমিহলি আৰম্ভৰ বাবে সংৰক্ষণ টিপক"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
-msgstr "ব্ৰাউজাৰত অনুমোদন (সংযোগ পুনৰায় নিৰ্ধাৰণ কৰাৰ বাবে টিপক)"
+msgstr "ব্ৰাউছাৰত অনুমোদন (সংযোগ পুনৰ নিৰ্ধাৰণ কৰাৰ বাবে টিপক)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
-msgstr "অবিকল্পিত ব্ৰাউজাৰ নিৰ্ধাৰণ কৰি পুনৰায় প্ৰচেষ্টা কৰক"
+msgstr "অবিকল্পিত ব্ৰাউছাৰ নিৰ্ধাৰণ কৰি পুনৰ প্ৰচেষ্টা কৰক"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy ৱেব"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, fuzzy, csharp-format
+#| msgid "Export All Notes to "
+msgid "Export All Notes to {0}"
+msgstr "সকলো টোকাক এক্সপোৰ্ট কৰক "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, fuzzy, csharp-format
+#| msgid "Start exporting notes to "
+msgid "Start exporting notes to {0}"
+msgstr "টোকাসমূহক এক্সপোৰ্ট কৰা আৰম্ভ কৰক "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, fuzzy, csharp-format
+#| msgid "Export selected notebook to "
+msgid "Export selected notebook to {0}"
+msgstr "নিৰ্বাচিত টোকাবহীক এক্সপোৰ্ট কৰক "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, fuzzy, csharp-format
+#| msgid "Start exporting notebook to "
+msgid "Start exporting notebook to {0}"
+msgstr "টোকাবহীক এক্সপোৰ্ট কৰা আৰম্ভ কৰক "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "সঁজুলিসমূহ (_T)"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "এক্সপোৰ্ট কৰক"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "আপোনাৰ টোকাসমূহ এক্সপোৰ্ট কৰক।"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, fuzzy, csharp-format
+#| msgid "Export All Notes To "
+msgid "Export All Notes To {0}"
+msgstr "সকলো টোকা এক্সপোৰ্ট কৰক "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, fuzzy, csharp-format
+#| msgid "Export Selected Notebook To "
+msgid "Export Selected Notebook To {0}"
+msgstr "নিৰ্বাচিত টোকাবহীক এক্সপোৰ্ট কৰক "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, fuzzy, csharp-format
+#| msgid "All Notes"
+msgid "All Notes {0} Export"
+msgstr "সকলো টোকা"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "এক্সপোৰ্ট কৰিব নোৱাৰি, অভিগম নাকচ কৰা হৈছে।"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "এক্সপোৰ্ট কৰিব নোৱাৰি, ফোল্ডাৰ অনুপস্থিত।"
+
+# # , csharp-format
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "এক্সপোৰ্ট কৰিব নোৱাৰি: {0}"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "অজ্ঞাত ত্ৰুটি।"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "ফাইল নকৰা টোকাসমূহ"
+
+# # , csharp-format
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "আপোনাৰ টোকাসমূহ \"{0}\" লে এক্সপোৰ্ট কৰা হৈছে।"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "টোকাসমূহ সফলভাৱে এক্সপোৰ্ট কৰা হৈছে"
+
+# # , csharp-format
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "নথিপত্ৰসমূহক \"{0}\" -ক সংৰক্ষণ কৰিব নোৱাৰি"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, fuzzy, csharp-format
+#| msgid "Create destination folder for "
+msgid "Create destination folder for {0} export"
+msgstr "-ৰ বাবে লক্ষ্য ফোল্ডাৰ সৃষ্টি কৰক "
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
-msgstr "সকলো নোট অনুসন্ধান কৰক"
+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:106
-#| msgid "Create _New Note"
 msgid "Create New Note"
-msgstr "নতুন টোকা লিখক"
+msgstr "নতুন টোকা সৃষ্টি কৰক"
 
 #: ../Tomboy/JumpListManager.cs:136
 #, csharp-format
-#| msgid " (new)"
 msgid "{0} (new)"
 msgstr "{0} (নতুন)"
 
@@ -1060,110 +1231,113 @@ msgid "_Window"
 msgstr "উইন্ডো (_W)"
 
 #: ../Tomboy/MacApplication.cs:234
-#| msgid "_Preferences"
 msgid "Preferences..."
 msgstr "পছন্দসমূহ..."
 
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:24
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
 msgid "Create a new notebook"
-msgstr "তৈয়াৰ কৰক a"
+msgstr "এখন টোকাবহী সৃষ্টি কৰক"
 
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:25
 msgid "Type the name of the notebook you'd like to create."
-msgstr "ধৰন সৰ্বমোট d."
+msgstr "আপুনি সৃষ্টি কৰিব বিচৰা টোকাবহী নাম টাইপ কৰক।"
 
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:31
 msgid "N_otebook name:"
-msgstr "N_otebook name:"
+msgstr "টোকাবহীৰ নাম (_o):"
 
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:45
 msgid "Name already taken"
-msgstr "নাম"
+msgstr "নাম ইতিমধ্যে লোৱা আছে"
 
 #. Translation note: This is the Create button in the Create
 #. New Note Dialog.
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:59
 msgid "C_reate"
-msgstr "C"
-
-# # , csharp-format
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} Notebook Template"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "সকলো নোট"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "নোট"
+msgstr "সৃষ্টি কৰক (_r)"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
-msgstr "নোট"
+msgstr "টোকাবহীসমূহ (_b)"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:69
 msgid "Create a new note in a notebook"
-msgstr "তৈয়াৰ কৰক a a"
+msgstr "টোকাবহীত এটা নতুন টোকা সৃষ্টি কৰক"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:52
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:223
 msgid "New Note_book..."
-msgstr "নতুন নোট."
+msgstr "নতুন টোকাবহী (_b)..."
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:56
 msgid "_New Note"
-msgstr "উল্লেখ্য"
+msgstr "নতুন টোকা (_N)"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:57
 msgid "Create a new note in this notebook"
-msgstr "তৈয়াৰ কৰক a"
+msgstr "এই টোকাবহীত এটা নতুন টোকা সৃষ্টি কৰক"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:60
 msgid "_Open Template Note"
-msgstr "খুলুন ছাঁচ নোট"
+msgstr "টেমপ্লেইট টোকা খোলক (_O)"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:61
 msgid "Open this notebook's template note"
-msgstr "খুলুন"
+msgstr "এই টোকাবহীৰ টেমপ্লেইট টোকা খোলক"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:64
 msgid "Delete Note_book"
-msgstr "মুছে ফেলুন নোট"
+msgstr "টোকাবহী মচি পেলাওক (_b)"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:65
 msgid "Delete the selected notebook"
-msgstr "মুছে ফেলুন"
+msgstr "নিৰ্বাচিত টোকাবহী মচি পেলাওক"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
-msgstr "Notebooks"
+msgstr "টোকাবহীসমূহ"
+
+# # , csharp-format
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} টোকাবহী টেমপ্লেইট"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+#, fuzzy
+#| msgid "_New Note"
+msgid "New Note"
+msgstr "নতুন টোকা (_N)"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "সকলো টোকা"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
-msgstr "Really delete this notebook?"
+msgstr "সঁচাকে এই টোকাবহী মচি পেলাব?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
-msgstr "না."
+msgstr ""
+"এই টোকাবহীৰ টোকাসমূহ মচা নহব, কিন্তু সিহত এই টোকাবহীৰ লগত আৰু জড়িত নাথাকিব। এই "
+"কাৰ্য্য নহোৱা কৰিব নোৱাৰি।"
 
 #: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
 msgid "No notebook"
-msgstr "না"
+msgstr "কোনো টোকাবহী নাই"
 
 # # , csharp-format
 #. Translators should preserve the "{0}" in the following
@@ -1173,66 +1347,72 @@ msgstr "না"
 #: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
 #, csharp-format
 msgid "New \"{0}\" Note"
-msgstr "New \"{0}\" Note"
+msgstr "নতুন \"{0}\"  টোকাবহী"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
-msgstr "a"
+msgstr "এই টোকাক এটা টোকাবহীত স্থাপন কৰক"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
-msgstr "Notebook"
+msgstr "টোকাবহী"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
-msgstr "নতুন নোটবই...(_N)"
+msgstr "নতুন টোকাবহী...(_N)"
+
+# # , csharp-format
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "নতুন টোকা {0}"
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Really delete this note?"
+# , csharp-format
+#: ../Tomboy/Note.cs:1607
+#, fuzzy, csharp-format
+#| msgid "Really delete this {0} note?"
+#| msgid_plural "Really delete these {0} notes?"
+msgid "Really delete \"{0}\"?"
+msgstr "চিহ্নিত {0} টোকা নিশ্চিতৰূপে আঁতৰুৱা হ'ব নেকি ?"
 
 # , csharp-format
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
-msgstr[0] "চিহ্নিত {0} নোট নিশ্চিতৰূপে আঁতৰুৱা হ'ব নেকি ?"
-msgstr[1] "চিহ্নিত {0} নোট নিশ্চিতৰূপে আঁতৰুৱা হ'ব নেকি ?"
+msgstr[0] "চিহ্নিত {0} টোকা নিশ্চিতৰূপে আঁতৰুৱা হ'ব নেকি ?"
+msgstr[1] "চিহ্নিত {0} টোকা নিশ্চিতৰূপে আঁতৰুৱা হ'ব নেকি ?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
-msgstr "If you delete a note it is permanently lost."
+msgstr "যদি আপুনি এটা টোকাক মচি পেলায় ই চিৰস্থায়ীভাৱে হেৰাই যাব।"
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, 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."
 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 {1}."
 msgstr ""
-"আপোনাৰ টোকাসমূহ সংৰক্ষণ কৰিবলৈ এটা ত্ৰুটি দেখা দিছে। যথেষ্ট ডিস্ক স্পেছ উপস্থিত আছে নে নাই , আৰু "
-"আপোনাৰ {0} -ত প্ৰযোজ্য অধিকাৰ আছে নে নাই সেইটো অনুগ্ৰহ কৰি পৰীক্ষা কৰক। ত্ৰুটিৰ "
-"বিবৰণ {1} ত পোৱা যাব।"
+"আপোনাৰ টোকাসমূহ সংৰক্ষণ কৰিবলৈ এটা ত্ৰুটি দেখা দিছে। যথেষ্ট ডিস্ক স্থান উপস্থিত আছে "
+"নে নাই , আৰু আপোনাৰ {0} -ত প্ৰযোজ্য অধিকাৰ আছে নে নাই সেইটো অনুগ্ৰহ কৰি পৰীক্ষা "
+"কৰক। ত্ৰুটিৰ বিবৰণ {1} ত পোৱা যাব।"
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
-msgstr "নোটৰ তথ্য সংৰক্ষণ কৰিবলৈ ব্যৰ্থ"
+msgstr "টোকাৰ তথ্য সংৰক্ষণ কৰোতে ত্ৰুটি।"
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
-msgstr "নতুন নোট ছাঁচ"
+msgstr "নতুন টোকা টেমপ্লেইট"
 
 #. Create migration notification note
 #. Translators: The title of the data migration note
 #: ../Tomboy/NoteManager.cs:147
 msgid "Your Notes Have Moved!"
-msgstr "আপোনাৰ নোটসমূহ আঁতৰুৱা হৈছে!"
+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:160
@@ -1260,20 +1440,21 @@ msgid ""
 "\n"
 "Ciao!"
 msgstr ""
-"Tomboy-ৰ এই নতুন সংস্কৰণত আপোনাৰ নোটসমূহৰ অৱস্থান পৰিবৰ্তন কৰা হৈছে  ।  সম্ভৱতঃ "
-"নোটৰ অৱস্থান সম্পৰ্কে আপুনি কেতিয়াও অৱগত নাছিল আৰু এই তথ্য জনাৰ প্ৰয়োজন নাথাকিলে "
-"<bold>এই নোট আঁতৰাব পাৰে</bold>  ।  :-)\n"
+"Tomboy-ৰ এই নতুন সংস্কৰণত আপোনাৰ টোকাসমূহৰ অৱস্থান পৰিবৰ্তন কৰা হৈছে।  সম্ভৱতঃ "
+"টোকাৰ অৱস্থান সম্পৰ্কে আপুনি কেতিয়াও অৱগত নাছিল আৰু এই তথ্য জনাৰ প্ৰয়োজন নাথাকিলে "
+"<bold>এই টোকা আঁতৰাব পাৰে</bold>।  :-)\n"
 "\n"
-"আপোনাৰ পুৰনি নোটসমূহ ধাৰণকৰ্তা পঞ্জিকা <link:url>{0}</link:url> ত সুৰিক্ষিত 
আছে  । Tomboy ৰ কোনো পুৰনি সংস্কৰণ ব্যৱহাৰ কৰা হ'লে এই পঞ্জিকাত অনুসন্ধান কৰা হ'ব  "
-"।\n"
+"আপোনাৰ পুৰনি টোকাসমূহ ধাৰণকৰ্তা ডাইৰেকটৰি <link:url>{0}</link:url> ত সুৰিক্ষিত "
+"আছে। Tomboy ৰ কোনো পুৰনি সংস্কৰণ ব্যৱহাৰ কৰা হ'লে এই ডাইৰেকটৰিত সন্ধান কৰক  ।\n"
 "\n"
-"নতুন সংস্কৰণৰ সৈতে ব্যৱহাৰৰ উদ্দেশ্যে পুৰনি সকলোো নোট আৰু বিন্যাস নতুন পঞ্জিকাত নকল "
-"কৰা হৈছে:\n"
+"নতুন সংস্কৰণৰ সৈতে ব্যৱহাৰৰ উদ্দেশ্যে পুৰনি সকলোো টোকা আৰু বিন্যাস নতুন ডাইৰেকটৰিত "
+"নকল কৰা হৈছে:\n"
 "\n"
-"<list><list-item dir=\"ltr\">নোটসমূহ এতিয়া <link:url>{1}</link:url> ত উপস্থিত 
আছে  ।\n"
+"<list><list-item dir=\"ltr\">টোকাসমূহ এতিয়া <link:url>{1}</link:url> ত উপস্থিত "
+"আছে।\n"
 "</list-item><list-item dir=\"ltr\">বিন্যাসৰ তথ্য <link:url>{2}</link:url> ত "
 "উপস্থিত আছে\n"
-"
</list-item><list-item dir=\"ltr\"><link:url>{3}</link:url> ত এড-ইন সংস্থাপন "
+"</list-item><list-item dir=\"ltr\"><link:url>{3}</link:url> ত এড-ইন সংস্থাপন "
 "কৰা যাব\n"
 "</list-item><list-item dir=\"ltr\">লগ নথিপত্ৰৰ অৱস্থান হল <link:url>{4}</link:"
 "url></list-item></list>\n"
@@ -1300,20 +1481,20 @@ msgid ""
 "Tomboy</link:internal> it automatically gets underlined?  Click on the link "
 "to open the note.</note-content>"
 msgstr ""
-"<note-content>প্ৰাৰম্ভিক নোট\n"
+"<note-content>প্ৰাৰম্ভিক টোকা\n"
 "\n"
 "<bold>Tomboy ত স্বাগতম!</bold>\n"
 "\n"
-"এই \"প্ৰাৰম্ভিক\" নোটৰ সহায়ত আপোনাৰ সকলো চিন্তাভাবনা সুবিন্যাস্ত কৰিবলৈ আৰম্ভ কৰক "
+"এই \"প্ৰাৰম্ভিক\" টোকাৰ সহায়ত আপোনাৰ সকলো চিন্তাভাবনা সুবিন্যাস্ত কৰিবলৈ আৰম্ভ কৰক "
 "।\n"
 "
\n"
-"GNOME পেনেলত উপস্থিত Tomboy নোটৰ মেনুৰ পৰা \"নতুন নোট লিখক\" নিৰ্বাচন 
কৰি আপোনাৰ প্ৰয়োজনীয় তথ্যাদি লিখা আৰম্ভ কৰক । আপোনাৰ নোট স্বয়ংক্ৰিয়ভাবে সংৰক্ষণ "
-"কৰা হ'ব ।\n"
+"GNOME পেনেলত উপস্থিত Tomboy টোকাৰ মেনুৰ পৰা \"নতুন টোকা সৃষ্টি কৰক\" নিৰ্বাচন 
কৰি আপোনাৰ প্ৰয়োজনীয় তথ্যাদি লিখা আৰম্ভ কৰক। আপোনাৰ টোকা স্বচালিতভাবে সংৰক্ষণ "
+"কৰক।\n"
 "
\n"
-"ইয়াৰ পিছত, বিষয় অথবা অন্য কোনো কাৰণে যুক্ত বিভিন্ন নোটসমূহক একেই অপাৰৰ সেতে লিংক "
+"ইয়াৰ পিছত, বিষয় অথবা অন্য কোনো কাৰণে যুক্ত বিভিন্ন টোকাসমূহক একেই অপাৰৰ সেতে লিঙ্ক "
 "কৰি সুবিন্যস্ত কৰক!\n"
 "
\n"
-"<link:internal>Tomboy-ত লিংকৰ ব্যবহাৰ</link:internal> নামক এটা নোট 
নিৰ্মাণ কৰা হৈছে । উল্লেখ্য, প্ৰতিবাৰ <link:internal>Tomboy-ত লিংকৰ 
ব্যৱহাৰ</link:internal> লিখা হ'লে, স্বয়ংক্ৰিয়ভাবে তাৰ তলত এটা ৰেখা অঁকা হয় ।  
লিংকত ক্লিক কৰি নোট খোলক ।</note-content>"
+"<link:internal>Tomboy-ত লিঙ্কৰ ব্যবহাৰ</link:internal> নামক এটা টোকা 
নিৰ্মাণ কৰা হৈছে। উল্লেখ্য, প্ৰতিবাৰ <link:internal>Tomboy-ত লিঙ্কৰ 
ব্যৱহাৰ</link:internal> লিখা হ'লে, স্বচালিতভাবে তাৰ তলত এটা ৰেখা অঁকা হয়।  
লিঙ্কত ক্লিক কৰি টোকা খোলক।</note-content>"
 
 #: ../Tomboy/NoteManager.cs:284
 msgid ""
@@ -1330,52 +1511,46 @@ msgid ""
 "Also, if you type the name of another note in your current note, it will "
 "automatically be linked for you.</note-content>"
 msgstr ""
-"<note-content>Tomboy-ত লিংকৰ ব্যবহাৰ\n"
+"<note-content>Tomboy-ত লিঙ্কৰ ব্যবহাৰ\n"
 "\n"
-"Notes in Tomboy-ৰ নোটসমূহ লিংক কৰাৰ বাবে, বৰ্তমানে প্ৰদৰ্শিত নোটত প্ৰয়োজনীয় টেক্সট "
-"নিৰ্বাচন কৰি ওপৰৰ টুল-বাৰেত উপস্থিত <bold>লিংক</bold> বাটন 
নিৰ্বাচন কৰক।  ইয়াৰ ফলত, এটা নতুন নোট সৃষ্টি কৰা হ'ব আৰু বৰ্তমান নোটত নতুন নোটৰ "
-"নিৰ্বাচিত শিৰোনামৰ তলত ৰেখা অঁকা হ'ব ।\n"
-"
\n"
-"নোটৰ লিংক পৰিবৰ্তন কৰিলে অন্যান্য নোটত উপস্থিত সংশ্লিষ্ট লিংকসমূহ আপডেট কৰা হ'ব ।  "
-"ইয়াৰ ফলত, নোটৰ নাম পৰিবৰ্তিত হ'লেও ক্ষতিগ্ৰস্ত লিংক সৃষ্টি হোৱাৰ কোনো সম্ভাবনা "
-"নাথাকিব ।\n"
-"
\n"
-"ইয়াৰ উপৰিও, বৰ্তমান নোটত অন্য কোনো নোটৰ নাম লিখা হ'লে সেইটো স্বয়ংক্ৰিয়ভাবে লিংক "
-"কৰা হ'ব ।</note-content>"
+"Notes in Tomboy-ৰ টোকাসমূহ লিঙ্ক কৰাৰ বাবে, বৰ্তমানে প্ৰদৰ্শিত টোকাত প্ৰয়োজনীয় "
+"লিখনী নিৰ্বাচন কৰি ওপৰৰ টুল-বাৰেত উপস্থিত <bold>লিঙ্ক</bold> বাটন নিৰ্বাচন কৰক।  "
+"ইয়াৰ ফলত, এটা নতুন টোকা সৃষ্টি কৰক আৰু বৰ্তমান টোকাত নতুন টোকাৰ নিৰ্বাচিত শীৰ্ষকৰ "
+"তলত ৰেখা অঁকা হ'ব।\n"
+"\n"
+"টোকাৰ লিঙ্ক পৰিবৰ্তন কৰিলে অন্য টোকাত উপস্থিত সংশ্লিষ্ট লিঙ্কসমূহ আপডেট কৰক।  ইয়াৰ "
+"ফলত, টোকাৰ নাম পৰিবৰ্তিত হ'লেও ক্ষতিগ্ৰস্ত লিঙ্ক সৃষ্টি হোৱাৰ কোনো সম্ভাবনা "
+"নাথাকিব।\n"
+"\n"
+"ইয়াৰ উপৰিও, বৰ্তমান টোকাত অন্য কোনো টোকাৰ নাম লিখা হ'লে সেইটো স্বচালিতভাবে লিঙ্ক "
+"কৰক।</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
-msgstr "প্ৰাৰম্ভিক স্থান"
+msgstr "আৰম্ভৰ স্থান"
 
 #: ../Tomboy/NoteManager.cs:304
 msgid "Using Links in Tomboy"
-msgstr "Using Links in Tomboy"
-
-# # , csharp-format
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "নতুন নোট {0}"
+msgstr "Tomboy -ত লিঙ্কসমূহ ব্যৱহাৰ কৰা"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
-msgstr "নতুন নোটৰ বিবৰণ এই স্থানে লিখক  ।"
+msgstr "নতুন টোকাৰ বিবৰণ এই স্থানত লিখক।"
 
 #: ../Tomboy/NoteRenameDialog.cs:50
 msgid "Rename Note Links?"
-msgstr "টোকা লিংকসমূহ পুনৰ নামাকৰন কৰিব নে?"
+msgstr "টোকা লিঙ্কসমূহ পুনৰ নামাকৰন কৰিব নে?"
 
 #: ../Tomboy/NoteRenameDialog.cs:56
-#| msgid "_Open Link"
 msgid "_Rename Links"
-msgstr "লিংকসমূহ পুনৰ নামাকৰন কৰক (_R)"
+msgstr "লিঙ্কসমূহ পুনৰ নামাকৰন কৰক (_R)"
 
 #: ../Tomboy/NoteRenameDialog.cs:59
 msgid "_Don't Rename Links"
-msgstr "লিংকসমূহ পুনৰ নামাকৰন নকৰিব (_D)"
+msgstr "লিঙ্কসমূহ পুনৰ নামাকৰন নকৰিব (_D)"
 
 #: ../Tomboy/NoteRenameDialog.cs:67
 #, csharp-format
@@ -1385,185 +1560,210 @@ msgid ""
 "\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"
+"অন্য টোকাসমূহত থকা লিঙ্কসমূহ \"<span underline=\"single\">{0}</span>\" ৰ পৰা "
+"\"<span underline=\"single\">{1}</span>\" লে পুনৰ নামাকৰন কৰিব নে?\n"
 "\n"
-"আপুনি যদি লিংকসমূহ পুনৰ নামাকৰন নকৰে, তেনেহলে ইহত আৰু কাৰো লগতে লিংক নহয়।"
+"আপুনি যদি লিঙ্কসমূহ পুনৰ নামাকৰন নকৰে, তেনেহলে ইহত আৰু কাৰো লগতে লিঙ্ক নহয়।"
 
 #: ../Tomboy/NoteRenameDialog.cs:83
-#| msgid "_Open Link"
 msgid "Rename Links"
-msgstr "লিংকসমূহ পুনৰ নামাকৰন কৰক"
+msgstr "লিঙ্কসমূহ পুনৰ নামাকৰন কৰক"
 
 #: ../Tomboy/NoteRenameDialog.cs:95
 #: ../Tomboy/Synchronization/SyncDialog.cs:119
 msgid "Note Title"
-msgstr "নোট Title"
+msgstr "টোকা শীৰ্ষক"
 
 #. Translators: This button causes all notes in the list to be selected
 #: ../Tomboy/NoteRenameDialog.cs:118
 msgid "Select All"
-msgstr "সকলো বাচক"
+msgstr "সকলো বাছক"
 
 #. Translators: This button causes all notes in the list to be unselected
 #: ../Tomboy/NoteRenameDialog.cs:127
-#| msgid "Select an icon..."
 msgid "Select None"
 msgstr "কাকো নাবাচিব"
 
 #: ../Tomboy/NoteRenameDialog.cs:144
-#| msgid "_Advanced..."
 msgid "Ad_vanced"
 msgstr "উন্নত (_v)"
 
 #: ../Tomboy/NoteRenameDialog.cs:147
-#| msgid "Close this window"
 msgid "Always show this _window"
 msgstr "এই উইন্ডোটো সদায় দেখুৱাওক (_w)"
 
 #: ../Tomboy/NoteRenameDialog.cs:155
 msgid "Never rename _links"
-msgstr "লিংকসমূহ কেতিয়াও পুনৰ নামাকৰন নকৰিব (_l)"
+msgstr "লিঙ্কসমূহ কেতিয়াও পুনৰ নামাকৰন নকৰিব (_l)"
 
 #: ../Tomboy/NoteRenameDialog.cs:163
 msgid "Alwa_ys rename links"
-msgstr "লিংকসমূহ সদায় পুনৰ নামাকৰন কৰিব (_y)"
+msgstr "লিঙ্কসমূহ সদায় পুনৰ নামাকৰন কৰিব (_y)"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
-msgstr "অনুসন্ধান নোট"
+msgstr "সন্ধান কৰক টোকা"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
-msgstr "নতুন নোটৰ সৈতে লিঙ্ক কৰক (_L)"
+msgstr "নতুন টোকাৰ সৈতে লিঙ্ক কৰক (_L)"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
-msgstr "টেক্সট (_x)"
+msgstr "লিখনী (_x)"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
-msgstr "অনুসন্ধান নোট"
+msgstr "সন্ধান কৰক টোকা"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
-msgstr "সকলোো নোট বন্ধ কৰক (_e)"
+msgstr "সকলো টোকা বন্ধ কৰক (_e)"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
-msgstr "বিচাৰক"
+msgstr "সন্ধান কৰক"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "নোট অনুসন্ধান কৰক (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "আপোনাৰ টোকাসমূহ সন্ধান কৰক"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "লিঙ্ক"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "নিৰ্বাচিত টেক্সট নতুন নোটৰ সৈতে লিঙ্ক কৰক (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "নিৰ্বাচিত লিখনীক এটা নতুন টোকালে লিঙ্ক কৰক"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
-msgstr "টেক্সট (_T)"
+msgstr "লিখনী (_T)"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
-msgstr "টেক্সটৰ বৈশিষ্ট্য নিৰ্ধাৰণ"
+msgstr "লিখনীৰ বৈশিষ্ট্য নিৰ্ধাৰণ"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
-msgstr "সৰঞ্জাম (_o)"
+msgstr "সঁজুলিসমূহ (_o)"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
-msgstr "বৰ্তমানে নোটে সৰঞ্জাম প্ৰয়োগ কৰা হ'ব"
+msgstr "এই নোটত সঁজুলি প্ৰয়োগ কৰক"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
-msgstr "এই নোট মুছে ফেলুন"
+msgstr "এই টোকা মচি পেলাওক"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
-msgstr "নোট সুসংগত কৰক"
+msgstr "টোকাসমূহ সংমিহলি কৰক"
+
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+
+#: ../Tomboy/NoteWindow.cs:571
+#, fuzzy
+#| msgid "Connect to Server"
+msgid "Convert to regular note"
+msgstr "চাৰ্ভাৰৰ সৈতে সংযোগ স্থাপন কৰক"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr ""
+
+#: ../Tomboy/NoteWindow.cs:585
+#, fuzzy
+#| msgid "Select None"
+msgid "Save Se_lection"
+msgstr "কাকো নাবাচিব"
+
+#: ../Tomboy/NoteWindow.cs:594
+#, fuzzy
+#| msgid "Note Title"
+msgid "Save _Title"
+msgstr "টোকা শীৰ্ষক"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
-msgstr "অনুসন্ধান (_F)..."
+msgstr "সন্ধান কৰক (_F)..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
-msgstr "পৰবৰ্তী উপস্থিতি অনুসন্ধান কৰক (_N)"
+msgstr "পৰবৰ্তী উপস্থিতি সন্ধান কৰক (_N)"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
-msgstr "পৰবৰ্তী উপস্থিতি অনুসন্ধান কৰক (_P)"
+msgstr "পূৰ্বৱৰ্তী উপস্থিতি সন্ধান কৰক (_P)"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
-msgstr "নোট তৈয়াৰ কৰিবলৈ বিফল"
+msgstr "টোকা সৃষ্টি কৰিব নোৱাৰি"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
-msgstr "অনুসন্ধান: (_F)"
+msgstr "সন্ধান কৰক: (_F)"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "পূৰ্ববৰ্তী (_P)"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "পৰবৰ্তী (_N)"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
-msgstr "গাঢ় (_B)"
+msgstr "ডাঠ (_B)"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
-msgstr "তেৰছা (_I)"
+msgstr "ইটালিক (_I)"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
-msgstr "মধ্যে ৰেখাঙ্কিত (_S)"
+msgstr "মাজত ৰেখাঙ্কিত (_S)"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "উজ্জ্বলিত (_H)"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
-msgstr "ফন্টৰ মাপ"
+msgstr "ফন্টৰ আকাৰ"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "স্বাভাবিক (_N)"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "বিশাল (_g)"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
-msgstr "বড় (_L)"
+msgstr "ডাঙৰ (_L)"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
-msgstr "ছোট (_m)"
+msgstr "সৰু (_m)"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
-msgstr "ফন্টৰ মাপ বৃদ্ধি কৰক"
+msgstr "ফন্টৰ আকাৰ বৃদ্ধি কৰক"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
-msgstr "ফন্টৰ মাপ হ্ৰাস কৰক"
+msgstr "ফন্টৰ আকাৰ হ্ৰাস কৰক"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
-msgstr "বুলেটচিহ্ন"
+msgstr "বুলেটসমূহ"
 
 #: ../Tomboy/PreferencesDialog.cs:81
 msgid "Editing"
@@ -1571,544 +1771,356 @@ msgstr "সম্পাদনা"
 
 #: ../Tomboy/PreferencesDialog.cs:84
 msgid "Hotkeys"
-msgstr "হট-কি"
+msgstr "হটকিসমূহ"
 
 #: ../Tomboy/PreferencesDialog.cs:86
 msgid "Synchronization"
-msgstr "সামঞ্জস্য"
+msgstr "সংমিহলি"
 
 #: ../Tomboy/PreferencesDialog.cs:88
 msgid "Add-ins"
-msgstr "যোগ কৰক"
+msgstr "এড-ইনসমূহ"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
-msgstr "টাইপ কৰাৰ সময় বানান পৰীক্ষা কৰা হ'ব (_S)"
+msgstr "টাইপ কৰাৰ সময় বানান পৰীক্ষা কৰক (_S)"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr ""
-"ভুল বানান লাল ৰং দ্বাৰা ৰেখাঙ্কিত কৰা হ'ব আৰু প্ৰস্তাবিত সঠিক বানানসমূহ কনটেক্সট "
-"মেনুতে প্ৰদৰ্শিত হ'ব  ।"
+"ভুল বানান ৰঙা ৰঙ দ্বাৰা ৰেখাঙ্কিত কৰক আৰু প্ৰস্তাবিত সঠিক বানানসমূহ পৰিপ্ৰেক্ষতিত "
+"মেনুতে প্ৰদৰ্শিত হ'ব।"
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
-msgstr "WikiWords উজ্জ্বল কৰা হ'ব (_W)"
+msgstr "WikiWords উজ্জ্বল কৰক (_W)"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
 msgstr ""
-"<b>ThatLookLikeThis</b>'ৰ অনুৰূপ শব্দ উজ্জ্বল কৰাৰ বাবে এই বিকল্প সক্ৰিয় কৰক  । "
-"চিহ্নিত শব্দেৰ উপৰ ক্লিক কৰা হ'লে ঐ নাম একটি নোট তৈয়াৰ কৰা হ'ব  ।"
+"<b>ThatLookLikeThis</b> -ৰ অনুৰূপ শব্দ উজ্জ্বল কৰাৰ বাবে এই বিকল্প সামৰ্থবান কৰক। "
+"চিহ্নিত শব্দৰ উপৰ ক্লিক কৰা হ'লে ঐ নাম এটা টোকা সৃষ্টি কৰক।"
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
-msgstr "সক্ৰিয়"
+msgstr "স্বচালিত বেলেট তালিকাসমূহ সামৰ্থবান কৰক (_b)"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
-msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰা হ'ব (_f)"
+msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰক (_f)"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
-msgstr "এটা লিংক হৈ থকা টোকা পুনৰ নামাকৰন কৰোতে:"
+msgstr "এটা লিঙ্ক হৈ থকা টোকা পুনৰ নামাকৰন কৰোতে:"
 
-#: ../Tomboy/PreferencesDialog.cs:238
-#| msgid "Always ask me what to do."
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
-msgstr "কি কৰিব লিগে মোক সোধক"
+msgstr "কি কৰিব লাগে মোক সোধক"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
-msgstr "লিংকসমূহ কেতিয়াও পুনৰ নামাকৰন নকৰিব"
+msgstr "লিঙ্কসমূহ কেতিয়াও পুনৰ নামাকৰন নকৰিব"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
-msgstr "লিংকসমূহ সদায় পুনৰ নামাকৰন কৰিব"
+msgstr "লিঙ্কসমূহ সদায় পুনৰ নামাকৰন কৰিব"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
-msgstr "a."
+msgstr ""
+"এটা নতুন টোকা সৃষ্টি কৰাৰ সময়ত ব্যৱহাৰ হব লগিয়া লিখনী ধাৰ্য্য কৰিবলে নতুন টোকা "
+"টেমপ্লেইট ব্যৱহাৰ কৰক।"
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
-msgstr "খুলুন নতুন নোট ছাঁচ"
+msgstr "নতুন টোকা টেমপ্লেইট খোলক"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
-msgstr "হট-কি'ৰ বাবে অপেক্ষা কৰা হ'ব (_H)"
+msgstr "হটকিসমূহৰ বাবে অপেক্ষা কৰক (_H)"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
 "Alt>N</b>"
 msgstr ""
-"হট-কি বৈশিষ্ট্যেৰ মাধ্যমে কোনো সুনিৰ্দিষ্ট কি দ্বাৰা যে কোনো স্থানৰ পৰা নোট ব্যৱহাৰ "
-"কৰা সম্ভৱ হ'ব  । হট-কি'ৰ উদাহৰণ: <b><Control><Shift>F11</b>, "
-"<b><Alt>N</b>"
+"হটকি বৈশিষ্ট্যেৰ মাধ্যমে কোনো সুনিৰ্দিষ্ট কি দ্বাৰা যে কোনো স্থানৰ পৰা টোকা ব্যৱহাৰ "
+"কৰা সম্ভৱ হ'ব। হটকি -ৰ উদাহৰণ: <b><Control><Shift>F11</b>, <b><"
+"Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
-msgstr "নোট মেনু প্ৰদৰ্শন কৰা হ'ব (_m)"
+msgstr "টোকাসমূহ মেনু দেখুৱাওক (_m)"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
-msgstr "\"প্ৰাৰম্ভিক স্থান\" খুলুন (_S)"
+msgstr "\"আৰম্ভৰ স্থান\" খোলক (_S)"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
-msgstr "নতুন নোট লিখক (_n)"
+msgstr "নতুন টোকা সৃষ্টি কৰক (_n)"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
-msgstr "\"সকলো নোট অনুসন্ধান কৰক (_A)\" খুলুন"
+msgstr "\"সকলো টোকা সন্ধান কৰক (_A)\" খোলক"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
-msgstr "Ser_vice:"
+msgstr "সেৱা (_v):"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
-msgstr "কনফিগাৰ কৰাৰ যোগ্য নয়"
+msgstr "সংৰূপণ কৰিব নোৱাৰি"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "স্বচালিতভাৱে পটভূমিত সংমিহলি কৰিব প্ৰতি (_y)"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "মিনিটসমূহ"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
-msgstr "Advanced."
+msgstr "উন্নত (_A)"
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
-msgstr "following"
+msgstr "নিম্নলিখিত এড-ইনসমূহ ইনস্টল আছে"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "অতিৰিক্ত এড-ইন প্ৰাপ্ত কৰক..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
-msgstr "সক্ৰিয় কৰক (_E)"
+msgstr "সামৰ্থবান কৰক (_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
-msgstr "নিষ্ক্ৰিয় কৰক (_D)"
+msgstr "অসামৰ্থবান কৰক (_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
-msgstr "Not"
+msgstr "প্ৰণয়ন কৰা হোৱা নাই"
 
 # # , csharp-format
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
-msgstr "{0} পছন্দ"
+msgstr "{0} পছন্দসমূহ"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
-msgstr "নোটে ব্যৱহৃত ফন্ট নিৰ্বাচন কৰক"
+msgstr "টোকা ফন্ট নিৰ্বাচন কৰক"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
-msgstr "অন্যান্য সামঞ্জস্য অপশন"
+msgstr "অন্য সংমিহলি বিকল্পসমূহ"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
-msgstr "a হলো a আৰু a চলি আছে:"
+msgstr ""
+"যেতিয়া এটা স্থানীয় টোকা আৰু সংৰূপীত সংমিহলি চাৰ্ভাৰত থকা টোকাৰ মাজত এটা দন্দ ধৰা "
+"পেলোৱা হয়:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
-msgstr "সৰ্বদা."
+msgstr "কি কৰিব লাগে মোক সদায় শুদিব।"
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
-msgstr "Rename my local note."
+msgstr "মোৰ স্থানীয় টোকা পুনৰ নামাকৰন কৰক।"
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
-msgstr "প্ৰতিস্থাপন."
+msgstr "মোৰ স্থানীয় টোকা চাৰ্ভাৰ আপডেইটৰে প্ৰতিস্থাপন কৰক।"
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "সতৰ্কবাৰ্তা: আপুনি কি নিশ্চিত?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "আপুনি নিশ্চিত নে?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
-msgstr "হলো You সৰ্বমোট."
+msgstr ""
+"আপোনাৰ সংমিহলি সংহতিসমূহ পৰিষ্কাৰ কৰাটো উপদেশীত নহয়। আপোনাক হয়তোআপোনাৰ সকলো "
+"টোকা সংমিহলি কৰিবলে বাধ্য কৰা হব যেতিয়া আপুনি নতুন সংহতিসমূহ সংৰক্ষণ কৰিব।"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
-msgstr "সামঞ্জস্য বৈশিষ্ট্যাবলী"
+msgstr "সংমিহলি সংহতিসমূহ পুনৰ সংহতি কৰা হৈ আছে"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
-msgstr "You এখন You সৰ্বমোট"
+"synchronize all of your notes again when you save new settings."
+msgstr ""
+"আপুনি সংৰূপীত সংমিহলি সেৱা অসামৰ্থবান কৰিছে। আপোনাৰ সংমিহলি সংহতিসমূহ এতিয়া "
+"পৰিষ্কাৰ কৰা হব। আপুনি যেতিয়া নতুন সংহতিসমূহ সংৰক্ষণ কৰিব আপোনাক হয়তো আপোনাৰ সকলো "
+"টোকা সংমিহলি কৰিবলে বাধ্য কৰা হব।"
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "সাফল্য You NULL সংযুক্ত!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "সংযোগ সফল"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
-msgstr "হলো."
+msgstr ""
+"Tomboy আপোনাৰ টোকাসমূহ সংমিহলি কৰিবলে এতিয়া প্ৰস্তুত। আপুনি সিহতক এতিয়া "
+"সংমিহলিকৰিব বিচাৰে নে?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
-#| msgid ""
-#| "Sorry, but something went wrong.  Please check your information and try "
-#| "again.  The ~/.tomboy.log might be useful too."
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"দুক্ষিত, কিন্তু কিবা এটা ভুল হৈছে। অনুগ।ৰহ কৰি আপোনাৰ তথ্য নিৰিক্ষণ কৰক আৰু পুনৰ "
-"চেষ্টা কৰক। {0} টো ব্যৱহাৰযোগ্য হব পাৰে।"
+"অনুগ্ৰহ কৰি আপোনাৰ তথ্য নিৰিক্ষণ কৰক আৰু পুনৰ চেষ্টা কৰক। লগ নথিপত্ৰ {0} য় ত্ৰুটিৰ "
+"বিষয়ে অধিক তথ্য অন্তৰ্ভুত কৰিব পাৰে।"
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "ত্ৰুটি"
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "সংযোগ কৰোতে ত্ৰুটি"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "সংস্কৰণ:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "লেখক:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "স্বত্বাধিকাৰ:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
-msgstr "যোগ কৰক:"
+msgstr "এড-ইন নিৰ্ভৰশীলতাসমূহ:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
-msgstr "অনুসন্ধান:(_S)"
+msgstr "সন্ধান কৰক:(_S)"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
-msgstr "নোট"
+msgstr "টোকা"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "সৰ্বশেষ পৰিবৰ্তন"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
-msgstr "Matches"
+msgstr "মিলসমূহ"
+
+# # , csharp-format
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "শীৰ্ষক মিল"
 
 # # , csharp-format
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
-msgstr[0] "({0} মিল)"
-msgstr[1] "{0} match"
+msgstr[0] "({0} মিল"
+msgstr[1] "{0} মিলসমূহ"
 
 # # , csharp-format
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
-msgstr[0] "সৰ্বমোট: {0} নোট"
-msgstr[1] "সr্বমোট: {0} নোট"
+msgstr[0] "সৰ্বমোট: {0} টোকা"
+msgstr[1] "সৰ্বমোট: {0} টোকাসমূহ"
 
 # # , csharp-format
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
-msgstr[0] "মিল: {0} নোট"
-msgstr[1] "Matches: {0} note"
-
-#: ../Tomboy/RecentChanges.cs:696
-msgid "Notes"
-msgstr "নোট"
-
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "নতুন নোট নিৰ্মাণ কৰিবলৈ ব্যৰ্থ"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "প্ৰধান নিৰ্মাণকাৰ্য:"
-
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "অংশগ্ৰহণকৰ্তা:"
-
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr "অমিতাক্ষ ফুকন (aphukan at fedoraproject.org)"
+msgstr[0] "মিল: {0} টোকা"
+msgstr[1] "মিলসমূহ: {0} টোকাসমূহ"
 
-#: ../Tomboy/Tomboy.cs:410
-#| msgid ""
-#| "Copyright © 2004-2007 Alex Graveley\n"
-#| "Copyright © 2004-2009 Others\n"
+#: ../Tomboy/RecentChanges.cs:603
 msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
 msgstr ""
-"স্বত্বাধিকাৰ © ২০০৪-২০০৭ Alex Graveley\n"
-"স্বত্বাধিকাৰ © ২০০৪-২০০৯ অন্য\n"
+"নিৰ্বাচিত টোকাবহীত কোনো ফলাফল পোৱা নগল।\n"
+"সকলো টোকাত সন্ধান কৰিবলে ইয়াত ক্লিক কৰক।"
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "নোট লেখাৰ একটি সহজ ডেস্কটপ এপ্লিকেশন  ।"
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "সকলো টোকাবহীত সন্ধান কৰিবলে ইয়াত ক্লিক কৰক"
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Homepage"
+#: ../Tomboy/RecentChanges.cs:775
+msgid "Notes"
+msgstr "টোকাসমূহ"
 
-#: ../Tomboy/Tomboy.cs:540
+# # , csharp-format
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
 msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
 msgstr ""
-"Tomboy: নোট লেখাৰ একটি সহজ সৰল ডেস্কটপ এপ্লিকেশন  ।\n"
-"স্বত্বাধিকাৰ (C) ২০০৪-২০০৬ এলেক্স গ্ৰেভলি <alex at beatniksoftware.com>\n"
-"\n"
+"এই সংমিহলি এডিন আপোনাৰ কমপিউটাৰত সমৰ্থিত নহয়।  অনুগ্ৰহ কৰি সুনিশ্চিত কৰক আপোনাৰ "
+"FUSE আৰু {0} সঠিকভাৱে ইনস্টল আৰু সংৰূপীত আছে"
 
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "পৰিক্ষণনথিপত্ৰ পঢ়িব নোৱাৰি।।  "
 
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tনতুন নোট নিৰ্মাণ আৰু প্ৰদৰ্শন  ।\n"
-"  --new-note [title]\t\tশিৰোনামসহ নতুন নোট নিৰ্মাণ আৰু প্ৰদৰ্শন  ।\n"
-"  --open-note [title/url]\tউল্লিখিত শিৰোনামসহ উপস্থিত নোট প্ৰদৰ্শন কৰা হ'ব  ।\n"
-"  --start-here\t\t\t'প্ৰাৰম্ভিক স্থান' নোট প্ৰদৰ্শন কৰা হ'ব  ।\n"
-"  --highlight-search [text]\tবৰ্তমানে প্ৰদৰ্শিত নোটে টেক্সট অনুসন্ধান কৰি উজ্জ্বল "
-"কৰা হ'ব  ।\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "লিখা পৰিক্ষণ ব্যৰ্থ হল।"
 
-# # , csharp-format
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "সংস্কৰণ {0}"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "চাৰ্ভাৰলে সংযোগ কৰোতে সময়অন্ত।"
 
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (নতুন)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "Tomboy পৰিচিতি (_A)"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr "নোট."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "সহায়তা"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "অৱস্থান প্ৰদৰ্শন কৰিবলৈ ব্যৰ্থ"
-
-# # , csharp-format
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "আজ, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "আজ"
-
-# # , csharp-format
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "গতকাল, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Yesterday"
-
-# , csharp-format
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "১ দিন পূৰ্বে"
-msgstr[1] "{0} days ago, {1}"
-
-# , csharp-format
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "১ দিন পূৰ্বে"
-msgstr[1] "{0} days ago"
-
-# # , csharp-format
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Tomorrow, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Tomorrow"
-
-# , csharp-format
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "In {0} days, {1}"
-msgstr[1] "In {0} days, {1}"
-
-# , csharp-format
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "In {0} days"
-msgstr[1] "In {0} days"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "না তাৰিখ"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "MMMM d yyyy, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d"
-
-# # , csharp-format
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(শিৰোনামবিহীন {0})"
-
-# # , csharp-format
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"<b>{0}</b> শিৰোনামসহ একটি নোট বৰ্তমানে উপস্থিত আছে  । এগিয়ে যাওয়াৰ পূৰ্বে অনুগ্ৰহ "
-"কৰি একটি পৃথক নাম নিৰ্বাচন কৰক  ।"
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "নোটৰ শিৰোনাম গ্ৰহণ কৰা হৈছে"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "লিঙ্ক দ্বাৰা চিহ্নিত অৱস্থান নকল কৰক (_C)"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "লিঙ্ক খুলুন (_O)"
-
-# # , csharp-format
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "আইকন নথিপত্ৰ সংৰক্ষণ কৰিবলৈ ব্যৰ্থ  ।  "
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Write test failed."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Timeout."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "ত্ৰুটি."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "চাৰ্ভাৰলে সংযোগ কৰোতে ত্ৰুটি।"
 
 #: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
 msgid "FUSE could not be enabled."
-msgstr "FUSE could not be enabled."
+msgstr "FUSE সামৰ্থবান কৰিব নোৱাৰি।"
 
 #: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
 msgid "An error ocurred while connecting to the specified server:"
-msgstr "ত্ৰুটি:"
+msgstr "ধাৰ্য্যত চাৰ্বাৰলে সংযোগ কৰোতে ত্ৰুটি:"
 
 #. Expander containing TreeView
 #: ../Tomboy/Synchronization/SyncDialog.cs:89
 msgid "Details"
-msgstr "বিবৰণ"
+msgstr "বিবৰণসমূহ"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2116,183 +2128,186 @@ msgstr "অৱস্থা"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:236
 msgid "Acquiring sync lock..."
-msgstr "Acquiring sync lock..."
+msgstr "সংমিহলি লক প্ৰাপ্ত কৰা হৈ আছে..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
-msgstr "Committing changes..."
+msgstr "পৰিৱৰ্তনসমূহ চিৰস্থায়ী কৰা হৈ আছে..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
-msgstr "নোট"
+msgstr "সংমিহলি টোকাসমূহ"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:243
 msgid "Synchronizing your notes..."
-msgstr "Synchronizing your notes..."
+msgstr "আপোনাৰ টোকাসমূহ সংমিহলি কৰা হৈ আছে..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "This may take a while, kick back and enjoy!"
-msgstr "a আৰু!"
+msgstr "ই  অলপ সময় লব পাৰে, নিশ্চিন্ত হৈ বহক আৰু ফুৰ্তি কৰক!"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
-msgstr "Connecting."
+msgstr "চাৰ্ভাৰলে সংযোগ কৰা হৈ আছে..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
-msgstr "বন্ধ সৰ্বমোট."
+msgstr "চাৰ্ভাৰৰ পৰা টোকা বন্ধসমূহ মচি পেলোৱা হৈ আছে..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
-msgstr "ডাউনলোড ব্যৱস্থা."
+msgstr "নতুন/আপডেইট কৰা টোকাসমূহ ডাউনলোড কৰা হৈ আছে"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
-msgstr "সেৱক"
+msgstr "চাৰ্ভাৰ লক কৰা হল"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
-msgstr "সেৱক হলো"
+msgstr "চাৰ্ভাৰ লক কৰা আছে"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:270
 msgid ""
 "One of your other computers is currently synchronizing.  Please wait 2 "
 "minutes and try again."
-msgstr "এক সৰ্বমোট হলো মিনিট আৰু."
+msgstr ""
+"আপোনাৰ অন্য কমপিউটাৰসমূহৰ এটা বৰ্তমানে সংমিহলি কৰি আছে। অনুগ্ৰহ কৰি দুই মিনিট "
+"অপেক্ষা কৰকআৰু পুনৰ চেষ্টা কৰক।"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
-msgstr "Preparing to download updates from server..."
+msgstr "চাৰ্ভাৰৰ পৰা আপডেইটসমূহ ডাউনলোড কৰাৰ প্ৰস্তুতি চলি আছে..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
-msgstr "Preparing to upload updates to server..."
+msgstr "চাৰ্ভাৰলে আপডেইটসমূহ আপলোড কৰাৰ প্ৰস্তুতি চলি আছে..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
-msgstr "Uploading notes to server..."
+msgstr "চাৰ্ভালে টোকাসমূহ আপলোড কৰা হৈ আছে..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
-msgstr "সামঞ্জস্য ব্যৰ্থ"
+msgstr "সংমিহলি ব্যৰ্থ"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:284
 msgid "Failed to synchronize"
-msgstr "ব্যৰ্থ"
+msgstr "সংমিহলি কৰিবলে ব্যৰ্থ হল"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Could not synchronize notes.  Check the details below and try again."
-msgstr "Check আৰু."
+msgstr ""
+"টোকাসমূহ সংমিহলি কৰিব পৰা নগল। তলত বিৱৰণসমূহ নীৰিক্ষণ কৰক আৰু পুনৰ চেষ্টা কৰক।"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:291
 msgid "Synchronization Complete"
-msgstr "সামঞ্জস্য সমাপ্ত"
+msgstr "সংমিহলি সম্পূৰ্ণ"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:292
 msgid "Synchronization is complete"
-msgstr "সামঞ্জস্য সমাপ্ত"
+msgstr "সংমিহলি সম্পূৰ্ণ হল।"
 
 # # , csharp-format
 #: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
-msgstr[0] "{0} note updated."
-msgstr[1] "{0} notes updated."
+msgstr[0] "{0} টোকা আপডেইট কৰা হল।"
+msgstr[1] "{0} টোকাসমূহ আপডেইট কৰা হল।"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
-msgstr "এখন."
+msgstr "আপোনাৰ টোকাসমূহ এতিয়া বৰ্তমান তাৰিখলে উন্নত।"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
-msgstr "সামঞ্জস্য বাতিল কৰা হৈছে"
+msgstr "সংমিহলি বাতিল কৰা হৈছে"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Synchronization was canceled"
-msgstr "সামঞ্জস্য"
+msgstr "সংমিহলি বাতিল কৰা হৈছিল"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
-msgstr "You You এখন."
+msgstr "আপুনি সংমিহলি বাতিল কৰিছে। আপুনি উইন্ডোটো এতিয়া বন্ধ কৰিব পাৰে।"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
-msgstr "সামঞ্জস্য Not"
+msgstr "সংমিহলি সংৰূপণ কৰা হোৱা নাই"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "Synchronization is not configured"
-msgstr "সামঞ্জস্য হলো"
+msgstr "সংমিহলি সংৰূপীত নহয়"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:311
 msgid "Please configure synchronization in the preferences dialog."
-msgstr "Please configure synchronization in the preferences dialog."
+msgstr "পছন্দসমূহ ডাইলগত সংমিহলি সংৰূপণ কৰক।"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization Service Error"
-msgstr "সামঞ্জস্য পৰিসেবা ত্ৰুটি"
+msgstr "সংমিহলি সেৱা ত্ৰুটি"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Service error"
-msgstr "পৰিসেবা ত্ৰুটি"
+msgstr "সেৱা ত্ৰুটি"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
-msgstr "ত্ৰুটি."
+msgstr "সংমিহলি সেৱালে সংযোগ কৰোতে ত্ৰুটি। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
-msgstr "আঁতৰুৱা হৈছে"
+msgstr "স্থানীয়ভাৱে মচি পেলোৱা হল"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
-msgstr "আঁতৰুৱা হৈছে"
+msgstr "চাৰ্ভাৰৰ পৰা মচি পেলোৱা হল"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
-msgstr "আপডেট কৰা হৈছে"
+msgstr "আপডেট কৰা হল"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:343
 msgid "Added"
-msgstr "Added"
+msgstr "যোগ কৰা হল"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
-msgstr "Uploaded changes to server"
+msgstr "পৰিৱৰ্তনসমূহ চাৰ্ভাৰলে আপডেইট কৰা হল"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
-msgstr "Uploaded new note to server"
+msgstr "চাৰ্ভাৰলে নতুন টোকা আপলোড কৰা হল"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
-msgstr "নোট Conflict"
+msgstr "টোকা দন্দ"
 
 #. Suggest renaming note by appending " (old)" to the existing title
 #: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid " (old)"
-msgstr " (old)"
+msgstr " (পুৰনি)"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
-msgstr "Rename local note:"
+msgstr "স্থানীয় টোকা পুনৰ নামাকৰন কৰক:"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
-msgstr "আপডেট কৰক"
+msgstr "প্ৰাসংগিক টোকাসমূহত লিঙ্কসমূহ আপডেইট কৰক"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:554
 msgid "Overwrite local note"
-msgstr "মুছে নতুন কৰি লেখা"
+msgstr "স্থানীয় টোকা পুনৰ লিখক"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:558
 msgid "Always perform this action"
-msgstr "সৰ্বদা"
+msgstr "সদায় এই কাৰ্য্য পৰিৱেশন কৰক"
 
 #. Set initial dialog text
 #: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Note conflict detected"
-msgstr "Note conflict detected"
+msgstr "টোকা দন্দ ধৰা পেলোৱা হৈছে"
 
 # # , csharp-format
 #: ../Tomboy/Synchronization/SyncDialog.cs:565
@@ -2301,28 +2316,26 @@ msgid ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
 "want to do with your local note?"
 msgstr ""
-"The server version of \"{0}\" conflicts with your local note.  What do you "
-"want to do with your local note?"
-
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "সৰঞ্জাম (_T)"
+"\"{0}\" চাৰ্ভাৰ সংস্কৰণ  আপোনাৰ স্থানীয় টোকাৰ সৈতে দন্দ কৰে।  আপুনি আপোনাৰ স্থানীয় "
+"টোকাৰ লগত কি কৰিব বিচাৰে?"
 
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
-msgstr "Could not enable FUSE"
+msgstr "FUSE সামৰ্থবান কৰিব নোৱাৰি"
 
 #: ../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."
-msgstr "হলো আৰু."
+msgstr ""
+"FUSE মডিউল লোড কৰিব নোৱাৰি। অনুগ্ৰহ কৰি নীৰিক্ষণ কৰক যে ই সঠিকভাৱে ইনস্টল আছেআৰু "
+"পুনৰ চেষ্টা কৰক।"
 
 #: ../Tomboy/Synchronization/SyncUtils.cs:135
 msgid "Enable FUSE?"
-msgstr "সক্ৰিয়?"
+msgstr "FUSE সামৰ্থবান কৰিব?"
 
 #. TODO: This message isn't entirely accurate.
 #. We should fix it.
@@ -2333,13 +2346,252 @@ msgid ""
 "To avoid getting this prompt in the future, you should load FUSE at "
 "startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
 "etc/modules."
-msgstr "না যোগ কৰক d."
+msgstr ""
+"আপুনি পছন্দ কৰা সংমিহলি লোড হবলে FUSE মডিউলৰ প্ৰয়োজন।\n"
+"ভৱিষ্যতত এই প্ৰমপ্ট অহা বন্ধ কৰিবলে, আপুনি FUSE -ক আৰম্ভণিত লোড কৰিব লাগিব।"
+"\"modprobe fuse\" -ক /etc/init.d/boot.local অথবা  \"fuse\" -ক /etc/modules "
+"লে যোগ কৰক।"
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "নতুন টোকা নিৰ্মাণ কৰিবলৈ ব্যৰ্থ"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "প্ৰধান নিৰ্মাণকাৰ্য:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "অৱদানকাৰীসমূহ:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"অমিতাক্ষ ফুকন (aphukan at fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami at redhat."
+"com)"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"স্বত্বাধিকাৰ © ২০০৪-২০০৭ এলেক্স গ্ৰেইভলি\n"
+"স্বত্বাধিকাৰ © ২০০৪-২০১১ অন্য\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "টোকা লিখাৰ এটা সৰল আৰু সহজে ব্যৱহাৰ কৰিব পৰা ডেস্কটপ অনুপ্ৰয়োগ।"
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "ঘৰপৃষ্ঠা"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: টোকা লিখাৰ এটা সহজে ব্যৱহাৰ কৰিব পৰা ডেস্কটপ টোকা-লোৱা অনুপ্ৰয়োগ।\n"
+"স্বত্বাধিকাৰ (C) ২০০৪-২০০৭ এলেক্স গ্ৰেইভলি\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"স্বত্বাধিকাৰ (C) ২০০৪-২০১১ অন্য\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Usage:\n"
+"  --version\t\t\tসংস্কৰণ তথ্য প্ৰিন্ট কৰক।\n"
+"  --help\t\t\tএই ব্যৱহাৰ বাৰ্তা প্ৰিন্ট কৰক।\n"
+"  --note-path [path]\t\tএই ডাইৰেকটৰিত টোকা তথ্য লোড/সংৰক্ষণ কৰক।\n"
+"  --search [text]\t\tসন্ধান লিখনীৰ সৈতে সকলো টোকা সন্ধান কৰক উইন্ডো খোলক।\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tনতুন টোকা নিৰ্মাণ আৰু প্ৰদৰ্শন।\n"
+"  --new-note [title]\t\tশীৰ্ষকসহ নতুন টোকা নিৰ্মাণ আৰু প্ৰদৰ্শন।\n"
+"  --open-note [title/url]\tউল্লিখিত শীৰ্ষকসহ উপস্থিত টোকা দেখুৱাওক।\n"
+"  --start-here\t\t\t'আৰম্ভৰ স্থান' টোকা দেখুৱাওক।\n"
+"  --highlight-search [text]\tবৰ্তমানে প্ৰদৰ্শিত নোটে লিখনী সন্ধান কৰক কৰি উজ্জ্বল "
+"কৰক।\n"
+
+# # , csharp-format
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "সংস্কৰণ {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (নতুন)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "Tomboy -ৰ বিষয়ে (_A)"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"\"Tomboy টোকাসমূহ হাতপুথি\" পোৱা নগল। অনুগ্ৰহ কৰি সুনিশ্চিত কৰক যে আপোনাৰইনস্টল "
+"সফলভাৱে সম্পূৰ্ণ কৰা হৈছে।"
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "সহায় পোৱা নগল"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "অৱস্থান প্ৰদৰ্শন কৰিবলৈ ব্যৰ্থ"
+
+# # , csharp-format
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "আজি, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "আজি"
+
+# # , csharp-format
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "যোৱাকালী, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "যোৱাকালী"
+
+# , csharp-format
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} দিন আগত, {1}"
+msgstr[1] "{0} দিনসমূহ আগত, {1}"
+
+# , csharp-format
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} দিন আগত"
+msgstr[1] "{0} দিনসমূহ আগত"
+
+# # , csharp-format
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "অহাকালী, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "অহাকালী"
+
+# , csharp-format
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "{0} দিনত, {1}"
+msgstr[1] "{0} দিনসমূহত, {1}"
+
+# , csharp-format
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "{0} দিনত"
+msgstr[1] "{0} দিনসমূহত"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "MMMM d"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "কোনো তাৰিখ নাই"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "MMMM d yyyy, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "MMMM d yyyy"
+
+# # , csharp-format
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(শীৰ্ষকবিহীন {0})"
+
+# # , csharp-format
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"<b>{0}</b> শীৰ্ষকসহ এটা টোকা ইতিমধ্যে উপস্থিত আছে। আগবঢ়াৰ আগতে অনুগ্ৰহ কৰি এটা "
+"পৃথক নাম নিৰ্বাচন কৰক।"
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "টোকাৰ শীৰ্ষক গ্ৰহণ কৰা হৈছে"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "লিঙ্ক দ্বাৰা চিহ্নিত অৱস্থান কপি কৰক (_C)"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "লিঙ্ক খোলক (_O)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "সঁচাকে এই টোকা মচি পেলাব?"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "HTML Export সৰ্বশেষ ডাইৰেকটৰি"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "টোকা সন্ধান কৰক (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "সাফল্য You NULL সংযুক্ত!"
 
 #~ msgid "_Browse..."
 #~ msgstr "ব্ৰাউজ কৰক...(_B)"
 
 #~ msgid "D-BUS remote control disabled.\n"
-#~ msgstr "D-BUS'ৰ দূৰবৰ্তী নিয়ন্ত্ৰণ নিষ্ক্ৰিয় কৰা হৈছে  । \n"
+#~ msgstr "D-BUS -ৰ দূৰবৰ্তী নিয়ন্ত্ৰণ নিষ্ক্ৰিয় কৰা হৈছে। \n"
 
 # # , csharp-format
 #~ msgid ""
@@ -2348,8 +2600,8 @@ msgstr "না যোগ কৰক d."
 #~ "D-BUS remote control disabled."
 #~ msgstr ""
 #~ "Tomboy: অসমৰ্থিত বিকল্প '{0}'\n"
-#~ "অধিক জানতে 'tomboy --help' প্ৰয়োগ কৰক  ।\n"
-#~ "D-BUS'ৰ দূৰবৰ্তী নিয়ন্ত্ৰণ নিষ্ক্ৰিয় কৰা হৈছে  ।"
+#~ "অধিক জানতে 'tomboy --help' প্ৰয়োগ কৰক।\n"
+#~ "D-BUS -ৰ দূৰবৰ্তী নিয়ন্ত্ৰণ নিষ্ক্ৰিয় কৰা হৈছে।"
 
 #~ msgid "C_ase Sensitive"
 #~ msgstr "হৰফেৰ ছাঁদ সম্পৰ্কে সচেতন (_a)"
@@ -2361,7 +2613,7 @@ msgstr "না যোগ কৰক d."
 #~ msgstr "ভাৰ্সান"
 
 #~ msgid "Other"
-#~ msgstr "অন্যান্য"
+#~ msgstr "অন্য"
 
 #~ msgid "NoteOfTheDay"
 #~ msgstr "NoteOfTheDay"
@@ -2433,22 +2685,22 @@ msgstr "না যোগ কৰক d."
 #~ msgstr "ফন্ট বিবৰণ উল্লিখিত সময় অবধি"
 
 #~ msgid "Print Line Numbers"
-#~ msgstr "পংক্তি সংখ্যা প্ৰিন্ট কৰা হ'ব"
+#~ msgstr "পংক্তি সংখ্যা প্ৰিন্ট কৰক"
 
 #~ msgid "Interval of printed line numbers (0 means no numbers)"
 #~ msgstr "সৰ্বমোট না"
 
 #~ msgid "Print Header"
-#~ msgstr "হেডাৰ প্ৰিন্ট কৰা হ'ব"
+#~ msgstr "হেডাৰ প্ৰিন্ট কৰক"
 
 #~ msgid "Whether to print a header in each page"
-#~ msgstr "প্ৰতিটি পৃষ্ঠায় হেডাৰ প্ৰিন্ট কৰা হ'ব কি না"
+#~ msgstr "প্ৰতিটি পৃষ্ঠায় হেডাৰ প্ৰিন্ট কৰক কি না"
 
 #~ msgid "Print Footer"
-#~ msgstr "ফুটাৰ প্ৰিন্ট কৰা হ'ব"
+#~ msgstr "ফুটাৰ প্ৰিন্ট কৰক"
 
 #~ msgid "Whether to print a footer in each page"
-#~ msgstr "প্ৰতিটি পৃষ্ঠায় ফুটাৰ প্ৰিন্ট কৰা হ'ব কি না"
+#~ msgstr "প্ৰতিটি পৃষ্ঠায় ফুটাৰ প্ৰিন্ট কৰক কি না"
 
 #~ msgid "Header and Footer Font"
 #~ msgstr "হেডাৰ ও ফুটাৰে ব্যৱহৃত ফন্ট"
@@ -2466,4 +2718,4 @@ msgstr "না যোগ কৰক d."
 #~ msgstr "Really delete these notes?"
 
 #~ msgid "_Open New Note Template..."
-#~ msgstr "খুলুন নতুন নোট ছাঁচ."
+#~ msgstr "খোলক নতুন টোকা টেমপ্লেইট."
diff --git a/po/be.po b/po/be.po
index f711be7..8f874d9 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,356 +1,1330 @@
+# Ihar Hrachyshka <ihar.hrachyshka at gmail.com>, 2007, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: tomboy\n"
+"Project-Id-Version: tomboy.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 21:21+0200\n"
-"PO-Revision-Date: 2007-03-01 21:22+0300\n"
+"POT-Creation-Date: 2011-09-24 20:38+0300\n"
+"PO-Revision-Date: 2011-09-24 20:38+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>\n"
-"Language-Team: Belarusian Localization Team <i18n at mova.org>\n"
+"Language-Team: Belarusian <i18n-bel-gnome at googlegroups.com>\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n"
-"X-Poedit-Language: Belarusian\n"
-"X-Poedit-Country: BELARUS\n"
-
-#: ../data/DefaultPlugins.desktop.in.in.h:1
-msgid "Default Plugins"
-msgstr "Прадвызначаныя плагіны"
-
-#: ../data/DefaultPlugins.desktop.in.in.h:2
-msgid "Directory containing system-installed Plugins"
-msgstr "Дырэкторыя з сыстэмнымі дадаткамі"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
-msgstr "Інструмэнты"
+msgstr "Дапаможныя прылады"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:2
-#: ../data/tomboy.desktop.in.h:2
 msgid "Simple and easy to use note-taking"
-msgstr "Просты нататнік"
+msgstr "Зручны блакнот"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:3
 msgid "Tomboy Applet Factory"
-msgstr "Аплет Нататніка"
+msgstr "Фабрыка аплета Tomboy"
 
-#: ../data/GNOME_TomboyApplet.server.in.in.h:4
-#: ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Applet.cs:154
-#: ../Tomboy/Tray.cs:147
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
+#: ../Tomboy/Tray.cs:579
 msgid "Tomboy Notes"
-msgstr "Нататнік Tomboy"
+msgstr "Нататкі Tomboy"
+
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:274
+msgid "S_ynchronize Notes"
+msgstr "_Сінхранізаваць нататкі"
 
-#: ../data/GNOME_TomboyApplet.xml.h:1
-#: ../Tomboy/ActionManager.cs:100
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
-msgstr "_Пра праграму"
+msgstr "_Аб праграме"
 
-#: ../data/GNOME_TomboyApplet.xml.h:2
-#: ../Tomboy/ActionManager.cs:93
-#: ../Tomboy/Applet.cs:199
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:288
 msgid "_Help"
-msgstr "_Даведка"
-
-#: ../data/GNOME_TomboyApplet.xml.h:3
-#: ../Tomboy/Applet.cs:187
-#: ../Tomboy/NoteWindow.cs:643
-#: ../Tomboy/Preferences.cs:645
-msgid "_Open Plugins Folder"
-msgstr "_Адкрыць дырэкторыю дадаткаў"
-
-#: ../data/GNOME_TomboyApplet.xml.h:4
-#: ../Tomboy/ActionManager.cs:89
-#: ../Tomboy/Applet.cs:194
+msgstr "_Дапамога"
+
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:283
 msgid "_Preferences"
-msgstr "_Настаўленні"
+msgstr "_Настройкі"
 
 #: ../data/tomboy.desktop.in.h:1
 msgid "Note-taker"
-msgstr "Нататнік"
+msgstr "Блакнот"
+
+#: ../data/tomboy.desktop.in.h:2
+msgid "Take notes, link ideas, and stay organized"
+msgstr "Занатоўванне ідэй і звестак"
 
 #: ../data/tomboy.schemas.in.h:1
-msgid "Create a new Note"
-msgstr "Стварыць цыдулку"
+msgid "Accept SSL Certificates"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:2
-msgid "Currently enabled plugins."
-msgstr "Актываваныя плагіны."
+msgid "Automatic Background Synchronization Timeout"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:3
-msgid "Custom Font Face"
-msgstr "Адмысловы шрыфт"
+msgid "Create a new Note"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:4
-msgid "Enable WikiWord highlighting"
-msgstr "Фарбаванне WikiWord"
+msgid "Custom Font Face"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Enable custom font"
-msgstr "Адмысловы шрыфт"
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Enable global keybindings"
-msgstr "Глябальныя клявішныя скароты"
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Enable spellchecking"
-msgstr "Праверка правапісу"
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Enable this option to highlight words ThatLookLikeThis. Clicking the word will create a note with that name."
-msgstr "Падфарбоўваць ВосьТакіяСловы. Пстрычка па такім слове выклікае стварэньне цыдулкі."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "HTML Export All Linked Notes"
-msgstr "Экспартаваць у HTML усе зьвязаныя цыдулкі"
+msgid "Enable Middle-Click Paste On Icon."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:10
-msgid "HTML Export Last Directory"
-msgstr "Дырэкторыя апошняга экспартаваньня ў HTML"
+msgid "Enable Tray Icon"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:11
-msgid "HTML Export Linked Notes"
-msgstr "Экспартаваць у HTML зьвязаныя цыдулкі"
+msgid "Enable WikiWord highlighting"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:12
-msgid "If enable_custom_font is true, the font name set here will be used as the font when displaying notes."
-msgstr "Калі опцыя enable_custom_font выстаўлена ў true, цыдулкі будуць ужываць гэты шрыфт."
+msgid "Enable automatic bulleted lists."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:13
-msgid "If true, misspellings will be underlined in red, and correct spelling suggestions shown in the right-click menu."
-msgstr "Калі опцыя выстаўлена ў true, няправільныя словы будуць падкрэсьлівацца чырвонай рысай, а правая пстрычка па такім слове выкліча мэню з варыянтамі правільнага напісаньня."
+msgid "Enable closing notes with escape."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:14
-msgid "If true, the desktop-global keybindings set in /apps/tomboy/global_keybindings will be enabled, allowing for useful Tomboy actions to be available from any application."
-msgstr "Калі опцыя выстаўлена ў true, то будуць ужытыя глябальныя клявішныя скароты, выстаўленыя ў опцыі /apps/tomboy/global_keybindings, і дзеяньні праграмы можна будзе выклікаць зь любой праграмы."
+msgid "Enable custom font"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:15
-msgid "If true, the font name set in custom_font_face will be used as the font when displaying notes. Otherwise the desktop default font will be used."
-msgstr "Калі опцыя выстаўлена ў true, то цыдулкі будуць паказвацца з дапамогай выстаўленага ў опцыі custom_font_face шрыфта. Інакш будзе ўжыты прадвызначаны шрыфт працоўнага асяродзьдзя."
+msgid "Enable global keybindings"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:16
-msgid "Indicates that the Sticky Note Importer plugin has not been run, so it should run automatically the next time Tomboy starts."
-msgstr "Паказвае, што дадатак імпартаваньня Ліпучых нататак не загружаны, але будзе ўжыты па наступным старце нататніка."
+msgid "Enable spellchecking"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:17
-msgid "Integer determining the minimum number of notes to show in the Tomboy note menu."
-msgstr "Колькасьць цыдулак, паказаных у мэню."
+msgid "Enable startup notes"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:18
-msgid "List containing the names of currently enabled plugins."
-msgstr "Сьпіс актываваных плагінаў."
+msgid "Enable the Delete Note confirmation dialog"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:19
-msgid "List of pinned notes."
-msgstr "Сьпіс прышпіленых цыдулак"
+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:20
-msgid "Minimum number of notes to show in menu"
-msgstr "Колькасьць цыдулак, паказаных у мэню"
+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 ""
 
 #: ../data/tomboy.schemas.in.h:21
-msgid "Open Recent Changes"
-msgstr "Паказаць нядаўнія зьмены"
+msgid ""
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:22
-msgid "Open Search Dialog"
-msgstr "Пошук"
+msgid "FUSE Mounting Timeout (ms)"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:23
-msgid "Open Start Here"
-msgstr "У пачатак"
+msgid "HTML Export All Linked Notes"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "Set to TRUE to activate"
-msgstr "Выстаўце ў TRUE, каб актывізаваць"
+msgid "HTML Export Linked Notes"
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:25
-msgid "Show applet menu"
-msgstr "Паказаць мэню аплета"
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:26
-msgid "Start Here Note"
-msgstr "Пачатковая цыдулка"
+msgid ""
+"If enable_custom_font is true, the font name set here will be used as the "
+"font when displaying notes."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:27
-msgid "Sticky Note Importer First Run"
-msgstr "Першы старт імпартэра Ліпучых нататак"
+msgid ""
+"If enabled, all notes that were open when Tomboy quit will automatically be "
+"reopened at startup."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:28
-msgid "The global keybinding for creating and displaying a new Note. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "Глябальныя клявішныя скароты для стварэньня і адлюстраваньня цыдулак. Фармат: \"<Control>a\" or \"<Shift><Alt>F1\". Праграма-разборнік дазваляе вызначаць малыя і вялікія літары, а таксама скароты, напрыклад, \"<Ctl>\" ці \"<Ctrl>\". Калі Вы выставіце гэтую опцыю ў значэньне \"disabled\", тады для гэтага дзеяньня ня будзе вызначаны клявішны скарот."
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:29
-msgid "The global keybinding for opening the \"Start Here\" note. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "Глябальны клявішны скарот для адкрыцьця пачатковай цыдулкі. Фармат: \"<Control>a\" or \"<Shift><Alt>F1\". Праграма-разборнік дазваляе вызначаць малыя і вялікія літары, а таксама скароты, напрыклад, \"<Ctl>\" ці \"<Ctrl>\". Калі Вы выставіце гэтую опцыю ў значэньне \"disabled\", тады для гэтага дзеяньня ня будзе вызначаны клявішны скарот."
+msgid ""
+"If true, Tomboy's tray icon will be displayed in the notification area. "
+"Disabling this may be useful when another application is providing the "
+"functionality of the tray icon."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:30
-msgid "The global keybinding for opening the Note Search dialog. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "Глябальны клявішны скарот для пошуку цыдулкі. Фармат: \"<Control>a\" or \"<Shift><Alt>F1\". Праграма-разборнік дазваляе вызначаць малыя і вялікія літары, а таксама скароты, напрыклад, \"<Ctl>\" ці \"<Ctrl>\". Калі Вы выставіце гэтую опцыю ў значэньне \"disabled\", тады для гэтага дзеяньня ня будзе вызначаны клявішны скарот."
+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:31
-msgid "The global keybinding for opening the Recent Changes dialog. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "Глябальны клявішны скарот для прагляду нядаўніх зьменаў. Фармат: \"<Control>a\" or \"<Shift><Alt>F1\". Праграма-разборнік дазваляе вызначаць малыя і вялікія літары, а таксама скароты, напрыклад, \"<Ctl>\" ці \"<Ctrl>\". Калі Вы выставіце гэтую опцыю ў значэньне \"disabled\", тады для гэтага дзеяньня ня будзе вызначаны клявішны скарот."
+msgid ""
+"If true, the desktop-global keybindings set in /apps/tomboy/"
+"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
+"available from any application."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:32
-msgid "The global keybinding for showing the Tomboy applet's menu. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
-msgstr "Глябальны клявішны скарот для паказу мэню аплета. Фармат: \"<Control>a\" or \"<Shift><Alt>F1\". Праграма-разборнік дазваляе вызначаць малыя і вялікія літары, а таксама скароты, напрыклад, \"<Ctl>\" ці \"<Ctrl>\". Калі Вы выставіце гэтую опцыю ў значэньне \"disabled\", тады для гэтага дзеяньня ня будзе вызначаны клявішны скарот."
+msgid ""
+"If true, the font name set in custom_font_face will be used as the font when "
+"displaying notes. Otherwise the desktop default font will be used."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:33
-msgid "The handler for \"note://\" URLs"
-msgstr "Апрацоўнік адрасоў \"note://\""
+msgid ""
+"Indicates that the Sticky Note Importer plugin has not been run, so it "
+"should run automatically the next time Tomboy starts."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:34
-msgid "The last directory a note was exported to using the Export To HTML plugin."
-msgstr "Дырэкторыя, у якую апошні раз экспартавалі ў HTML."
+msgid ""
+"Integer determining the minimum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
 
 #: ../data/tomboy.schemas.in.h:35
-msgid "The last setting for the 'Export linked notes' checkbox in the Export to HTML plugin."
-msgstr "Апошняе значэнне опцыі 'Экспартаваць зьвязаныя цыдулкі' экспартаваньня ў HTML."
+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 ""
 
 #: ../data/tomboy.schemas.in.h:36
-msgid "The last setting for the 'Include all other linked notes' checkbox in the Export to HTML plugin. This setting is used in conjunction with the 'HTML Export Linked Notes' setting and is used to specify whether all notes (found recursively) should be included during an export to HTML."
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific behavior when a conflict is detected, instead of prompting the "
+"user. The values map to an internal enumeration. 0 indicates that the user "
+"wishes to be prompted when a conflict occurs, so that they may handle each "
+"conflict situation on a case-by-case basis."
 msgstr ""
 
 #: ../data/tomboy.schemas.in.h:37
-msgid "The note URI of the note that should be considered the \"Start Here\" note, which is always placed at the bottom of the Tomboy note menu and also accessible by hotkey."
+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 ""
 
 #: ../data/tomboy.schemas.in.h:38
-msgid "Whitespace-separated list of note URIs for notes that should always appear in the Tomboy note menu."
-msgstr "Сьпіс цыдулак, падзеленых прагаламі, якія трэба заўсёды паказваць у мэню."
+msgid "Last Directory used in HTML Export"
+msgstr ""
 
-#: ../libtomboy/gedit-print.c:142
-#: ../Tomboy/Plugins/PrintNotes.cs:22
-msgid "Print"
-msgstr "Друкаваць"
+#: ../data/tomboy.schemas.in.h:39
+msgid "Link Updating Behavior on Note Rename"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:40
+msgid "List of pinned notes."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:41
+msgid ""
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:42
+msgid "Maximum note title length to show in tray menu."
+msgstr ""
 
-#: ../libtomboy/gedit-print.c:240
-msgid "Preparing pages..."
-msgstr "Падрыхтоўка аркушаў..."
+#: ../data/tomboy.schemas.in.h:43
+msgid "Minimum number of notes to show in menu"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:44
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:45
+msgid "Open Recent Changes"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:46
+msgid "Open Search Dialog"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:47
+msgid "Open Start Here"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:48
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:49
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:50
+msgid "SSHFS Remote Synchronization Folder"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:51
+msgid "SSHFS Remote Synchronization User Name"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:52
+msgid "SSHFS Synchronization Server Port"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:53
+msgid "SSHFS Synchronization Server URL"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:54
+msgid "Saved height of \"Search All Notes\" window"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:55
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:56
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:57
+msgid "Saved width of \"Search All Notes\" window"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:58
+msgid "Selected Synchronization Service Addin"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:59
+msgid "Set to TRUE to activate"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:60
+msgid "Show applet menu"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:61
+msgid "Start Here Note"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:62
+msgid "Sticky Note Importer First Run"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:63
+msgid "Synchronization Client ID"
+msgstr ""
 
-#: ../libtomboy/gedit-print.c:267
-#, c-format
-msgid "Rendering page %d of %d..."
-msgstr "Стварэньне аркуша %d з %d..."
+#: ../data/tomboy.schemas.in.h:64
+msgid "Synchronization Local Server Path"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:65
+msgid "The date format that is used for the timestamp."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:66
+msgid ""
+"The global keybinding for creating and displaying a new Note. The format "
+"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
+"parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:67
+msgid ""
+"The global keybinding for opening the \"Start Here\" note. The format looks "
+"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:68
+msgid ""
+"The global keybinding for opening the Note Search dialog. The format looks "
+"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:69
+msgid ""
+"The global keybinding for opening the Recent Changes dialog. The format "
+"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
+"parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:70
+msgid ""
+"The global keybinding for showing the Tomboy applet's menu. The format looks "
+"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:71
+msgid "The handler for \"note://\" URLs"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:72
+msgid ""
+"The last directory a note was exported to using the Export To HTML plugin."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:73
+msgid ""
+"The last setting for the 'Export linked notes' checkbox in the Export to "
+"HTML plugin."
+msgstr ""
 
-#: ../libtomboy/gedit-print.c:269
-#, c-format
-msgid "Printing page %d of %d..."
-msgstr "Друк аркуша %d з %d..."
+#: ../data/tomboy.schemas.in.h:74
+msgid ""
+"The last setting for the 'Include all other linked notes' checkbox in the "
+"Export to HTML plugin. This setting is used in conjunction with the 'HTML "
+"Export Linked Notes' setting and is used to specify whether all notes (found "
+"recursively) should be included during an export to HTML."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:75
+msgid ""
+"The note URI of the note that should be considered the \"Start Here\" note, "
+"which is always placed at the bottom of the Tomboy note menu and also "
+"accessible by hotkey."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:76
+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 ""
+
+#: ../data/tomboy.schemas.in.h:77
+msgid ""
+"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
+"mount a sync share."
+msgstr ""
 
-#: ../libtomboy/gedit-print.c:291
-msgid "Print preview"
-msgstr "Перадагляд"
+#: ../data/tomboy.schemas.in.h:78
+msgid "Timestamp format"
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:79
+msgid "URL of SSH server containing Tomboy synchronization directory."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:80
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:81
+msgid ""
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
+msgstr ""
+
+#: ../data/tomboy.schemas.in.h:82
+msgid ""
+"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
+"user."
+msgstr ""
 
-#: ../libtomboy/gedit-print.c:442
-msgid "Page %N of %Q"
-msgstr "Аркуш %N з %Q"
+#: ../data/tomboy.schemas.in.h:83
+msgid "User name to use when connecting to the synchronization server via SSH."
+msgstr ""
 
-#: ../libtomboy/gedit-print.c:445
-#, no-c-format
-msgid "%A %x, %X"
-msgstr "%A %x, %X"
+#: ../data/tomboy.schemas.in.h:84
+msgid ""
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Tomboy note menu."
+msgstr ""
 
-#: ../Tomboy/ActionManager.cs:63
+#: ../Tomboy/ActionManager.cs:127
 msgid "_File"
 msgstr "_Файл"
 
-#: ../Tomboy/ActionManager.cs:66
+#: ../Tomboy/ActionManager.cs:130
 msgid "_New"
 msgstr "_Новы"
 
-#: ../Tomboy/ActionManager.cs:67
-#: ../Tomboy/ActionManager.cs:108
+#: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
 msgid "Create a new note"
-msgstr "Стварыць новую цыдулку"
+msgstr "Стварыць нататку"
 
-#: ../Tomboy/ActionManager.cs:70
+#: ../Tomboy/ActionManager.cs:134
 msgid "_Open..."
 msgstr "_Адкрыць..."
 
-#: ../Tomboy/ActionManager.cs:71
+#: ../Tomboy/ActionManager.cs:135
 msgid "Open the selected note"
-msgstr "Адкрыць выбраную цыдулку"
+msgstr "Адкрыць вылучаную нататку"
 
-#: ../Tomboy/ActionManager.cs:74
+#: ../Tomboy/ActionManager.cs:138
 msgid "_Delete"
 msgstr "_Выдаліць"
 
-#: ../Tomboy/ActionManager.cs:75
+#: ../Tomboy/ActionManager.cs:139
 msgid "Delete the selected note"
-msgstr "Выдаліць выбраную цыдулку"
+msgstr "Выдаліць вылучаную нататку"
 
-#: ../Tomboy/ActionManager.cs:78
-#: ../Tomboy/NoteWindow.cs:537
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Закрыць"
 
-#: ../Tomboy/ActionManager.cs:79
+#: ../Tomboy/ActionManager.cs:143
 msgid "Close this window"
-msgstr "Закрыць гэтае вакно"
+msgstr "Закрыць гэта акно"
 
-#: ../Tomboy/ActionManager.cs:82
-#: ../Tomboy/Applet.cs:211
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
 msgid "_Quit"
-msgstr "_Выйсьці"
+msgstr "_Выйсці"
 
-#: ../Tomboy/ActionManager.cs:83
+#: ../Tomboy/ActionManager.cs:147
 msgid "Quit Tomboy"
-msgstr "Выйсьці"
+msgstr "Скончыць працу Tomboy"
 
-#: ../Tomboy/ActionManager.cs:86
+#: ../Tomboy/ActionManager.cs:150
 msgid "_Edit"
-msgstr "_Рэдагаваць"
+msgstr "_Праўка"
 
-#: ../Tomboy/ActionManager.cs:90
-#: ../Tomboy/Preferences.cs:169
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
-msgstr "Настаўленьні Нататніка"
+msgstr "Настройкі Tomboy"
 
-#: ../Tomboy/ActionManager.cs:96
+#: ../Tomboy/ActionManager.cs:160
 msgid "_Contents"
-msgstr "_Зьмест"
+msgstr "_Змест"
 
-#: ../Tomboy/ActionManager.cs:97
+#: ../Tomboy/ActionManager.cs:161
 msgid "Tomboy Help"
-msgstr "Даведка па Tomboy"
+msgstr "Даведнік Tomboy"
 
-#: ../Tomboy/ActionManager.cs:101
+#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
 msgid "About Tomboy"
-msgstr "Пра Tomboy"
+msgstr "Аб праграме Tomboy"
 
-#: ../Tomboy/ActionManager.cs:104
+#: ../Tomboy/ActionManager.cs:168
 msgid "TrayIcon"
-msgstr "Значка ў трэі"
+msgstr "Значок у абшары апавяшчэнняў"
 
-#: ../Tomboy/ActionManager.cs:107
+#: ../Tomboy/ActionManager.cs:171
 msgid "Create _New Note"
-msgstr "_Стварыць цыдулку"
+msgstr "_Стварыць нататку"
 
-#: ../Tomboy/ActionManager.cs:111
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
-msgstr "_Шукаць ва ўсіх цыдулках"
+msgstr "_Шукаць ва ўсіх нататках"
 
-#: ../Tomboy/ActionManager.cs:112
+#: ../Tomboy/ActionManager.cs:176
 msgid "Open the Search All Notes window"
-msgstr "Адкрыць \"Пошук ва ўсіх цыдулках\""
+msgstr "Адкрыць акно пошуку ва ўсіх нататках"
 
-#: ../Tomboy/Applet.cs:204
-msgid "_About Tomboy"
-msgstr "_Пра Tomboy"
+#: ../Tomboy/ActionManager.cs:180
+msgid "Start synchronizing notes"
+msgstr "Пачаць сінхранізацыю нататак"
+
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Адмыслова"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Мінімальная колькасць нататак у спісе нядаўняга (максімальна: 18)"
+
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
+msgid "What links here?"
+msgstr "Адкуль спасылаюцца сюды?"
+
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
+msgid "(none)"
+msgstr "(нічога)"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:23
+msgid ""
+"You can use any bugzilla just by dragging links into notes.  If you want a "
+"special icon for certain hosts, add them here."
+msgstr ""
+"Вы можаце выкарыстоўваць любую Bugzilla-псслугу, проста перацягваюцы "
+"спасылкі ў тэкст нататак. Калі вы хочаце мець асаблівыя значкі для некаторых "
+"сервераў, вы можаце дадаць іх тут."
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
+msgid "Host Name"
+msgstr "Назва сервера"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:58
+msgid "Icon"
+msgstr "Значок"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:176
+msgid "Select an icon..."
+msgstr "Выбраць значок..."
+
+#. Extra Widget
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:191
+msgid "_Host name:"
+msgstr "_Назва сервера:"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:220
+msgid "No host name specified"
+msgstr "Назва сервера не вызначана"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
+msgid "You must specify the Bugzilla host name to use with this icon."
+msgstr "Трэба вызначыць назву Bugzilla-сервера для гэтага значка."
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
+msgid "Error saving icon"
+msgstr "Памылка захавання значка"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
+msgid "Could not save the icon file."
+msgstr "Не ўдалося захаваць гэты файл значка."
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
+msgid "Really remove this icon?"
+msgstr "Ці вы насамрэч хочаце выдаліць гэты значок?"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
+msgid "If you remove an icon it is permanently lost."
+msgstr "Выдаленне значка прывядзе да яго незваротнай страты."
+
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Не ўдалося адкрыць электронны ліст"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Месца прызначэння для HTML-экпартавання"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Экспартаваць звязаныя нататкі"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Улучыць усе астатнія звязаныя нататкі"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
+msgid "Export to HTML"
+msgstr "Экспартаваць у HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#, csharp-format
+msgid "Your note was exported to \"{0}\"."
+msgstr "Нататка паспяхова экспартавана ў \"{0}\"."
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+msgid "Note exported successfully"
+msgstr "Нататка паспяхова экспартавана"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
+msgid "Access denied."
+msgstr "Адмоўлена ў доступе."
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
+msgid "Folder does not exist."
+msgstr "Папка не існуе."
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#, csharp-format
+msgid "Could not save the file \"{0}\""
+msgstr "Не ўдалося захаваць файл \"{0}\""
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
+msgid "_Folder Path:"
+msgstr "_Сцежка да папкі:"
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
+msgid "Select Synchronization Folder..."
+msgstr "Выбраць папку сінхранізацыі..."
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
+msgid "Folder path field is empty."
+msgstr "Графа сцежкі да папкі пустая."
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
+msgid ""
+"Specified folder path does not exist, and Tomboy was unable to create it."
+msgstr "Вызначаная сцежка да папкі не існуе, але Tomboy не здолеў стварыць яе."
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
+msgid "Local Folder"
+msgstr "Мясцовая папка"
+
+#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
+msgid "Fixed Wid_th"
+msgstr "_Сталая шырыня"
+
+#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
+#, csharp-format
+msgid "Cannot contact '{0}'"
+msgstr "Не ўдалося злучыцца з \"{0}\""
+
+#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
+#, csharp-format
+msgid "Error running gaim-remote: {0}"
+msgstr "Памылка запуску \"gaim-remote\": {0}"
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs:29
+msgid "Insert Timestamp"
+msgstr "Устаўка часавага адбітка"
+
+#. initial newline
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
+msgid "dddd, MMMM d, h:mm tt"
+msgstr "dd/MM/yyyy, HH:mm"
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
+msgid "Choose one of the predefined formats or use your own."
+msgstr "Выберыце адзін з прадвызначаных фарматаў часу або вызначыце ўласны."
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
+msgid "Use _Selected Format"
+msgstr "Ужыць _выбраны фармат"
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:87
+msgid "_Use Custom Format"
+msgstr "_Ужыць уласны фармат"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:10
+msgid "Today: Template"
+msgstr "Сёння: Шаблон"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:12
+msgid "Today: "
+msgstr "Сёння: "
+
+#. Format: "Today: Friday, July 01 2005"
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
+msgid "dddd, MMMM d yyyy"
+msgstr "dddd, d MMMM yyyy"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:43
+msgid "Tasks"
+msgstr "Заданні"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:44
+msgid "Appointments"
+msgstr "Сустрэчы"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
+msgid ""
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
+msgstr ""
+"Рэдагуючы нататку <b>Сёння: Шаблон</b>, вы падстройваеце тэкст нататкі "
+"сённяшняга дня."
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
+msgid "_Open Today: Template"
+msgstr "_Адкрыць \"Сёння: Шаблон\""
+
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:52
+msgid "Print"
+msgstr "Надрукаваць"
+
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:82
+msgid "Error printing note"
+msgstr "Памылка друку нататкі"
+
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:223
+#, csharp-format
+msgid "Page {0} of {1}"
+msgstr "Аркуш {0} з {1}"
+
+#. Translators: Explanation of the date and time format specifications can be found here:
+#. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:242
+msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
+msgstr "dddd, dd/MM/yyyy, hh:mm:ss"
+
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Выдаліць зламаныя спасылкі"
+
+#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
+msgid "Add a sketch"
+msgstr "Дадаць накід"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
+msgid "Se_rver:"
+msgstr "_Сервер:"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
+msgid "User_name:"
+msgstr "І_мя карыстальніка:"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
+msgid "_Folder Path (optional):"
+msgstr "_Сцежка да папкі (неабавязкова):"
+
+#. Text for label describing setup required for SSH sync addin to work
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
+msgid ""
+"SSH synchronization requires an existing SSH key for this server and user, "
+"added to a running SSH daemon."
+msgstr ""
+"SSH-сінхранізацыя патрабуе наяўнасці SSH-ключа да сервера і карыстальніка, "
+"дададзеных да працоўнага SSH-дэмана."
 
-#: ../Tomboy/Note.cs:879
-msgid "Really delete this note?"
-msgstr "Выдаліць гэтую цыдулку?"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
+msgid "Server or username field is empty."
+msgstr "Графа назвы сервера ці імя карыстальніка пустая."
 
-#: ../Tomboy/Note.cs:880
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
+msgid ""
+"Timeout connecting to server. Please ensure that your SSH key has been added "
+"to a running SSH daemon."
+msgstr ""
+"Тэрмін чакання злучэння з серверам вычарпаны. Праверце, што ваш SSH-ключ "
+"сапраўды дададзены да працоўнага SSH-дэмана."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
+msgid "Import from Sticky Notes"
+msgstr "Імпартаванне \"Ліпучых нататак\""
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:133
+msgid "No Sticky Notes found"
+msgstr "\"Ліпучыя нататкі\" не знойдзены"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
+#, csharp-format
+msgid "No suitable Sticky Notes file was found at \"{0}\"."
+msgstr "Файл \"Ліпучых нататак\" не знойдзены ў \"{0}\"."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
+msgid "Sticky Notes import completed"
+msgstr "Імпартаванне \"Ліпучых нататак\" скончана"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
+#, csharp-format
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> з <b>{1}</b> \"Ліпучай нататкі\" паспяхова імпартавана."
+msgstr[1] "<b>{0}</b> з <b>{1}</b> \"Ліпучых нататак\" паспяхова імпартаваныя."
+msgstr[2] "<b>{0}</b> з <b>{1}</b> \"Ліпучых нататак\" паспяхова імпартаваныя."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
+msgid "Untitled"
+msgstr "Без назвы"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
+msgid "Sticky Note: "
+msgstr "Ліпучая нататка: "
+
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:62
+msgid "Tasque"
+msgstr "Tasque"
+
+#. Note to translators: "All" here must match up with the "All"
+#. category translation in Tasque for this to work properly.  "All"
+#. is used here to allow Tasque to decide which default category
+#. will be used to create the new task.
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:86
+msgid "All"
+msgstr "Усе"
+
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:145
+msgid "--- Tasque is not running ---"
+msgstr "--- Tasque не запушчаны ---"
+
+#: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
+msgid "_Underline"
+msgstr "_Падкрэсліць"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
+msgid "_URL:"
+msgstr "URL-_адрас:"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
+msgid "URL, username, or password field is empty."
+msgstr "Графа URL-адрасу, імя карыстальніка ці пароля пустая."
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
+msgid ""
+"There was an error connecting to the server.  This may be caused by using an "
+"incorrect user name and/or password."
+msgstr ""
+"Пры злучэнні з серверам узнікла памылка. Магчыма, прычынай гэтага з'яўляецца "
+"памылковая імя карыстальніка ці пароль."
+
+#. TODO: If the above fails (no keyring daemon), save all but password
+#. to GConf, and notify user.
+#. 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:268
+msgid ""
+"Saving configuration to the GNOME keyring failed with the following message:"
+msgstr "Не ўдалося захаваць настройкі ў вязцы ключоў GNOME:"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
+msgid "Connect to Server"
+msgstr "Злучыцца з серверам"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
+msgid "Connected"
+msgstr "Злучана"
+
+#. Translators: The web service supporting Tomboy WebSync is not responding as expected
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
+msgid "Server not responding. Try again later."
+msgstr "Сервер не адказвае на запыты. Паўтарыце спробу пазней."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
+msgid "Authorization Failed, Try Again"
+msgstr "Няўдалае ўпаўнаважанне, паўтарыце спробу пазней"
+
+#. Translators: Title of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
+msgid "Tomboy Web Authorization Successful"
+msgstr "Паспяховае сеціўнае ўпаўнаважанне Tomboy"
+
+#. Translators: Body of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
+msgid ""
+"Please return to the Tomboy Preferences window and press Save to start "
+"synchronizing."
+msgstr ""
+"Вярніцеся да акна настроек Tomboy і націсніце кнопку \"Захаваць\", каб "
+"пачаць сінхранізацыю."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
+msgid "Connected. Press Save to start synchronizing"
+msgstr ""
+"Злучэнне ўсталявана. Націсніце кнопку \"Захаваць\", каб пачаць сінхранізацыю"
+
+#. Translators: The user must take action in their web browser to continue the authorization process
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
+msgid "Authorizing in browser (Press to reset connection)"
+msgstr ""
+"Упаўнаважанне ў сеціўным аглядальніку (націсніце, каб скінуць злучэнне)"
+
+#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
+msgid "Set the default browser and try again"
+msgstr "Прызначце прадвызначаны сеціўны аглядальнік і паўтарыце спробу"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Сеціўны Tomboy"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Экспартаваць усе нататкі ў {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Пачаць экспартаванне нататак у {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Экспартаваць вылучаны блакнот у {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Пачаць экспартаванне блакнота ў {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "Пры_лады"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Экспартаваць"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Экспартаванне нататак."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Экспартаваць усе нататкі ў {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Экспартаваць вылучаны блакнот у {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Экспартаванне ўсіх нататак {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Не ўдалося экспартаваць нататкі, адмоўлена ў доступе."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Не ўдалося экспартаваць нататкі, папка не існуе."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Не ўдалося экспартаваць нататкі: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Невядомая памылка."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Адасобленыя нататкі"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Вашы нататкі былі экспартаваныя ў \"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Нататкі паспяхова экспартаваныя"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Не ўдалося захаваць файлы ў \"{0}\""
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Стварыць мэтавую папку для экспартавання {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
+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:106
+msgid "Create New Note"
+msgstr "Стварыць новую нататку"
+
+#: ../Tomboy/JumpListManager.cs:136
+#, csharp-format
+msgid "{0} (new)"
+msgstr "{0} (новая нататка)"
+
+#: ../Tomboy/JumpListManager.cs:158
+msgid "Recent Notes"
+msgstr "Нядаўнія нататкі"
+
+#. Translators: This is the name of "Window" menu in the Mac menubar
+#: ../Tomboy/MacApplication.cs:215
+msgid "_Window"
+msgstr "_Акно"
+
+#: ../Tomboy/MacApplication.cs:234
+msgid "Preferences..."
+msgstr "Настройкі..."
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:24
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
+msgid "Create a new notebook"
+msgstr "Стварыць новы блакнот"
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:25
+msgid "Type the name of the notebook you'd like to create."
+msgstr "Упішыце назву блакнота, які трэба стварыць."
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:31
+msgid "N_otebook name:"
+msgstr "_Назва блакнота:"
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:45
+msgid "Name already taken"
+msgstr "Назва ўжо занятая"
+
+#. Translation note: This is the Create button in the Create
+#. New Note Dialog.
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:59
+msgid "C_reate"
+msgstr "_Стварыць"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
+msgid "Note_books"
+msgstr "_Блакноты"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:69
+msgid "Create a new note in a notebook"
+msgstr "Стварыць новую нататку ў блакноце"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:52
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:223
+msgid "New Note_book..."
+msgstr "Новы _блакнот..."
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:56
+msgid "_New Note"
+msgstr "_Новая нататка"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:57
+msgid "Create a new note in this notebook"
+msgstr "Стварыць новую нататку ў гэтым блакноце"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:60
+msgid "_Open Template Note"
+msgstr "_Адкрыць шаблонную нататку"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:61
+msgid "Open this notebook's template note"
+msgstr "Адкрыць шаблонную нататку гэтага блакнота"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:64
+msgid "Delete Note_book"
+msgstr "Выдаліць _блакнот"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:65
+msgid "Delete the selected notebook"
+msgstr "Выдаліць вылучаны блакнот"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
+#: ../Tomboy/RecentChanges.cs:276
+msgid "Notebooks"
+msgstr "Блакноты"
+
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Шаблон блакнота {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Новая нататка"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Усе нататкі"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
+msgid "Really delete this notebook?"
+msgstr "Ці вы насамрэч хочаце выдаліць гэты блакнот?"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
+msgid ""
+"The notes that belong to this notebook will not be deleted, but they will no "
+"longer be associated with this notebook.  This action cannot be undone."
+msgstr ""
+"Нататкі з гэтага блакнота не будуць выдалены, але яны страцяць сувязь з ім. "
+"Гэта дзеянне незваротнае."
+
+#: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
+msgid "No notebook"
+msgstr "Без блакнота"
+
+#. Translators should preserve the "{0}" in the following
+#. string.  After being formatted for a notebook named,
+#. "Meetings", for example, the resultant string would be:
+#. New "Meetings" Note
+#: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
+#, csharp-format
+msgid "New \"{0}\" Note"
+msgstr "Новая нататка \"{0}\""
+
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
+msgid "Place this note into a notebook"
+msgstr "Змясціць гэту нататку ў блакноце"
+
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
+msgid "Notebook"
+msgstr "Блакнот"
+
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
+msgid "_New notebook..."
+msgstr "_Новы блакнот..."
+
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Новая нататка {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Ці вы насамрэч хочаце выдаліць \"{0}\"?"
+
+#: ../Tomboy/Note.cs:1610
+#, csharp-format
+msgid "Really delete this {0} note?"
+msgid_plural "Really delete these {0} notes?"
+msgstr[0] "Ці вы насамрэч хочаце выдаліць {0} нататку?"
+msgstr[1] "Ці вы насамрэч хочаце выдаліць {0} нататкі?"
+msgstr[2] "Ці вы насамрэч хочаце выдаліць {0} нататак?"
+
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
-msgstr "Выдаленьне цыдулкі зьнішчае яе назаўжды."
+msgstr "Выдаленне нататкі прывядзе да яе незваротнай страты."
+
+#: ../Tomboy/Note.cs:1655
+#, 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 {1}."
+msgstr ""
+"Пры захаванні нататкі ўзнікла памылка. Праверце наяўнасць дастатковай "
+"колькасці вольнай дыскавай прасторы і патрэбных дазволаў на {0}. Падрабязныя "
+"звесткі аб памылцы можна знайсці ў {1}."
+
+#: ../Tomboy/Note.cs:1671
+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:257
+msgid "New Note Template"
+msgstr "Шаблон новай нататкі"
+
+#. Create migration notification note
+#. Translators: The title of the data migration note
+#: ../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: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 ""
 
-#: ../Tomboy/NoteManager.cs:144
+#: ../Tomboy/NoteManager.cs:265
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -358,665 +1332,1062 @@ msgid ""
 "\n"
 "Use this \"Start Here\" note to begin organizing your ideas and thoughts.\n"
 "\n"
-"You can create new notes to hold your ideas by selecting the \"Create New Note\" item from the Tomboy Notes menu in your GNOME Panel. Your note will be saved automatically.\n"
+"You can create new notes to hold your ideas by selecting the \"Create New "
+"Note\" item from the Tomboy Notes menu in your GNOME Panel. Your note will "
+"be saved automatically.\n"
 "\n"
-"Then organize the notes you create by linking related notes and ideas together!\n"
+"Then organize the notes you create by linking related notes and ideas "
+"together!\n"
 "\n"
-"We've created a note called <link:internal>Using Links in Tomboy</link:internal>.  Notice how each time we type <link:internal>Using Links in Tomboy</link:internal> it automatically gets underlined?  Click on the link to open the note.</note-content>"
+"We've created a note called <link:internal>Using Links in Tomboy</link:"
+"internal>.  Notice how each time we type <link:internal>Using Links in "
+"Tomboy</link:internal> it automatically gets underlined?  Click on the link "
+"to open the note.</note-content>"
 msgstr ""
 
-#: ../Tomboy/NoteManager.cs:163
+#: ../Tomboy/NoteManager.cs:284
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
-"Notes in Tomboy can be linked together by highlighting text in the current note and clicking the <bold>Link</bold> button above in the toolbar.  Doing so will create a new note and also underline the note's title in the current note.\n"
+"Notes in Tomboy can be linked together by highlighting text in the current "
+"note and clicking the <bold>Link</bold> button above in the toolbar.  Doing "
+"so will create a new note and also underline the note's title in the current "
+"note.\n"
 "\n"
-"Changing the title of a note will update links present in other notes.  This prevents broken links from occurring when a note is renamed.\n"
+"Changing the title of a note will update links present in other notes.  This "
+"prevents broken links from occurring when a note is renamed.\n"
 "\n"
-"Also, if you type the name of another note in your current note, it will automatically be linked for you.</note-content>"
+"Also, if you type the name of another note in your current note, it will "
+"automatically be linked for you.</note-content>"
 msgstr ""
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:178
-#: ../Tomboy/NoteManager.cs:229
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "У пачатак"
 
-#: ../Tomboy/NoteManager.cs:183
+#: ../Tomboy/NoteManager.cs:304
 msgid "Using Links in Tomboy"
-msgstr "Зьвязкі Tomboy"
+msgstr "Як карыстацца спасылкамі Tomboy"
 
-#: ../Tomboy/NoteManager.cs:284
+#. Use a simple "Describe..." body and highlight
+#. it so it can be easily overwritten
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
+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 "New Note {0}"
-msgstr "Новая цыдулка {0}"
+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/NoteManager.cs:330
-msgid "Describe your new note here."
-msgstr "Апішыце гэтую цыдулку."
+#: ../Tomboy/NoteRenameDialog.cs:83
+msgid "Rename Links"
+msgstr "Дапасаваць спасылкі"
 
-#: ../Tomboy/NoteWindow.cs:233
+#: ../Tomboy/NoteRenameDialog.cs:95
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "Назва нататкі"
+
+#. Translators: This button causes all notes in the list to be selected
+#: ../Tomboy/NoteRenameDialog.cs:118
+msgid "Select All"
+msgstr "Вылучыць усё"
+
+#. Translators: This button causes all notes in the list to be unselected
+#: ../Tomboy/NoteRenameDialog.cs:127
+msgid "Select None"
+msgstr "Зняць вылучэнне з усяго"
+
+#: ../Tomboy/NoteRenameDialog.cs:144
+msgid "Ad_vanced"
+msgstr "_Адмыслова"
+
+#: ../Tomboy/NoteRenameDialog.cs:147
+msgid "Always show this _window"
+msgstr "Заўсёды паказваць гэта _акно"
+
+#: ../Tomboy/NoteRenameDialog.cs:155
+msgid "Never rename _links"
+msgstr "_Ніколі не дапасоўваць спасылкі"
+
+#: ../Tomboy/NoteRenameDialog.cs:163
+msgid "Alwa_ys rename links"
+msgstr "_Заўсёды дапасоўваць спасылкі"
+
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
-msgstr "Шукаць у гэтай цыдулцы"
+msgstr "Пошук у гэтай нататцы"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
-msgstr "_Зьвязаць з новай цыдулкай"
+msgstr "_Спаслацца на новую нататку"
 
-#: ../Tomboy/NoteWindow.cs:504
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
-msgstr "Тэ_кст"
+msgstr "_Тэкст"
 
-#: ../Tomboy/NoteWindow.cs:512
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
-msgstr "_Шукаць у гэтай цыдулцы"
+msgstr "_Пошук у гэтай нататцы"
 
-#: ../Tomboy/NoteWindow.cs:527
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
-msgstr "_Закрыць усе цыдулкі"
+msgstr "_Закрыць усе нататкі"
 
-#: ../Tomboy/NoteWindow.cs:565
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Пошук"
 
-#: ../Tomboy/NoteWindow.cs:566
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Пошук у цыдулках (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Пошук у нататках"
 
-#: ../Tomboy/NoteWindow.cs:579
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
-msgstr "Зьвязаць"
+msgstr "Спасылка"
 
-#: ../Tomboy/NoteWindow.cs:581
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Зьвязаць вылучаны тэкст з новай цыдулкай (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Звязаць спасылкай вылучаны тэкст з новай нататкай"
 
-#: ../Tomboy/NoteWindow.cs:595
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Тэкст"
 
-#: ../Tomboy/NoteWindow.cs:600
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
-msgstr "Выставіць уласьцівасьці тэксту"
+msgstr "Настройка ўласцівасцяў тэксту"
 
-#: ../Tomboy/NoteWindow.cs:606
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
-msgstr "_Начыньне"
+msgstr "Пры_лады"
 
-#: ../Tomboy/NoteWindow.cs:610
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
-msgstr "Ужыць начыньне"
-
-#: ../Tomboy/NoteWindow.cs:617
-msgid "Delete"
-msgstr "Выдаліць"
+msgstr "Ужыць прылады да гэтай нататкі"
 
-#: ../Tomboy/NoteWindow.cs:618
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
-msgstr "Выдаліць гэтую цыдулку"
+msgstr "Выдаліць гэту нататку"
+
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
+msgid "Synchronize Notes"
+msgstr "Сінхранізаваць нататкі"
+
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Гэта шаблонная нататка. Яна вызначае прадвызначанае змесціва звычайных "
+"нататак і не паказваецца ў меню і акне пошуку."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Пераўтварыць у звычайную нататку"
 
-#: ../Tomboy/NoteWindow.cs:675
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "_Захаваць памер"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Захаваць _вылучанае"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Захаваць за_галовак"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Шукаць..."
 
-#: ../Tomboy/NoteWindow.cs:686
-#: ../Tomboy/NoteWindow.cs:888
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
-msgstr "Шукаць _далей"
+msgstr "_Шукаць далей"
 
-#: ../Tomboy/NoteWindow.cs:699
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
-msgstr "Шукаць _раней"
+msgstr "Шу_каць раней"
 
-#: ../Tomboy/NoteWindow.cs:787
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
-msgstr "Немагчыма стварыць цыдулку"
+msgstr "Не ўдалося стварыць нататку"
 
-#: ../Tomboy/NoteWindow.cs:868
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Шукаць:"
 
-#: ../Tomboy/NoteWindow.cs:879
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
-msgstr "_Папярэдні"
+msgstr "На_зад"
 
-#: ../Tomboy/NoteWindow.cs:898
-msgid "Case _sensitive"
-msgstr "З _улікам рэгістру"
+#: ../Tomboy/NoteWindow.cs:852
+msgid "_Next"
+msgstr "На_перад"
 
-#: ../Tomboy/NoteWindow.cs:1374
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
-msgstr "_Тлусты"
+msgstr "_Тоўсты шрыфт"
 
-#: ../Tomboy/NoteWindow.cs:1386
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
-msgstr "_Нахілены"
+msgstr "_Курсіўны шрыфт"
 
-#: ../Tomboy/NoteWindow.cs:1398
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
-msgstr "_Закрэсьлены"
+msgstr "_Закрэсліванне"
 
-#: ../Tomboy/NoteWindow.cs:1410
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
-msgstr "_Фарбаваны"
+msgstr "_Падсветка"
 
-#: ../Tomboy/NoteWindow.cs:1423
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
-msgstr "Памер шрыфта"
+msgstr "Памер шрыфту"
 
-#: ../Tomboy/NoteWindow.cs:1426
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
-msgstr "_Звычайны"
+msgstr "_Звычайны шрыфт"
 
-#: ../Tomboy/NoteWindow.cs:1433
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
-msgstr "_Вялізны"
+msgstr "_Вялізны шрыфт"
 
-#: ../Tomboy/NoteWindow.cs:1441
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
-msgstr "В_ялікі"
+msgstr "В_ялікі шрыфт"
 
-#: ../Tomboy/NoteWindow.cs:1449
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
-msgstr "_Малы"
-
-#: ../Tomboy/NoteWindow.cs:1460
-msgid "Bullets"
-msgstr "Сьпіс"
+msgstr "_Малы шрыфт"
 
-#: ../Tomboy/PluginManager.cs:60
-msgid "Tomboy Project"
-msgstr "Праект Tomboy"
+#: ../Tomboy/NoteWindow.cs:1429
+msgid "Increase Font Size"
+msgstr "Павялічыць памер шрыфту"
 
-#: ../Tomboy/PluginManager.cs:607
-#, csharp-format
-msgid "Cannot fully disable {0}."
-msgstr "Немагчыма цалкам адключыць {0}."
+#: ../Tomboy/NoteWindow.cs:1447
+msgid "Decrease Font Size"
+msgstr "Зменшыць памер шрыфту"
 
-#: ../Tomboy/PluginManager.cs:610
-#, csharp-format
-msgid ""
-"Cannot fully disable {0} as there still are at least {1} reference to this plugin. This indicates a programming error. Contact the plugin's author and report this problem.\n"
-"\n"
-"<b>Developer Information:</b> This problem usually occurs when the plugin's Dispose method fails to disconnect all event handlers. The heap-shot profiler ({2}) can help to identify leaking references."
-msgstr ""
+#: ../Tomboy/NoteWindow.cs:1467
+msgid "Bullets"
+msgstr "Спіс"
 
-#: ../Tomboy/Preferences.cs:183
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Editing"
-msgstr "Рэдактар"
+msgstr "Рэдагаванне"
 
-#: ../Tomboy/Preferences.cs:185
+#: ../Tomboy/PreferencesDialog.cs:84
 msgid "Hotkeys"
-msgstr "Клявішныя скароты"
+msgstr "Гарачыя клавішы"
+
+#: ../Tomboy/PreferencesDialog.cs:86
+msgid "Synchronization"
+msgstr "Сінхранізацыя"
 
-#: ../Tomboy/Preferences.cs:187
-msgid "Plugins"
-msgstr "Плагіны"
+#: ../Tomboy/PreferencesDialog.cs:88
+msgid "Add-ins"
+msgstr "Дадаткі"
 
-#: ../Tomboy/Preferences.cs:229
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
-msgstr "_Спраўджваць правапіс, уводзячы тэкст"
+msgstr "Правяраць _арфаграфію падчас пісання"
 
-#: ../Tomboy/Preferences.cs:238
-msgid "Misspellings will be underlined in red, with correct spelling suggestions shown in the context menu."
-msgstr "Няправільныя словы будуць падкрэсьленыя чырвонай рысай, а ў кантэкставым мэню будуць зьмешчаныя варыянты правільнага напісаньня."
+#: ../Tomboy/PreferencesDialog.cs:183
+msgid ""
+"Misspellings will be underlined in red, with correct spelling suggestions "
+"shown in the context menu."
+msgstr ""
+"Памылкова напісаныя словы будуць падкрэсленыя чырвонай рысай, а ў "
+"кантэкставым меню будуць даступныя прапановы правільнага напісання."
 
 #. WikiWords...
-#: ../Tomboy/Preferences.cs:248
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
-msgstr "Фарбаваць _WikiWords"
+msgstr "_Падсветка WikiWords"
+
+#: ../Tomboy/PreferencesDialog.cs:202
+msgid ""
+"Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
+"word will create a note with that name."
+msgstr ""
+"Падсвечваць <b>ГэтакЗапісаныяСловы</b>. Пстрычка ў такое слова будзе "
+"ствараць новую нататку з адпаведнай назвай."
 
-#: ../Tomboy/Preferences.cs:256
-msgid "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the word will create a note with that name."
-msgstr "Падсьвятляць <b>ВосьТакіяСловы</b>. Пстрыкнуўшы па такім слове, Вы створыце цыдулку."
+#. Auto bulleted list
+#: ../Tomboy/PreferencesDialog.cs:209
+msgid "Enable auto-_bulleted lists"
+msgstr "Уключыць _аўтаматычныя спісы"
 
-#. Custom font...
-#: ../Tomboy/Preferences.cs:265
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
-msgstr "Адмысловы _шрыфт"
+msgstr "Ужыць уласны _шрыфт"
+
+#: ../Tomboy/PreferencesDialog.cs:236
+msgid "When renaming a linked note: "
+msgstr "Пры пераназыванні нататкі, на якую ёсць спасылкі: "
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Ask me what to do"
+msgstr "Пытацца ў мяне аб патрэбным дзеянні"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Never rename links"
+msgstr "Ніколі не дапасоўваць спасылкі"
+
+#: ../Tomboy/PreferencesDialog.cs:241
+msgid "Always rename links"
+msgstr "Заўсёды дапасоўваць спасылкі"
+
+#: ../Tomboy/PreferencesDialog.cs:261
+msgid ""
+"Use the new note template to specify the text that should be used when "
+"creating a new note."
+msgstr ""
+"Выкарыстайце новую шаблонную нататку, каб вызначыць прадвызначаны тэкст для "
+"новых нататак."
+
+#: ../Tomboy/PreferencesDialog.cs:270
+msgid "Open New Note Template"
+msgstr "Адкрыць новую шаблонную нататку"
 
 #. Hotkeys...
-#: ../Tomboy/Preferences.cs:335
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
-msgstr "Назіраць за _скаротамі"
+msgstr "Сачыць за _гарачымі клавішамі"
 
-#: ../Tomboy/Preferences.cs:344
-msgid "Hotkeys allow you to quickly access your notes from anywhere with a keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
-msgstr "Скароты даюць магчымасьць хуткага доступу да Вашых цыдулак зь любой праграмы. Узоры скаротаў: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
+#: ../Tomboy/PreferencesDialog.cs:336
+msgid ""
+"Hotkeys allow you to quickly access your notes from anywhere with a "
+"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
+"Alt>N</b>"
+msgstr ""
+"Гарачыя клавішы даюць хуткі доступ да нататак з любой праграмы. Прыклады "
+"такіх клавіш: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/Preferences.cs:364
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
-msgstr "Паказаць _мэню цыдулак"
+msgstr "Паказаць _меню нататак"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/Preferences.cs:381
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
-msgstr "Адкрыць пачатковую цыдулку"
+msgstr "Адкрыць нататку \"_У пачатак\""
 
 #. Create new note keybinding...
-#: ../Tomboy/Preferences.cs:398
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
-msgstr "_Новая цыдулка"
+msgstr "_Стварыць новую нататку"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/Preferences.cs:415
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
-msgstr "Адкрыць \"Пошук ва ўсіх цыдулках\""
+msgstr "Адкрыць \"Пошук _ва ўсіх нататках\""
 
-#: ../Tomboy/Preferences.cs:561
-msgid "Not available"
-msgstr "Няма"
+#: ../Tomboy/PreferencesDialog.cs:434
+msgid "Ser_vice:"
+msgstr "_Паслуга:"
 
-#: ../Tomboy/Preferences.cs:619
-msgid "Description:"
-msgstr "Апісаньне:"
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
+msgid "Not configurable"
+msgstr "Няма настроек"
 
-#: ../Tomboy/Preferences.cs:621
-msgid "Written by:"
-msgstr "Аўтар:"
+#: ../Tomboy/PreferencesDialog.cs:513
+msgid "Automaticall_y Sync in Background Every"
+msgstr "_Аўтаматычна сінхранізаваць у фонавым рэжыме кожныя"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:519
+msgid "Minutes"
+msgstr "хвілін"
+
+#. "Advanced..." button to bring up extra sync config dialog
+#: ../Tomboy/PreferencesDialog.cs:541
+msgid "_Advanced..."
+msgstr "_Адмыслова..."
+
+#: ../Tomboy/PreferencesDialog.cs:602
+msgid "The following add-ins are installed"
+msgstr "Наступныя дадаткі ўсталяваныя ў сістэме"
+
+#: ../Tomboy/PreferencesDialog.cs:623
+msgid "Get More Add-Ins..."
+msgstr "Атрымаць больш дадаткаў..."
 
-#: ../Tomboy/Preferences.cs:623
-msgid "Web site:"
-msgstr "Сеціўная старонка:"
+#: ../Tomboy/PreferencesDialog.cs:641
+msgid "_Enable"
+msgstr "_Уключыць"
 
-#: ../Tomboy/Preferences.cs:625
-msgid "File name:"
-msgstr "Назва файла:"
+#: ../Tomboy/PreferencesDialog.cs:647
+msgid "_Disable"
+msgstr "_Выключыць"
 
-#: ../Tomboy/Preferences.cs:639
-msgid "Settings"
-msgstr "Настаўленьні"
+#: ../Tomboy/PreferencesDialog.cs:778
+msgid "Not Implemented"
+msgstr "Не мае праграмнай рэалізацыі"
 
-#: ../Tomboy/Preferences.cs:694
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
-msgid "{0} Settings"
-msgstr "{0} - Настаўленьні"
+msgid "{0} Preferences"
+msgstr "Настройкі {0}"
 
-#: ../Tomboy/Preferences.cs:755
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
-msgstr "Выберыце шрыфт цыдулкі"
+msgstr "Выбар шрыфту нататкі"
 
-#: ../Tomboy/RecentChanges.cs:64
-msgid "Search All Notes"
-msgstr "Шукаць ва ўсіх цыдулках"
+#: ../Tomboy/PreferencesDialog.cs:975
+msgid "Other Synchronization Options"
+msgstr "Іншыя опцыі сінхранізацыі"
 
-#: ../Tomboy/RecentChanges.cs:77
-msgid "_Search:"
-msgstr "_Пошук:"
+#: ../Tomboy/PreferencesDialog.cs:981
+msgid ""
+"When a conflict is detected between a local note and a note on the "
+"configured synchronization server:"
+msgstr ""
+"Пры выяўленні канфлікту паміж мясцовай версіяй нататкі і версіяй, змешчанай "
+"на сінхранізацыйным серверы:"
 
-#: ../Tomboy/RecentChanges.cs:98
-msgid "C_ase Sensitive"
-msgstr "З у_лікам рэгістру"
+#: ../Tomboy/PreferencesDialog.cs:988
+msgid "Always ask me what to do."
+msgstr "Заўсёды пытацца ў мяне аб патрэбным дзеянні."
 
-#: ../Tomboy/RecentChanges.cs:236
-msgid "Note"
-msgstr "Цыдулка"
+#: ../Tomboy/PreferencesDialog.cs:992
+msgid "Rename my local note."
+msgstr "Пераназваць мясцовую версію нататкі."
 
-#: ../Tomboy/RecentChanges.cs:255
-msgid "Last Changed"
-msgstr "Апошняя зьмена"
+#: ../Tomboy/PreferencesDialog.cs:996
+msgid "Replace my local note with the server's update."
+msgstr "Замяніць мясцовую версію нататкі серверным абнаўленнем."
 
-#: ../Tomboy/RecentChanges.cs:312
-#: ../Tomboy/RecentChanges.cs:468
-#, csharp-format
-msgid "Total: {0} note"
-msgid_plural "Total: {0} notes"
-msgstr[0] "Агулам: {0} цыдулка"
-msgstr[1] "Агулам: {0} цыдулкі"
-msgstr[2] "Агулам: {0} цыдулак"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Вы ўпэўнены?"
 
-#: ../Tomboy/RecentChanges.cs:402
-msgid "Matches"
-msgstr "Супадзеньні"
+#: ../Tomboy/PreferencesDialog.cs:1144
+msgid ""
+"Clearing your synchronization settings is not recommended.  You may be "
+"forced to synchronize all of your notes again when you save new settings."
+msgstr ""
+"Ачыстка настроек сінхранізацыі не рэкамендавана. Пры захаванні новых "
+"настроек вы будзеце вымушаны паўтарыць сінхранізацыю ўсіх нататак."
 
-#: ../Tomboy/RecentChanges.cs:454
-#: ../Tomboy/RecentChanges.cs:474
-#, csharp-format
-msgid "{0} match"
-msgid_plural "{0} matches"
-msgstr[0] "{0} адпаведнік"
-msgstr[1] "{0} адпаведнікі"
-msgstr[2] "{0} адпаведнікаў"
+#: ../Tomboy/PreferencesDialog.cs:1157
+msgid "Resetting Synchronization Settings"
+msgstr "Ануляванне настроек сінхранізацыі"
 
-#: ../Tomboy/RecentChanges.cs:724
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Сёньня, {0}"
+#: ../Tomboy/PreferencesDialog.cs:1159
+msgid ""
+"You have disabled the configured synchronization service.  Your "
+"synchronization settings will now be cleared.  You may be forced to "
+"synchronize all of your notes again when you save new settings."
+msgstr ""
+"Вы выключылі настроеную паслугу сінхранізацыі. Зараз будуць ачышчаны вашы "
+"настройкі сінхранізацыі. Пры захаванні новых настроек вы будзеце вымушаны "
+"паўтарыць сінхранізацыю ўсіх нататак."
 
-#: ../Tomboy/RecentChanges.cs:727
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Учора, {0}"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Злучэнне паспяхова ўсталявана"
+
+#: ../Tomboy/PreferencesDialog.cs:1239
+msgid ""
+"Tomboy is ready to synchronize your notes. Would you like to synchronize "
+"them now?"
+msgstr ""
+"Tomboy гатовы да сінхранізацыі вашых нататак. Ці трэба зараз жа іх "
+"сінхранізаваць?"
 
-#: ../Tomboy/RecentChanges.cs:731
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
-msgid "{0} days ago, {1}"
-msgstr "{0} дзён таму, {1}"
+msgid ""
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
+msgstr ""
+"Праверце звесткі і паўтарыце спробу. Журнальны файл {0} можа змяшчаць больш "
+"звестак аб памылцы."
 
-#: ../Tomboy/RecentChanges.cs:736
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d, h:mm tt"
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Памылка злучэння"
 
-#: ../Tomboy/RecentChanges.cs:738
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "MMMM d yyyy, h:mm tt"
+#: ../Tomboy/PreferencesDialog.cs:1357
+msgid "Version:"
+msgstr "Версія:"
 
-#: ../Tomboy/Tomboy.cs:181
-msgid "Cannot create new note"
-msgstr "Немагчыма стварыць цыдулку"
+#: ../Tomboy/PreferencesDialog.cs:1364
+msgid "Author:"
+msgstr "Аўтар:"
 
-#: ../Tomboy/Tomboy.cs:236
-msgid "translator-credits"
-msgstr "Ігар Грачышка"
+#: ../Tomboy/PreferencesDialog.cs:1371
+msgid "Copyright:"
+msgstr "Аўтарскія правы:"
 
-#: ../Tomboy/Tomboy.cs:245
-msgid "Copyright © 2004-2007 Alex Graveley"
-msgstr "Copyright © 2004-2007 Alex Graveley"
+#: ../Tomboy/PreferencesDialog.cs:1377
+msgid "Add-in Dependencies:"
+msgstr "Залежнасці дадатку:"
 
-#: ../Tomboy/Tomboy.cs:246
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Просты нататнік для працоўнага асяродзьдзя."
+#: ../Tomboy/RecentChanges.cs:100
+msgid "_Search:"
+msgstr "_Шукаць:"
 
-#: ../Tomboy/Tomboy.cs:249
-msgid "Homepage & Donations"
-msgstr "Старонка праекта, дапамога"
+#: ../Tomboy/RecentChanges.cs:350
+msgid "Note"
+msgstr "Нататка"
 
-#: ../Tomboy/Tomboy.cs:333
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
+#: ../Tomboy/RecentChanges.cs:373
+msgid "Last Changed"
 msgstr ""
-"Tomboy: Просты нататнік для працоўнага асяродзьдзя.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
 
-#: ../Tomboy/Tomboy.cs:345
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+#: ../Tomboy/RecentChanges.cs:512
+msgid "Matches"
 msgstr ""
-"Карыстаньне:\n"
-"  --version\t\t\tПаказаць зьвесткі аб вэрсіі.\n"
-"  --help\t\t\tПаказаць даведку па карыстаньні.\n"
-"  --note-path [тэчка]\t\tАдкрыць / захаваць цыдулкі з гэтай дырэкторыі.\n"
-"  --search [тэкст]\t\tАдкрыць вакно пошуку ва ўсіх цыдулках з адпаведным шаблёнам пошуку.\n"
 
-#: ../Tomboy/Tomboy.cs:356
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
 msgstr ""
-"  --new-note\t\t\tСтварыць цыдулку.\n"
-"  --new-note [title]\t\tСтварыць цыдулку з пэўным загалоўкам.\n"
-"  --open-note [title/url]\tПаказаць цыдулку з пэўным загалоўкам.\n"
-"  --start-here\t\t\tПаказаць пачатковую цыдулку.\n"
-"  --highlight-search [text]\tЗнайсьці і пафарбаваць тэкст у адкрытай цыдулцы.\n"
 
-#: ../Tomboy/Tomboy.cs:368
-msgid "  --check-plugin-unloading\tCheck if plugins are unloaded properly.\n"
-msgstr "  --check-plugin-unloading\tПраверыць карэктнасьць выгрузкі плагінаў.\n"
+#: ../Tomboy/RecentChanges.cs:566
+#, csharp-format
+msgid "{0} match"
+msgid_plural "{0} matches"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../Tomboy/Tomboy.cs:372
-msgid "D-BUS remote control disabled.\n"
-msgstr "Аддаленае кіраваньне D-BUS адключана.\n"
+#: ../Tomboy/RecentChanges.cs:580
+#, csharp-format
+msgid "Total: {0} note"
+msgid_plural "Total: {0} notes"
+msgstr[0] "Агулам: {0} нататка"
+msgstr[1] "Агулам: {0} нататкі"
+msgstr[2] "Агулам: {0} нататак"
 
-#: ../Tomboy/Tomboy.cs:380
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
-msgid "Version {0}"
-msgstr "Вэрсія {0}"
+msgid "Matches: {0} note"
+msgid_plural "Matches: {0} notes"
+msgstr[0] "Адпавядае: {0} нататка"
+msgstr[1] "Адпавядаюць: {0} нататкі"
+msgstr[2] "Адпавядаюць: {0} нататак"
+
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"У вылучаным блакноце нічога не знойдзена.\n"
+"Пстрыкніце сюды, каб выканаць пошук ва ўсіх нататках."
 
-#: ../Tomboy/Tomboy.cs:447
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Пстрыкніце сюды, каб выканаць пошук ва ўсіх нататках"
+
+#: ../Tomboy/RecentChanges.cs:775
+msgid "Notes"
+msgstr "Нататкі"
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
 #, csharp-format
 msgid ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
 msgstr ""
-"Tomboy: опцыя '{0}' не падтрымліваецца\n"
-"Выканайце 'tomboy --help', каб убачыць даведку па опцыях праграмы.\n"
-"Аддаленае кіраваньне D-BUS адключана."
+"Ваш камп'ютар не падтрымлівае гэтага дадатку для сінхранізацыі. Праверце "
+"карэктнасць усталёўкі і настройкі FUSE і {0}"
 
-#: ../Tomboy/Tray.cs:64
-msgid " (new)"
-msgstr " (новая)"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Не ўдалося прачытаць тэставы файл."
 
-#. initial newline
-#: ../Tomboy/Tray.cs:193
-msgid "dddd, MMMM d, h:mm tt"
-msgstr "dddd, MMMM d, h:mm tt"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Не ўдалося праверыць запіс."
 
-#: ../Tomboy/Utils.cs:119
-msgid "The \"Tomboy Notes Manual\" could not be found.  Please verify that your installation has been completed successfully."
-msgstr "Немагчыма знайсьці \"Падручнік Tomboy\".  Калі ласка, праверце правільнасьць усталёўкі праграмы."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Тэрмін чакання злучэння з серверам вычарпаны."
 
-#: ../Tomboy/Utils.cs:128
-msgid "Help not found"
-msgstr "Даведка ня знойдзена"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Памылка злучэння з серверам."
 
-#: ../Tomboy/Watchers.cs:137
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Бяз назвы {0})"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "Не ўдалося ўключыць FUSE."
 
-#: ../Tomboy/Watchers.cs:169
-#, csharp-format
-msgid "A note with the title <b>{0}</b> already exists. Please choose another name for this note before continuing."
-msgstr "Цыдулка з загалоўкам <b>{0}</b> ужо існуе. Калі ласка, выберыце іншую назву для цыдулкі."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Пры злучэнні з вызначаным серверам узнікла памылка:"
 
-#: ../Tomboy/Watchers.cs:181
-msgid "Note title taken"
-msgstr "Загаловак нататкі"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Падрабязнасці"
 
-#: ../Tomboy/Watchers.cs:422
-msgid "Cannot open location"
-msgstr "Немагчыма адкрыць мэтавую дырэкторыю"
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
+msgid "Status"
+msgstr "Стан"
 
-#: ../Tomboy/Watchers.cs:516
-msgid "_Copy Link Address"
-msgstr "С_капіяваць адрас зьвязка"
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
+msgid "Acquiring sync lock..."
+msgstr "Захоп сінхранізацыйнай блакіроўкі..."
 
-#: ../Tomboy/Watchers.cs:521
-msgid "_Open Link"
-msgstr "_Адкрыць зьвязак"
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
+msgid "Committing changes..."
+msgstr "Мацаванне змен..."
 
-#: ../Tomboy/Plugins/Backlinks.cs:79
-msgid "What links here?"
-msgstr "Якія цыдулкі зьвязаныя з гэтай?"
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
+msgid "Synchronizing Notes"
+msgstr "Сінхранізацыя нататак"
 
-#: ../Tomboy/Plugins/Backlinks.cs:137
-msgid "(none)"
-msgstr "(няма)"
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
+msgid "Synchronizing your notes..."
+msgstr "Сінхранізацыя вашых нататак..."
 
-#: ../Tomboy/Plugins/Bugzilla.cs:181
-msgid "Use the following:"
-msgstr "Выкарыстоўвай наступныя:"
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
+msgid "This may take a while, kick back and enjoy!"
+msgstr ""
+"Гэта працэдура можа зацягнуцца, разнявольцеся і атрымлівайце асалоду ад "
+"працэсу!"
 
-#: ../Tomboy/Plugins/Bugzilla.cs:197
-msgid "Host Name"
-msgstr "Вузел"
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
+msgid "Connecting to the server..."
+msgstr "Злучэнне з серверам..."
 
-#: ../Tomboy/Plugins/Bugzilla.cs:214
-msgid "Icon"
-msgstr "Значка"
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
+msgid "Deleting notes off of the server..."
+msgstr "Выдаленне нататак з сервера..."
 
-#: ../Tomboy/Plugins/Bugzilla.cs:337
-msgid "Select an icon..."
-msgstr "Выберы значку..."
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
+msgid "Downloading new/updated notes..."
+msgstr "Атрыманне новых/абноўленых нататак..."
 
-#. Extra Widget
-#: ../Tomboy/Plugins/Bugzilla.cs:352
-msgid "_Host name:"
-msgstr "_Вузел:"
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
+msgid "Server Locked"
+msgstr "Сервер заблакіраваны"
 
-#: ../Tomboy/Plugins/Bugzilla.cs:381
-msgid "No host name specified"
-msgstr "Вузел ня вызначаны"
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
+msgid "Server is locked"
+msgstr "Сервер заблакіраваны"
 
-#: ../Tomboy/Plugins/Bugzilla.cs:382
-msgid "You must specify the Bugzilla host name to use with this icon."
+#: ../Tomboy/Synchronization/SyncDialog.cs:270
+msgid ""
+"One of your other computers is currently synchronizing.  Please wait 2 "
+"minutes and try again."
 msgstr ""
+"Адзін з вашых камп'ютараў у гэты момант выконвае сінхранізацыю. Пачакайце "
+"пару хвілін і паўтарыце спробу."
 
-#: ../Tomboy/Plugins/Bugzilla.cs:408
-msgid "Error saving icon"
-msgstr "Памылка захаваньня значкі"
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
+msgid "Preparing to download updates from server..."
+msgstr "Падрыхтоўка да атрымання абнаўленняў з сервера..."
 
-#: ../Tomboy/Plugins/Bugzilla.cs:409
-msgid "Could not save the icon file.  "
-msgstr "Немагчыма захаваць файл значкі."
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
+msgid "Preparing to upload updates to server..."
+msgstr "Падрыхтоўка да публікацыі абнаўленняў на серверы..."
 
-#: ../Tomboy/Plugins/Bugzilla.cs:457
-msgid "Really remove this icon?"
-msgstr "Сапраўды хочаце выдаліць гэтую значку?"
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
+msgid "Uploading notes to server..."
+msgstr "Публікацыя нататак на серверы..."
 
-#: ../Tomboy/Plugins/Bugzilla.cs:458
-msgid "If you remove an icon it is permanently lost."
-msgstr "Выдаленне значкі зьнішчае яе назаўжды."
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
+msgid "Synchronization Failed"
+msgstr "Няўдалая сінхранізацыя"
 
-#: ../Tomboy/Plugins/Evolution.cs:265
-msgid "Cannot open email"
-msgstr "Немагчыма адкрыць ліст"
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
+msgid "Failed to synchronize"
+msgstr "Няўдалая сінхранізацыя"
 
-#: ../Tomboy/Plugins/ExportToHTML.cs:55
-msgid "Export to HTML"
-msgstr "Экспартаваць у HTML"
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
+msgid "Could not synchronize notes.  Check the details below and try again."
+msgstr ""
+"Не ўдалося сінхранізаваць нататкі. Праверце ніжэй пададзеную інфармацыю і "
+"паўтарыце спробу."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
+msgid "Synchronization Complete"
+msgstr "Сінхранізацыя скончана"
 
-#: ../Tomboy/Plugins/ExportToHTML.cs:114
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
+msgid "Synchronization is complete"
+msgstr "Сінхранізацыя скончана"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
-msgid "Your note was exported to \"{0}\"."
-msgstr "Цыдулка пасьпяхова экспартаваная ў \"{0}\"."
+msgid "{0} note updated."
+msgid_plural "{0} notes updated."
+msgstr[0] "Абноўлена: {0} нататка."
+msgstr[1] "Абноўлена: {0} нататкі."
+msgstr[2] "Абноўлена: {0} нататак."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
+msgid "Your notes are now up to date."
+msgstr "Вашы нататкі актуалізаваныя."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
+msgid "Synchronization Canceled"
+msgstr "Сінхранізацыя скасавана"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
+msgid "Synchronization was canceled"
+msgstr "Сінхранізацыя скасавана"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
+msgid "You canceled the synchronization.  You may close the window now."
+msgstr "Вы скасавалі сінхранізацыю. Цяпер можна закрыць гэта акно."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
+msgid "Synchronization Not Configured"
+msgstr "Сінхранізацыя не настроена"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
+msgid "Synchronization is not configured"
+msgstr "Сінхранізацыя не настроена"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
+msgid "Please configure synchronization in the preferences dialog."
+msgstr "Настройце сінхранізацыю ў дыялогавых акне настроек."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
+msgid "Synchronization Service Error"
+msgstr "Памылка паслугі сінхранізацыі"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
+msgid "Service error"
+msgstr "Памылка паслугі"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
+msgid "Error connecting to the synchronization service.  Please try again."
+msgstr "Памылка злучэння з паслугай сінхранізацыі. Паўтарыце спробу."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
+msgid "Deleted locally"
+msgstr "Выдалена на гэтым камп'ютары"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
+msgid "Deleted from server"
+msgstr "Выдалена на серверы"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
+msgid "Updated"
+msgstr "Абноўлена"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
+msgid "Added"
+msgstr "Дададзена"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
+msgid "Uploaded changes to server"
+msgstr "Змены апублікаваныя на серверы"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
+msgid "Uploaded new note to server"
+msgstr "Новая нататка апублікавана на серверы"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
+msgid "Note Conflict"
+msgstr "Канфлікт паміж версіямі нататак"
+
+#. Suggest renaming note by appending " (old)" to the existing title
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
+msgid " (old)"
+msgstr " (старая)"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
+msgid "Rename local note:"
+msgstr "Пераназваць мясцовую версію нататкі:"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
+msgid "Update links in referencing notes"
+msgstr "Абнавіць спасылкі з астатніх нататак"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
+msgid "Overwrite local note"
+msgstr "Перазапісаць мясцовую версію нататкі"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
+msgid "Always perform this action"
+msgstr "Заўсёды выконваць гэта дзеянне"
+
+#. Set initial dialog text
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
+msgid "Note conflict detected"
+msgstr "Апазнаны канфлікт версій нататак"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:565
+#, csharp-format
+msgid ""
+"The server version of \"{0}\" conflicts with your local note.  What do you "
+"want to do with your local note?"
+msgstr ""
+"Серверная версія нататкі \"{0}\" канфліктуе з мясцовай версіяй. Што вы "
+"хочаце зрабіць з мясцовай версіяй?"
 
-#: ../Tomboy/Plugins/ExportToHTML.cs:125
-msgid "Note exported successfully"
-msgstr "Цыдулка пасьпяхова экспартаваная"
+#: ../Tomboy/Synchronization/SyncUtils.cs:119
+#: ../Tomboy/Synchronization/SyncUtils.cs:163
+msgid "Could not enable FUSE"
+msgstr "Не ўдалося ўключыць FUSE"
 
-#: ../Tomboy/Plugins/ExportToHTML.cs:131
-msgid "Access denied."
-msgstr "Доступ забаронены."
+#: ../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."
+msgstr ""
+"Не ўдалося загрузіць модуль FUSE. Праверце карэктнасць яго ўсталёўкі і "
+"паўтарыце спробу."
 
-#: ../Tomboy/Plugins/ExportToHTML.cs:133
-msgid "Folder does not exist."
-msgstr "Тэчка не існуе."
+#: ../Tomboy/Synchronization/SyncUtils.cs:135
+msgid "Enable FUSE?"
+msgstr "Уключыць FUSE?"
 
-#: ../Tomboy/Plugins/ExportToHTML.cs:148
-#, csharp-format
-msgid "Could not save the file \"{0}\""
-msgstr "Немагчыма захаваць файл \"{0}\""
+#. TODO: This message isn't entirely accurate.
+#. We should fix it.
+#: ../Tomboy/Synchronization/SyncUtils.cs:139
+msgid ""
+"The synchronization you've chosen requires the FUSE module to be loaded.\n"
+"\n"
+"To avoid getting this prompt in the future, you should load FUSE at "
+"startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
+"etc/modules."
+msgstr ""
+"Выбраны вамі спосаб сінхранізацыі патрабуе загружанага модуля FUSE.\n"
+"\n"
+"Каб пазбегнуць паказу гэтага паведамлення ў будучыні, вам варта загружаць "
+"модуль FUSE пры запуску камп'ютара.  Дадайце \"modprobe fuse\" у файл /etc/"
+"init.d/boot.local або \"fuse\" у файл /etc/modules."
 
-#: ../Tomboy/Plugins/ExportToHTML.cs:267
-msgid "Destination for HTML Export"
-msgstr "Мэтавае месца экпартаваньня ў HTML"
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Не ўдалося стварыць новую нататку"
 
-#: ../Tomboy/Plugins/ExportToHTML.cs:277
-msgid "Export linked notes"
-msgstr "Экспартаваць зьвязаныя цыдулкі"
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Асноўная распрацоўка:"
 
-#: ../Tomboy/Plugins/ExportToHTML.cs:282
-msgid "Include all other linked notes"
-msgstr "Дадаць іншыя зьвязаныя цыдулкі"
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Удзельнікі праекта:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr "Ihar Hrachyshka <ihar.hrachyshka at gmail.com>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Аўтарскія правы © 2004-2007 Alex Graveley\n"
+"Аўтарскія правы © 2004-2011 Іншыя ўдзельнікі\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Зручны блакнот для працоўнага асяроддзя."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Хатняя старонка"
 
-#: ../Tomboy/Plugins/FixedWidth.cs:34
-msgid "_Fixed Width"
-msgstr "_Нязьменная шырыня"
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Зручны блакнот для працоўнага асяроддзя.\n"
+"Аўтарскія правы © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Аўтарскія правы © 2004-2011 Іншыя ўдзельнікі\n"
 
-#: ../Tomboy/Plugins/GalagoPresence.cs:235
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Правілы карыстання:\n"
+"  --version\t\t\tПаказаць нумар версіі праграмы.\n"
+"  --help\t\t\tПаказаць гэтыя правілы карыстання праграмай.\n"
+"  --note-path [сцежка]\t\tЗагружаць і захоўваць даныя нататак у гэтым "
+"каталогу.\n"
+"  --search [тэкст]\t\tАдкрыць акно пошуку ва ўсіх нататках з такім крытэрыем "
+"пошуку.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tСтварыць і паказаць новую нататку.\n"
+"  --new-note [назва]\t\tСтварыць і паказаць новую нататку з пэўнай назвай.\n"
+"  --open-note [назва/url]\tПаказаць існуючую нататку з пэўнай назвай.\n"
+"  --start-here\t\t\tПаказаць нататку \"У пачатак\".\n"
+"  --highlight-search [тэкст]\tЗнайсці і падсвяціць тэкст у адкрытай "
+"нататцы.\n"
+
+#: ../Tomboy/Tomboy.cs:592
 #, csharp-format
-msgid "Cannot contact '{0}'"
-msgstr "Немагчыма злучыцца з '{0}'"
+msgid "Version {0}"
+msgstr "Версія {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (новая нататка)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Аб Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"Не ўдалося адшукаць даведнік Tomboy. Праверце карэктнасць усталёўкі гэтай "
+"праграмы."
 
-#: ../Tomboy/Plugins/GalagoPresence.cs:238
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Даведнік не знойдзены"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Не ўдалося адкрыць месцапалажэнне"
+
+#: ../Tomboy/Utils.cs:236
 #, csharp-format
-msgid "Error running gaim-remote: {0}"
-msgstr "Памылка старту gaim-remote: {0}"
+msgid "Today, {0}"
+msgstr "Сёння, {0}"
 
-#: ../Tomboy/Plugins/NoteOfTheDay.cs:13
-msgid "Today: "
-msgstr "Сёньня: "
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Сёння"
 
-#: ../Tomboy/Plugins/NoteOfTheDay.cs:14
-msgid "Today: Template"
-msgstr "Сёньня: Шаблён"
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Учора, {0}"
 
-#. Format: "Today: Friday, July 01 2005"
-#: ../Tomboy/Plugins/NoteOfTheDay.cs:19
-msgid "dddd, MMMM d yyyy"
-msgstr "dddd, MMMM d yyyy"
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Учора"
 
-#: ../Tomboy/Plugins/NoteOfTheDay.cs:40
-msgid "Tasks"
-msgstr "Заданьні"
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} дзень таму, {1}"
+msgstr[1] "{0} дні таму, {1}"
+msgstr[2] "{0} дзён таму, {1}"
 
-#: ../Tomboy/Plugins/NoteOfTheDay.cs:41
-msgid "Appointments"
-msgstr "Сустрэчы"
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} дзень таму"
+msgstr[1] "{0} дні таму"
+msgstr[2] "{0} дзён таму"
 
-#: ../Tomboy/Plugins/StickyNoteImport.cs:52
-msgid "Import from Sticky Notes"
-msgstr "Імпартаваць зь Ліпучых нататак"
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Заўтра, {0}"
 
-#: ../Tomboy/Plugins/StickyNoteImport.cs:134
-msgid "No Sticky Notes found"
-msgstr "Ліпучыя нататкі ня знойдзеныя"
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Заўтра"
 
-#: ../Tomboy/Plugins/StickyNoteImport.cs:135
+#: ../Tomboy/Utils.cs:266
 #, csharp-format
-msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "Файл Ліпучых нататак ня знойдзены ў вызначаным месцы \"{0}\"."
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Праз {0} дзень, {1}"
+msgstr[1] "Праз {0} дні, {1}"
+msgstr[2] "Праз {0} дзён, {1}"
 
-#: ../Tomboy/Plugins/StickyNoteImport.cs:144
-msgid "Sticky Notes import completed"
-msgstr "Імпартаваньне Ліпучых нататак скончана"
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Праз {0} дзень"
+msgstr[1] "Праз {0} дні"
+msgstr[2] "Праз {0} дзён"
 
-#: ../Tomboy/Plugins/StickyNoteImport.cs:145
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, hh:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Без даты"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM, yyyy, hh:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> з <b>{1}</b> Ліпучых нататак пасьпяхова імпартаваныя."
+msgid "(Untitled {0})"
+msgstr "({0} без назвы)"
 
-#: ../Tomboy/Plugins/StickyNoteImport.cs:157
-msgid "Untitled"
-msgstr "Бяз назвы"
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr "Нататка з назвай <b>{0}</b> ужо існуе. Выберыце іншую назву для яе."
 
-#: ../Tomboy/Plugins/StickyNoteImport.cs:185
-msgid "Sticky Note: "
-msgstr "Ліпучая нататка: "
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Назва нататкі занятая"
 
-#~ msgid "Welcome to Tomboy!"
-#~ msgstr "Вітаем Вас!"
-#~ msgid ""
-#~ "Use this page as a Start Page for organizing your notes and keeping "
-#~ "unorganized ideas around."
-#~ msgstr "Пачніце стварэнне сваіх цыдулак з гэтай старонкі."
-#~ msgid "NotD: "
-#~ msgstr "Галоўная: "
-#~ msgid "Create Note of the Day"
-#~ msgstr "Стварыць цыдулку дня"
-#~ msgid "Quick and handy note-taker"
-#~ msgstr "Просты і хуткі нататнік"
-#~ msgid "_Search..."
-#~ msgstr "_Пошук..."
-#~ msgid "S_earch notes"
-#~ msgstr "_Пошук цыдулкі"
-#~ msgid "Table of Contents"
-#~ msgstr "Змест"
-#~ msgid ""
-#~ "<b>Table of Contents</b> lists all your notes.\n"
-#~ "Double click to open a note."
-#~ msgstr ""
-#~ "<b>Змест</b> утрымлівае усе Вашыя цыдулкі.\n"
-#~ "Падвоеная пстрычка адкрывае цыдулку."
-#~ msgid "Search Note"
-#~ msgstr "Шукаць у цыдулцы"
-#~ msgid "Search _Results"
-#~ msgstr "_Вынікі пошуку"
-#~ msgid "_Table of Contents"
-#~ msgstr "_Змест"
-#~ msgid "_Search Notes..."
-#~ msgstr "_Пошук у цыдулках..."
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Скапіраваць адрас спасылкі"
 
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Адкрыць спасылку"
diff --git a/po/bg.po b/po/bg.po
index f1e7de8..f2b32c8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,18 +1,20 @@
 # Bulgarian translation of tomboy po-file.
 # Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011Krasimir Chonov <mk2616 at abv.bg>.
 # This file is distributed under the same license as the tomboy package.
 # Rostislav Raykov <zbrox at i-space.org>, 2005.
 # Vladimir "Kaladan" Petkov <kaladan at gmail.com>, 2005, 2006, 2007, 2009.
 # Alexander Shopov <ash at kambanaria.org>, 2006, 2007, 2008, 2009, 2010, 2011.
+# Krasimir Chonov <mk2616 at abv.bg>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-12 21:48+0300\n"
-"PO-Revision-Date: 2011-08-12 21:48+0300\n"
-"Last-Translator: Alexander Shopov <ash at kambanaria.org>\n"
+"POT-Creation-Date: 2011-09-14 07:11+0300\n"
+"PO-Revision-Date: 2011-09-14 07:11+0300\n"
+"Last-Translator: Krasimir Chonov <mk2616 at abv.bg>\n"
 "Language-Team: Bulgarian <dict at fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -649,7 +651,7 @@ msgstr "_Изтриване"
 msgid "Delete the selected note"
 msgstr "Изтриване на избраната бележка"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Затваряне"
 
@@ -693,7 +695,7 @@ msgstr "Икона в областта за уведомяване"
 msgid "Create _New Note"
 msgstr "Създаване на _нова бележка"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "Т_ърсене из всички бележки"
 
@@ -779,7 +781,7 @@ msgstr "Ако изтриете икона, тя се губи завинаги.
 
 #: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
 msgid "Cannot open email"
-msgstr "Неуспех при отварянето на е-пощата"
+msgstr "Неуспешно отваряне на е-пощата"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
 msgid "HTML"
@@ -835,16 +837,16 @@ msgstr "_Път до папка:"
 msgid "Select Synchronization Folder..."
 msgstr "Избор на папка за синхронизация…"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Полето за път до папката е празно."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "Указаният път до папка не съществува, а Tomboy не успя да го създаде."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Локална папка"
 
@@ -855,7 +857,7 @@ msgstr "_Равноширок"
 #: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
 #, csharp-format
 msgid "Cannot contact '{0}'"
-msgstr "Неуспех при свързването с „{0}“"
+msgstr "Неуспешно свързване с „{0}“"
 
 #: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
 #, csharp-format
@@ -945,22 +947,22 @@ msgstr "Изтриване на счупените връзки"
 msgid "Add a sketch"
 msgstr "Добавяне на скица"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "_Сървър:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Име на потребител:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Път до папката (по избор):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -968,15 +970,15 @@ msgstr ""
 "Синхронизацията по SSH изисква на демона за SSH да се даде ключ за този "
 "потребител на този сървър."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Полето за сървър или потребителско име е празно."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
 msgid "SSH"
 msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -1037,23 +1039,23 @@ msgstr "--- Tasque не работи ---"
 msgid "_Underline"
 msgstr "_Подчертаване"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_Адрес:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Парола:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "Полето за адреса, потребителското име или паролата е празно."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1066,7 +1068,7 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
@@ -1074,7 +1076,7 @@ msgstr ""
 "следното съобщение:"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Свързване към сървър"
 
@@ -1083,23 +1085,23 @@ msgid "Connected"
 msgstr "Свързан"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Сървърът не отговаря. Пробвайте отново по-късно."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Неуспешна оторизация. Пробвайте отново"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Успешна оторизация през уеб"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1107,18 +1109,18 @@ msgstr ""
 "Върнете се в прозореца „Настройки на Tomboy“ и натиснете бутона „Запазване“, "
 "за да започне синхронизацията"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Успешна връзка. Натиснете „Запазване“, за да започне синхронизацията"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Оторизация чрез браузър (натиснете, за да преустановите връзката)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Задайте стандартен браузър и пробвайте отново"
 
@@ -1127,20 +1129,24 @@ msgid "Tomboy Web"
 msgstr "Уеб сайт на Tomboy"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "Изнасяне на всички бележки в "
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Изнасяне на всички бележки в {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "Изнасяне на всички бележки в "
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Изнасяне на всички бележки в {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "Изнасяне на избрания бележник в "
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Изнасяне на избрания бележник в {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Изнасяне на избрания бележник в "
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Изнасяне на бележник в {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:65
 #: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1156,12 +1162,19 @@ msgid "Export your notes."
 msgstr "Изнасяне на бележките ви."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "Изнасяне на всички бележки в "
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Изнасяне на всички бележки в {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "Изнасяне на избрания бележник в "
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Изнасяне на избрания бележник в {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Изнасяне на всички бележки в {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:193
 #: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -1185,7 +1198,7 @@ msgid "Unknown error."
 msgstr "Непозната грешка."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
 msgid "Unfiled Notes"
 msgstr "Некартотекирани"
 
@@ -1203,9 +1216,11 @@ msgstr "Бележките бяха успешно изнесени"
 msgid "Could not save the files in \"{0}\""
 msgstr "Файловете не могат да бъдат запазени в „{0}“"
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Създаване на целева папка за "
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Създаване на целева папка за изнасянето на {0}"
 
 #: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
@@ -1315,15 +1330,19 @@ msgstr "Бележници"
 msgid "{0} Notebook Template"
 msgstr "Шаблона бележка за {0}"
 
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Нова бележка"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
 msgid "All Notes"
 msgstr "Всички бележки"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Наистина ли да се изтрие този бележник?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1344,39 +1363,40 @@ msgstr "Няма бележници"
 msgid "New \"{0}\" Note"
 msgstr "Нова бележка за {0}"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Поставяне на бележката в бележник"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Бележник"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "Но_в бележник…"
 
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Нова бележка {0}"
 
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Наистина ли да се изтрие тази бележка?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Наистина ли да се изтрие тази {0} бележка?"
 
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Наистина ли да се изтрие тази {0} бележка?"
 msgstr[1] "Наистина ли да се изтрият тези {0} бележки?"
 
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Ако изтриете бележка, тя се губи завинаги."
 
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1387,7 +1407,7 @@ msgstr ""
 "достатъчно свободно място на диска и необходимите права за папката „{0}“. "
 "Подробностите за грешката са във файла „{1}“."
 
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Грешка при запазване на данните на бележка."
 
@@ -1529,7 +1549,7 @@ msgstr "Създаване на връзки в Tomboy"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Тук опишете новата бележка."
 
@@ -1593,140 +1613,164 @@ msgstr "Връзките да не се преименуват _никога"
 msgid "Alwa_ys rename links"
 msgstr "Връзките да се преименуват _винаги"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Търсене в тази бележка"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Връзка към нова бележка"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Т_екст"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Търсене в тази бележка"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Затваряне на вси_чки бележки"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Търсене"
 
 #. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
 msgid "Search your notes"
 msgstr "Търсене из бележките ви"
 
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Връзка"
 
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
 msgid "Link selected text to a new note"
 msgstr "Свързване на избрания текст към нова бележка"
 
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "Т_екст"
 
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Настройване свойствата на текста"
 
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Инструменти"
 
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Използване на инструменти в тази бележка"
 
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Изтриване на тази бележка"
 
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Синхронизация на бележките"
 
-#: ../Tomboy/NoteWindow.cs:564
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Това е шаблон на бележка. С нея се определя съдържанието на стандартните "
+"бележки и не можете да я намерите в менюто „Бележка“ или при търсене."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Преобразуване в стандартна бележка"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Запазване на ра_змера"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Запазване на избо_ра"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Запазване на и_мето"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Търсене…"
 
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "_Следващо"
 
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "_Предишно"
 
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Неуспешно създаване на бележка"
 
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Търсене:"
 
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Предишна поява"
 
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Следваща поява"
 
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Получерно"
 
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Курсивно"
 
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Зачеркнато"
 
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "О_цветяване"
 
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Размер на шрифта"
 
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Нормален"
 
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "Ог_ромен"
 
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Голям"
 
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Малък"
 
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Увеличаване на шрифта"
 
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Намаляване на шрифта"
 
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Поточкови списъци"
 
@@ -1971,19 +2015,19 @@ msgstr ""
 msgid "Error connecting"
 msgstr "Грешка при свързване"
 
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Версия:"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Автор:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Авторски права:"
 
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Зависимости на приставката:"
 
@@ -2317,7 +2361,7 @@ msgstr ""
 
 #: ../Tomboy/Tomboy.cs:251
 msgid "Cannot create new note"
-msgstr "Неуспех при създаването на нова бележка"
+msgstr "Неуспешно създаване на нова бележка"
 
 #: ../Tomboy/Tomboy.cs:317
 msgid "Primary Development:"
diff --git a/po/ca.po b/po/ca.po
index 01824bd..18acdb0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,6 +1,6 @@
 #
 # Copyright © 2004-2010 Jordi Mas i Hernàndez <jmas at softcatala.org>
-# Traducció del Tomboy al català 
+# Traducció del Tomboy al català
 #
 # Correccions Sílvia Miranda, Quico Llach, Gil Forcada, Jordi Serratosa
 #
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tomboy 1.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-25 11:36+0100\n"
-"PO-Revision-Date: 2011-04-05 22:55+0200\n"
-"Last-Translator: Jordi Mas <jmas at softcatala.org>\n"
+"POT-Creation-Date: 2011-09-19 14:57+0200\n"
+"PO-Revision-Date: 2011-09-15 23:16+0200\n"
+"Last-Translator: Pau Iranzo <pau.iranzo at softcatala.org>\n"
 "Language-Team: Catalan <tradgnome at softcatala.net>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
@@ -79,45 +79,52 @@ msgid "Custom Font Face"
 msgstr "Tipus de lletra personalitzat"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Determina la coordenada X de la finestra de cerca. Es desarà quan el Tomboy "
-"surti."
+"Determina la coordenada X de la finestra de «Cerca a totes les notes». Es "
+"desarà quan el Tomboy surti."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Determina la coordenada Y de la finestra de cerca. Es desarà quan el Tomboy "
-"surti."
+"Determina la coordenada Y de la finestra de «Cerca a totes les notes». Es "
+"desarà quan el Tomboy surti."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Determina l'altura (en píxels) de la finestra de cerca. Es desarà quan el "
-"Tomboy surti."
+"Determina l'altura (en píxels) de la finestra de «Cerca a totes les notes». "
+"Es desarà quan el Tomboy surti."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Determina l'amplada (en píxels) de la finestra de cerca. Es desarà quan el "
-"Tomboy surti."
+"Determina l'amplada (en píxels) de la finestra de «Cerca a totes les notes». "
+"Es desarà quan el Tomboy surti."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Habilita les llistes de pics automàtiques."
-
-#: ../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:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Habilita la icona de la safata"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Habilita el ressaltat WikiWord"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Habilita les llistes de pics automàtiques."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Habilita el tancament de les notes amb la tecla d'escapament."
@@ -176,21 +183,17 @@ msgid "HTML Export All Linked Notes"
 msgstr "Exportació HTML de totes les Notes enllaçades"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Darrer directori de l'exportació HTML"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Notes enllaçades HTML exportades"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Si és «False» (fals), no es mostrarà el diàleg de confirmació de supressió "
 "de notes."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -198,7 +201,7 @@ msgstr ""
 "Si enable_custom_font és cert, s'utilitzarà el tipus de lletra seleccionat "
 "aquí per mostrar les notes."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -206,13 +209,13 @@ msgstr ""
 "Si s'habilita, totes les notes obertes en sortir del Tomboy es tornaran a "
 "obrir automàticament en iniciar."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
 "Si s'habilita, es pot tancar una nota oberta si es prem la tecla "
 "d'escapament."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -222,7 +225,7 @@ msgstr ""
 "notificació. Pot ser útil inhabilitar-ho si alguna altra aplicació "
 "proporciona les funcions de la icona de la safata."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -230,7 +233,7 @@ msgstr ""
 "Si és cert, les errades ortogràfiques se subratllaran en vermell, i els "
 "suggeriments es mostraran al menú contextual."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -240,7 +243,7 @@ msgstr ""
 "establertes a /apps/tomboy/global_keybindings, permetent que les accions de "
 "Tomboy estiguin disponibles des de qualsevol aplicació."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -249,7 +252,7 @@ msgstr ""
 "a mostrar les notes. En cas contrari, s'utilitzarà el tipus de lletra per "
 "defecte."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -257,7 +260,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'iniciï el Tomboy."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -265,7 +268,7 @@ msgstr ""
 "Enter que determina el nombre mínim de notes a mostrar al menú de notes del "
 "Tomboy."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -277,7 +280,7 @@ msgstr ""
 "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:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -291,7 +294,7 @@ msgstr ""
 "quan hi hagi un conflicte, de manera que pugui gestionar cada situació de "
 "conflicte cas per cas."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -301,14 +304,18 @@ msgid ""
 "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 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 pregunti quan el "
-"canvi de nom d'una nota pugui 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."
+"Enter que determina si hi ha una preferència per 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 pregunti quan el canvi de nom d'una nota "
+"pugui 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:38
+msgid "Last Directory used in HTML Export"
+msgstr "Darrer directori utilitzat en l'exportació HTML"
 
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
@@ -354,7 +361,8 @@ msgstr "Obre Comenceu aquí"
 #: ../data/tomboy.schemas.in.h:48
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr ""
-"Camí del directori de sincronització del Tomboy al servidor de SSH (opcional)."
+"Camí del directori de sincronització del Tomboy al servidor de SSH "
+"(opcional)."
 
 #: ../data/tomboy.schemas.in.h:49
 msgid ""
@@ -381,20 +389,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "URL del servidor de la sincronització SSHFS"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Alçada desada de la finestra de cerca"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Alçada desada de la finestra de «Cerca a totes les notes»"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Posició horitzontal desada de la finestra de cerca"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Posició horitzontal desada de la finestra de «Cerca a totes les notes»"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Posició vertical desada de la finestra de cerca"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Posició vertical desada de la finestra de «Cerca a totes les notes»"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Amplada desada de la finestra de cerca"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Amplada desada de la finestra de «Cerca a totes les notes»"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -437,12 +445,11 @@ msgid ""
 "option to the special string \"disabled\", then there will be no keybinding "
 "for this action."
 msgstr ""
-"La vinculació global de tecles per crear i mostrar una nota nova. El "
-"format és similar a «<Control>a» o «<Maj><Alt>F1». "
-"L'analitzador és força flexible i permet minúscules i majúscules, i també "
-"abreviacions com ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a "
-"la cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-"acció."
+"La vinculació global de tecles per crear i mostrar una nota nova. El format "
+"és similar a «<Control>a» o «<Maj><Alt>F1». L'analitzador "
+"és força flexible i permet minúscules i majúscules, i també abreviacions com "
+"ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a la cadena especial "
+"«disabled», no hi haurà cap vinculació per a aquesta acció."
 
 #: ../data/tomboy.schemas.in.h:67
 msgid ""
@@ -453,12 +460,11 @@ msgid ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 msgstr ""
-"La vinculació global de tecles per obrir la nota «Comenceu aquí». El "
-"format és similar a «<Control>a» o «<Maj><Alt>F1». "
-"L'analitzador és força flexible i permet minúscules i majúscules, i també "
-"abreviacions com ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a "
-"la cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-"acció."
+"La vinculació global de tecles per obrir la nota «Comenceu aquí». El format "
+"és similar a «<Control>a» o «<Maj><Alt>F1». L'analitzador "
+"és força flexible i permet minúscules i majúscules, i també abreviacions com "
+"ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a la cadena especial "
+"«disabled», no hi haurà cap vinculació per a aquesta acció."
 
 #: ../data/tomboy.schemas.in.h:68
 msgid ""
@@ -485,12 +491,11 @@ msgid ""
 "option to the special string \"disabled\", then there will be no keybinding "
 "for this action."
 msgstr ""
-"La vinculació global de tecles per obrir el diàleg Canvis recents. El "
-"format és similar a «<Control>a» o «<Maj><Alt>F1». "
-"L'analitzador és força flexible i permet minúscules i majúscules, i també "
-"abreviacions com ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a "
-"la cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-"acció."
+"La vinculació global de tecles per obrir el diàleg Canvis recents. El format "
+"és similar a «<Control>a» o «<Maj><Alt>F1». L'analitzador "
+"és força flexible i permet minúscules i majúscules, i també abreviacions com "
+"ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a la cadena especial "
+"«disabled», no hi haurà cap vinculació per a aquesta acció."
 
 #: ../data/tomboy.schemas.in.h:70
 msgid ""
@@ -642,7 +647,7 @@ msgstr "_Suprimeix"
 msgid "Delete the selected note"
 msgstr "Suprimeix la nota seleccionada"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -686,7 +691,7 @@ msgstr "Safata del sistema"
 msgid "Create _New Note"
 msgstr "Crea una _nota nova"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "Ce_rca totes les notes"
 
@@ -698,11 +703,24 @@ msgstr "Obre la finestra Cerca totes les notes"
 msgid "Start synchronizing notes"
 msgstr "Inicia la sincronització de les notes"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avançat"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr ""
+"Nombre mínim de notes que es mostraran a la llista de recents (18 com a "
+"màxim)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Què enllaça aquí?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(cap)"
 
@@ -752,11 +770,31 @@ msgstr "No s'ha pogut desar el fitxer de la icona."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
-msgstr "Segur que voleu eliminar aquesta icona?"
+msgstr "Segur que voleu suprimir aquesta icona?"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
 msgid "If you remove an icon it is permanently lost."
-msgstr "Si elimineu una icona la perdreu definitivament."
+msgstr "Si suprimiu una icona la perdreu definitivament."
+
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "No es pot obrir el correu electrònic"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destinació per a l'exportació HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Exporta les notes enllaçades"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Inclou totes les altres notes enllaçades"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
@@ -772,10 +810,14 @@ msgid "Note exported successfully"
 msgstr "La nota s'ha exportat correctament"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "S'ha denegat l'accés."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "La carpeta no existeix."
 
@@ -784,22 +826,6 @@ msgstr "La carpeta no existeix."
 msgid "Could not save the file \"{0}\""
 msgstr "No s'ha pogut desar el fitxer «{0}»"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destinació per a l'exportació HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Exporta les notes enllaçades"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Inclou totes les altres notes enllaçades"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "No es pot obrir el correu electrònic"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Camí de la carpeta:"
@@ -808,18 +834,18 @@ msgstr "_Camí de la carpeta:"
 msgid "Select Synchronization Folder..."
 msgstr "Seleccioneu la carpeta de sincronització..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "El camp del camí de la carpeta és buit."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 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:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Carpeta local"
 
@@ -884,11 +910,11 @@ msgstr "Cites"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Canvieu la nota <span weight=\"bold\">Avui: plantilla</span> per a "
-"personalitzar el text de les notes d'Avui noves."
+"Canvieu la nota <b>Avui: plantilla</b> per personalitzar el text que tenen "
+"les notes d'Avui noves."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -915,26 +941,31 @@ msgstr "Pàgina {0} de {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd dd/MM/yyyy, hh:mm:ss"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Suprimeix els enllaços trencats"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Afegeix un esbós"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "S_ervidor:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "N_om d'usuari:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Camí de la carpeta (opcional):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -942,15 +973,15 @@ msgstr ""
 "La sincronització SSH necessita una clau SSH existent per a aquest servidor "
 "i usuari registrada al dimoni SSH en execució."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "El camp servidor o nom d'usuari és buit."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -977,14 +1008,18 @@ msgstr "S'ha completat la importació de les notes adhesives"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "S'han importat correctament <b>{0}</b> de <b>{1}</b> notes adhesives."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "S'ha importat correctament <b>{0}</b> de <b>{1}</b> nota adhesiva."
+msgstr[1] ""
+"S'han importat correctament <b>{0}</b> de <b>{1}</b> notes adhesives."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Sense títol"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Nota adhesiva: "
 
@@ -1011,23 +1046,23 @@ msgstr "--- El Tasque no s'està executant ---"
 msgid "_Underline"
 msgstr "_Subratllat"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "El camp URL, nom d'usuari o contrasenya és buit."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1040,19 +1075,15 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "S'ha produït l'error següent en desar la configuració a l'anell de claus del "
 "GNOME: "
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Web del Tomboy"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Connecta al servidor"
 
@@ -1061,23 +1092,23 @@ msgid "Connected"
 msgstr "S'ha connectat"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "El servidor no respon. Torneu-ho a provar més tard."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 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:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 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:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1085,24 +1116,121 @@ msgstr ""
 "Torneu a la finestra de preferències del Tomboy i premeu «Desa» per a "
 "iniciar la sincronització."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "S'ha connectat. Premeu «Desa» per iniciar la sincronització"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr ""
-"S'està autoritzant en el navegador (premeu per tornar a iniciar la "
-"connexió)"
+"S'està autoritzant en el navegador (premeu per 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:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Establiu el navegador predeterminat i torneu-ho a provar"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Web del Tomboy"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Exporta totes les notes a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Inicia l'exportació de notes a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Exporta el bloc de notes seleccionat a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Inicia l'exportació del bloc de notes a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "E_ines"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exporta"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Exporteu les vostres notes."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Exporta totes les notes a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Exporta el bloc de notes seleccionat a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Exporta totes les notes {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "No s'ha pogut exportar, accés denegat."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "No s'ha pogut exportar, la carpeta no existeix."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "No s'ha pogut exportar: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Error desconegut."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Notes no arxivades"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "S'han exportat les notes a «{0}»."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "S'han exportat les notes"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "No s'han pogut desar els fitxers a «{0}»"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Crea una carpeta de destinació per a l'exportació {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Cerca totes les notes"
 
@@ -1155,26 +1283,6 @@ msgstr "El nom ja és en ús"
 msgid "C_reate"
 msgstr "C_rea"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Plantilla del bloc de notes: {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Totes les notes"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Notes no arxivades"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "Blocs de n_otes"
@@ -1214,15 +1322,35 @@ msgid "Delete the selected notebook"
 msgstr "Suprimeix el bloc de notes seleccionat"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Blocs de notes"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Plantilla del bloc de notes: {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nota nova"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Totes les notes"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Segur que voleu suprimir aquest bloc de notes?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1243,35 +1371,41 @@ msgstr "Cap bloc de notes"
 msgid "New \"{0}\" Note"
 msgstr "Nota «{0}» nova"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Posa aquesta nota al bloc de notes"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Bloc de notes"
 
 #
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Bloc de notes nou..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Segur que voleu suprimir aquesta nota?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nota nova {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Segur que voleu suprimir «{0}»?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, 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:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Si suprimiu una nota la perdreu definitivament."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1283,13 +1417,13 @@ msgstr ""
 "detalls de l'error a {1}."
 
 #
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "S'ha produït un error en desar les dades de la nota."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Plantilla de nota nova"
 
@@ -1410,14 +1544,14 @@ msgstr ""
 "actual\n"
 "\n"
 "En canviar el títol de la nota s'actualitzaran els enllaços presents a "
-"altres notes, prevenint així que es trenquin els enllaços quan es reanomena "
-"una nota.\n"
+"altres notes, prevenint així que es trenquin els enllaços quan es canvia el "
+"nom d'una nota.\n"
 "\n"
 "Addicionalment, si teclegeu el nom d'una altra nota en la nota actual, "
 "s'enllaçarà automàticament.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Comenceu aquí"
 
@@ -1425,14 +1559,9 @@ msgstr "Comenceu aquí"
 msgid "Using Links in Tomboy"
 msgstr "Utilització dels enllaços al Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, 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:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Descriviu la vostra nota nova aquí."
 
@@ -1496,139 +1625,164 @@ msgstr "No canviïs mai els noms dels _enllaços"
 msgid "Alwa_ys rename links"
 msgstr "Canvia sempre els noms dels _enllaços"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Cerca en aquesta nota"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Enllaça a una nota nova"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_xt"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Cerca en aquesta nota"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Tanca tot_es les notes"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Cerca"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Cerca les vostres notes (Ctrl-Maj-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Cerqueu les vostres notes"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Enllaça"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Enllaça el text seleccionat a una nota nova (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Enllaça el text seleccionat a una nota nova"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Text"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Estableix les propietats del text"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "E_ines"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Usa les eines en aquesta nota"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Suprimeix aquesta nota"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Sincronitza les notes"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Aquesta nota és una plantilla de notes. Determina el contingut per defecte de les "
+"notes normals i no es mostrarà en el menú de notes ni a la finestra de cerca."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Converteix a una nota normal"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Desa la m_ida"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Desa la se_lecció"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Desa el _títol"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Cerca..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Cerca la s_egüent"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Cerca l'_anterior"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "No es pot crear una nota nova"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Cerca:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Següent"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Negreta"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Cursiva"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Barrat"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Ressaltat"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Mida de la lletra"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "_Molt gran"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Gran"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Petita"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Augmenta la mida de la lletra"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Redueix la mida de la lletra"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Pics"
 
@@ -1648,11 +1802,11 @@ msgstr "Sincronització"
 msgid "Add-ins"
 msgstr "Complements"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "_Verifica l'ortografia a mesura que escric"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1662,44 +1816,44 @@ msgstr ""
 
 # ViquiParaules ? (josep)
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "_Ressalta les WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
 msgstr ""
-"Habiliteu aquesta opció per ressaltar les paraules <b>ComAquesta</b>. En "
-"fer clic a la paraula es crearà una nota amb aquest nom."
+"Habiliteu aquesta opció per ressaltar les paraules <b>ComAquesta</b>. En fer "
+"clic a la paraula es crearà una nota amb aquest nom."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Habilita llistes de vinyetes automàtiques"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "_Usa el tipus de lletra personalitzat"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "En canviar el nom d'una nota enllaçada: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Demana'm què vull fer"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "No canviïs mai els noms dels enllaços"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Canvia sempre els noms dels enllaços"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1707,16 +1861,16 @@ msgstr ""
 "Utilitzeu la plantilla de nota nova per especificar el text que s'hauria "
 "d'utilitzar quan es creï una nota nova."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Obre la plantilla de nota nova"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Presta atenció a les _dreceres"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1727,82 +1881,82 @@ msgstr ""
 "Control><Maj>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Mo_stra el menú de les notes"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Obre «_Comenceu aquí»"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Crea una _nota nova"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Obr_e «Cerca totes les notes»"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Ser_vei:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "No és configurable"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 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
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "Minuts"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Avançat..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Els complements següents estan instal·lats"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Obté més complements..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Habilita"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Inhabilita"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Encara no està implementat"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Preferències"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Trieu el tipus de lletra de la nota"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Altres opcions de sincronització"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1810,23 +1964,23 @@ msgstr ""
 "Quan es detecta un conflicte entre una nota local i una nota al servidor de "
 "sincronització configurat:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Demana'm sempre que vull fer."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
-msgstr "Reanomena la nota local."
+msgstr "Canvia el nom de la nota local."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Reemplaça la nota local amb l'actualització del servidor."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "Avís: n'esteu segur?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "N'esteu segur?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1834,25 +1988,25 @@ msgstr ""
 "No es recomana netejar els paràmetres de sincronització. Potser us vegeu "
 "forçats a sincronitzar de nou totes les notes en desar els paràmetres nous."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "S'estan reiniciant els paràmetres de sincronització"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Heu inhabilitat el servei de sincronització configurat. Es netejaran els "
 "paràmetres de sincronització. Potser us vegeu forçats a sincronitzar de nou "
-"totes les notes en desar els paràmetres nous"
+"totes les notes en desar els paràmetres nous."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "S'ha establert la connexió"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "S'ha connectat"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1860,314 +2014,126 @@ msgstr ""
 "El Tomboy està preparat per sincronitzar les notes. Voleu sincronitzar-les "
 "ara?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"S'ha produït un error. Reviseu la informació i torneu-ho a provar. El fitxer "
-"{0} us pot ser útil."
+"Comproveu la vostra informació i proveu-ho de nou. El fitxer de registre {0} "
+"pot contenir més informació sobre l'error."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "S'ha produït un error en connectar: ("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "S'ha produït un error en connectar"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Versió:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Dependències del complement:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Cerca:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Nota"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Darrer canvi"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Coincidències"
 
 # csharp-format
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Coincidència de títol"
+
+# csharp-format
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} coincidència"
 msgstr[1] "{0} coincidències"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Total: {0} nota"
 msgstr[1] "Total: {0} notes"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, 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:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"No s'ha trobat cap resultat al bloc de notes seleccionat.\n"
+"Feu clic aquí per cercar a totes les notes."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Feu clic aquí per cercar a totes les notes"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Notes"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "No es pot crear una nota nova"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"L'ordinador no permet utilitzar aquest complement de sincronització. "
+"Assegureu-vos de tenir correctament instal·lats i configurats el FUSE i {0}"
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Desenvolupament principal:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "No s'ha pogut llegir el fitxer de prova."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Col·laboradors:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "El test d'escriptura ha fallat."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr "Jordi Mas i Hernàndez <jmas at softcatala.org>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Temps d'espera en connectar al servidor."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Altres\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "S'ha produït un error en connectar al servidor."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr ""
-"Una senzilla aplicació d'escriptori, fàcil d'usar, per prendre notes."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "No s'ha pogut habilitar el FUSE."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Pàgina inicial"
-
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: Una senzilla aplicació d'escriptori, fàcil d'usar, per prendre "
-"notes.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Forma d'ús:\n"
-"  --version\t\t\tMostra informació de la versió.\n"
-"  --help\t\t\tImprimeix aquest missatge.\n"
-"  --note-path [camí]\t\tCarrega/desa les dades de la nota en aquest "
-"directori\n"
-"  --search [text]\t\tObre la finestra de cerca totes les notes amb el text "
-"de la cerca.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tCrea i mostra una nota nova\n"
-"  --new-note [títol]\t\tCrea i mostra una nova nota amb títol\n"
-"  --open-note [títol/url]\tMostra la nota que coincideix amb el títol\n"
-"  --start-here\t\t\tMostra la nota «Comenceu aquí»\n"
-"  --highlight-search [text]\tCerca i ressalta el text a la nota oberta\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versió {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nova) "
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_Quant al Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"No s'ha pogut trobar el «manual de notes del Tomboy». Comproveu que la "
-"instal·lació s'ha realitzat correctament."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "No s'ha trobat l'ajuda"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "No es pot obrir la ubicació"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Avui, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Avui"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Ahir, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Ahir"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Fa {0} dia, {1}"
-msgstr[1] "Fa {0} dies, {1}"
-
-# csharp-format
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Fa {0} dia"
-msgstr[1] "Fa {0} dies"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Demà, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Demà"
-
-#: ../Tomboy/Utils.cs:266
-#, 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:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "En {0} dia"
-msgstr[1] "En {0} dies"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, H:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Sense data"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "MMMM d yyyy, H:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Sense títol {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Ja existeix una nota amb el títol <b>{0}</b>. Trieu un altre nom per a "
-"aquesta nota abans de continuar."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "El títol de la nota ja és en ús"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Copia l'adreça de l'enllaç"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Obre l'enllaç"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"L'ordinador no permet utilitzar aquest complement de sincronització. "
-"Assegureu-vos de tenir correctament instal·lats i configurats el FUSE i {0}"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "No s'ha pogut llegir el fitxer de prova."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "El test d'escriptura ha fallat."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Temps d'espera en connectar al servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "S'ha produït un error en connectar al servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "No s'ha pogut habilitar el FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "S'ha produït un error mentre es connectava al servidor:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+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:89
@@ -2344,7 +2310,7 @@ msgstr " (antiga)"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
-msgstr "Reanomena la nota local:"
+msgstr "Canvia el nom d'una nota local:"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
@@ -2372,10 +2338,6 @@ 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:161
-msgid "_Tools"
-msgstr "E_ines"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2410,6 +2372,232 @@ msgstr ""
 "l'inici. Afegiu «modprobe fuse» to /etc/init.d/boot.local or «fuse» to etc/"
 "modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "No es pot crear una nota nova"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Desenvolupament principal:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Col·laboradors:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr "Jordi Mas i Hernàndez <jmas at softcatala.org>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Altres\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Una senzilla aplicació d'escriptori, fàcil d'usar, per prendre notes."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Pàgina inicial"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Una senzilla aplicació d'escriptori, fàcil d'usar, per prendre "
+"notes.\n"
+"Copyright (C) 2004-2006 Alex Graveley\n"
+" <alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Altres\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Forma d'ús:\n"
+"  --version\t\t\tMostra informació de la versió.\n"
+"  --help\t\t\tImprimeix aquest missatge.\n"
+"  --note-path [camí]\t\tCarrega/desa les dades de la nota en aquest "
+"directori\n"
+"  --search [text]\t\tObre la finestra de cerca totes les notes amb el text "
+"de la cerca.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tCrea i mostra una nota nova\n"
+"  --new-note [títol]\t\tCrea i mostra una nova nota amb títol\n"
+"  --open-note [títol/url]\tMostra la nota que coincideix amb el títol\n"
+"  --start-here\t\t\tMostra la nota «Comenceu aquí»\n"
+"  --highlight-search [text]\tCerca i ressalta el text a la nota oberta\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versió {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nova) "
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Quant al Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"No s'ha pogut trobar el «manual de notes del Tomboy». Comproveu que la "
+"instal·lació s'ha realitzat correctament."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "No s'ha trobat l'ajuda"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "No es pot obrir la ubicació"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Avui, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Avui"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Ahir, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Ahir"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Fa {0} dia, {1}"
+msgstr[1] "Fa {0} dies, {1}"
+
+# csharp-format
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Fa {0} dia"
+msgstr[1] "Fa {0} dies"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Demà, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Demà"
+
+#: ../Tomboy/Utils.cs:266
+#, 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:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "En {0} dia"
+msgstr[1] "En {0} dies"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, H:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Sense data"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "MMMM d yyyy, H:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Sense títol {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Ja existeix una nota amb el títol <b>{0}</b>. Trieu un altre nom per a "
+"aquesta nota abans de continuar."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "El títol de la nota ja és en ús"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copia l'adreça de l'enllaç"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Obre l'enllaç"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Darrer directori de l'exportació HTML"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Segur que voleu suprimir aquesta nota?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Cerca les vostres notes (Ctrl-Maj-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "S'ha establert la connexió"
+
 #~ msgid "_Browse..."
 #~ msgstr "_Navega..."
 
diff --git a/po/ca at valencia.po b/po/ca at valencia.po
index 7f192c4..3083767 100644
--- a/po/ca at valencia.po
+++ b/po/ca at valencia.po
@@ -1,6 +1,6 @@
 #
 # Copyright © 2004-2010 Jordi Mas i Hernàndez <jmas at softcatala.org>
-# Traducció del Tomboy al català 
+# Traducció del Tomboy al català
 #
 # Correccions Sílvia Miranda, Quico Llach, Gil Forcada, Jordi Serratosa
 #
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tomboy 1.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-29 19:06+0200\n"
-"PO-Revision-Date: 2011-04-05 22:55+0200\n"
-"Last-Translator: Jordi Mas <jmas at softcatala.org>\n"
+"POT-Creation-Date: 2011-09-26 14:14+0200\n"
+"PO-Revision-Date: 2011-09-15 23:16+0200\n"
+"Last-Translator: Pau Iranzo <pau.iranzo at softcatala.org>\n"
 "Language-Team: Catalan <tradgnome at softcatala.net>\n"
-"Language: ca\n"
+"Language: ca-XV\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,56 +79,52 @@ msgid "Custom Font Face"
 msgstr "Tipus de lletra personalitzat"
 
 #: ../data/tomboy.schemas.in.h:5
-#, fuzzy
 msgid ""
 "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
 msgstr ""
-"Determina la coordenada X de la finestra de cerca. S'alçarà quan el Tomboy "
-"isca."
+"Determina la coordenada X de la finestra de «Cerca a totes les notes». Es "
+"desarà quan el Tomboy isca."
 
 #: ../data/tomboy.schemas.in.h:6
-#, fuzzy
 msgid ""
 "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
 msgstr ""
-"Determina la coordenada Y de la finestra de cerca. S'alçarà quan el Tomboy "
-"isca."
+"Determina la coordenada Y de la finestra de «Cerca a totes les notes». Es "
+"desarà quan el Tomboy isca."
 
 #: ../data/tomboy.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
 "exit."
 msgstr ""
-"Determina l'altura (en píxels) de la finestra de cerca. S'alçarà quan el "
-"Tomboy isca."
+"Determina l'altura (en píxels) de la finestra de «Cerca a totes les notes». "
+"S'alçarà quan el Tomboy isca."
 
 #: ../data/tomboy.schemas.in.h:8
-#, fuzzy
 msgid ""
 "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Determina l'amplada (en píxels) de la finestra de cerca. S'alçarà quan el "
-"Tomboy isca."
+"Determina l'amplada (en píxels) de la finestra de «Cerca a totes les notes». "
+"S'alçarà quan el Tomboy isca."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Habilita les llistes de pics automàtiques."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
-msgstr "Habilita la icona apega amb el botó central del ratolí."
+msgstr "Habilita la icona enganxa amb el botó central del ratolí."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Habilita la icona de la safata"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Habilita el ressaltat WikiWord"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Habilita les llistes de pics automàtiques."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Habilita el tancament de les notes amb la tecla d'escapament."
@@ -187,21 +183,17 @@ msgid "HTML Export All Linked Notes"
 msgstr "Exportació HTML de totes les Notes enllaçades"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Darrer directori de l'exportació HTML"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Notes enllaçades HTML exportades"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Si és «False» (fals), no es mostrarà el diàleg de confirmació de supressió "
 "de notes."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -209,7 +201,7 @@ msgstr ""
 "Si enable_custom_font és cert, s'utilitzarà el tipus de lletra seleccionat "
 "ací per mostrar les notes."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -217,13 +209,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:29
+#: ../data/tomboy.schemas.in.h:28
 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:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -233,7 +225,7 @@ msgstr ""
 "notificació. Pot ser útil inhabilitar-ho si alguna altra aplicació "
 "proporciona les funcions de la icona de la safata."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -241,7 +233,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:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -251,7 +243,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:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -260,7 +252,7 @@ msgstr ""
 "a mostrar les notes. En cas contrari, s'utilitzarà el tipus de lletra per "
 "defecte."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -268,7 +260,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:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -276,7 +268,7 @@ msgstr ""
 "Enter que determina el nombre mínim de notes a mostrar al menú de notes del "
 "Tomboy."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -288,7 +280,7 @@ msgstr ""
 "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:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -302,7 +294,7 @@ msgstr ""
 "quan hi haja un conflicte, de manera que puga gestionar cada situació de "
 "conflicte cas per cas."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -318,8 +310,12 @@ msgstr ""
 "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-s'amb el nou nom de nota, de manera que seguirà enllaçant a "
-"la nota a la qual s'ha canviat el nom."
+"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:38
+msgid "Last Directory used in HTML Export"
+msgstr "Darrer directori utilitzat en l'exportació HTML"
 
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
@@ -393,24 +389,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "URL del servidor de la sincronització SSHFS"
 
 #: ../data/tomboy.schemas.in.h:54
-#, fuzzy
 msgid "Saved height of \"Search All Notes\" window"
-msgstr "Alçada alçada de la finestra de cerca"
+msgstr "Alçada alçada de la finestra de «Cerca a totes les notes»"
 
 #: ../data/tomboy.schemas.in.h:55
-#, fuzzy
 msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr "Posició horitzontal alçada de la finestra de cerca"
+msgstr "Posició horitzontal alçada de la finestra de «Cerca a totes les notes»"
 
 #: ../data/tomboy.schemas.in.h:56
-#, fuzzy
 msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr "Posició vertical alçada de la finestra de cerca"
+msgstr "Posició vertical alçada de la finestra de «Cerca a totes les notes»"
 
 #: ../data/tomboy.schemas.in.h:57
-#, fuzzy
 msgid "Saved width of \"Search All Notes\" window"
-msgstr "Amplada alçada de la finestra de cerca"
+msgstr "Amplada alçada de la finestra de «Cerca a totes les notes»"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -567,7 +559,7 @@ 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-s'al servidor de sincronització a "
+"El port que s'utilitzarà en connectar-se al servidor de sincronització a "
 "través de SSH. Establiu-lo a -1 o menys si en lloc d'això s'han d'utilitzar "
 "els paràmetres predeterminats del port SSH."
 
@@ -615,8 +607,8 @@ msgstr ""
 #: ../data/tomboy.schemas.in.h:83
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr ""
-"Nom d'usuari que s'utilitzarà en connectar-s'al servidor de sincronització a "
-"través de SSH."
+"Nom d'usuari que s'utilitzarà en connectar-se al servidor de sincronització "
+"a través de SSH."
 
 #: ../data/tomboy.schemas.in.h:84
 msgid ""
@@ -654,7 +646,7 @@ msgstr "_Suprimeix"
 msgid "Delete the selected note"
 msgstr "Suprimeix la nota seleccionada"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -698,7 +690,7 @@ msgstr "Safata del sistema"
 msgid "Create _New Note"
 msgstr "Crea una _nota nova"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "Ce_rca totes les notes"
 
@@ -710,11 +702,24 @@ msgstr "Obri la finestra Cerca totes les notes"
 msgid "Start synchronizing notes"
 msgstr "Inicia la sincronització de les notes"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avançat"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr ""
+"Nombre mínim de notes que es mostraran a la llista de recents (18 com a "
+"màxim)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Què enllaça ací?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(cap)"
 
@@ -762,11 +767,31 @@ msgstr "No s'ha pogut alçar el fitxer de la icona."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
-msgstr "Segur que voleu eliminar esta icona?"
+msgstr "Segur que voleu suprimir esta icona?"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
 msgid "If you remove an icon it is permanently lost."
-msgstr "Si elimineu una icona la perdreu definitivament."
+msgstr "Si suprimiu una icona la perdreu definitivament."
+
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "No es pot obrir el correu electrònic"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destinació per a l'exportació HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Exporta les notes enllaçades"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Inclou totes les altres notes enllaçades"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
@@ -782,10 +807,14 @@ msgid "Note exported successfully"
 msgstr "La nota s'ha exportat correctament"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "S'ha denegat l'accés."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "La carpeta no existeix."
 
@@ -794,22 +823,6 @@ msgstr "La carpeta no existeix."
 msgid "Could not save the file \"{0}\""
 msgstr "No s'ha pogut alçar el fitxer «{0}»"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destinació per a l'exportació HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Exporta les notes enllaçades"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Inclou totes les altres notes enllaçades"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "No es pot obrir el correu electrònic"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Camí de la carpeta:"
@@ -818,18 +831,18 @@ msgstr "_Camí de la carpeta:"
 msgid "Select Synchronization Folder..."
 msgstr "Seleccioneu la carpeta de sincronització..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "El camp del camí de la carpeta és buit."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 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:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Carpeta local"
 
@@ -894,11 +907,11 @@ msgstr "Cites"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Canvieu la nota <span weight=\"bold\">Hui: plantilla</span> per a "
-"personalitzar el text de les notes d'Hui noves."
+"Canvieu la nota <b>Hui: plantilla</b> per personalitzar el text que tenen "
+"les notes d'Hui noves."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -925,26 +938,31 @@ msgstr "Pàgina {0} de {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd dd/MM/yyyy, hh:mm:ss"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Suprimeix els enllaços trencats"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Afig un esbós"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "S_ervidor:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "N_om d'usuari:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Camí de la carpeta (opcional):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -952,15 +970,15 @@ msgstr ""
 "La sincronització SSH necessita una clau SSH existent per a este servidor i "
 "usuari registrada al dimoni SSH en execució."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "El camp servidor o nom d'usuari és buit."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
 msgid "SSH"
-msgstr ""
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -987,14 +1005,18 @@ msgstr "S'ha completat la importació de les notes adhesives"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "S'han importat correctament <b>{0}</b> de <b>{1}</b> notes adhesives."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "S'ha importat correctament <b>{0}</b> de <b>{1}</b> nota adhesiva."
+msgstr[1] ""
+"S'han importat correctament <b>{0}</b> de <b>{1}</b> notes adhesives."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Sense títol"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Nota adhesiva: "
 
@@ -1021,23 +1043,23 @@ msgstr "--- El Tasque no s'està executant ---"
 msgid "_Underline"
 msgstr "_Subratllat"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "El camp URL, nom d'usuari o contrasenya és buit."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1050,19 +1072,15 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "S'ha produït l'error següent en alçar la configuració a l'anell de claus del "
 "GNOME: "
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Web del Tomboy"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Connecta al servidor"
 
@@ -1071,23 +1089,23 @@ msgid "Connected"
 msgstr "S'ha connectat"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "El servidor no respon. Torneu-ho a provar més tard."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 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:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 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:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1095,23 +1113,121 @@ msgstr ""
 "Torneu a la finestra de preferències del Tomboy i premeu «Alça» per a "
 "iniciar la sincronització."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "S'ha connectat. Premeu «Alça» per iniciar la sincronització"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr ""
 "S'està autoritzant en el navegador (premeu per 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:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Establiu el navegador predeterminat i torneu-ho a provar"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Web del Tomboy"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Exporta totes les notes a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Inicia l'exportació de notes a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Exporta el bloc de notes seleccionat a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Inicia l'exportació del bloc de notes a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "E_ines"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exporta"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Exporteu les vostres notes."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Exporta totes les notes a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Exporta el bloc de notes seleccionat a {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Exporta totes les notes {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "No s'ha pogut exportar, accés denegat."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "No s'ha pogut exportar, la carpeta no existeix."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "No s'ha pogut exportar: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Error desconegut."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Notes no arxivades"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "S'han exportat les notes a «{0}»."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "S'han exportat les notes"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "No s'han pogut alçar els fitxers a «{0}»"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Crea una carpeta de destinació per a l'exportació {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Cerca totes les notes"
 
@@ -1164,26 +1280,6 @@ msgstr "El nom ja és en ús"
 msgid "C_reate"
 msgstr "C_rea"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Plantilla del bloc de notes: {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Totes les notes"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Notes no arxivades"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "Blocs de n_otes"
@@ -1223,15 +1319,35 @@ msgid "Delete the selected notebook"
 msgstr "Suprimeix el bloc de notes seleccionat"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Blocs de notes"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Plantilla del bloc de notes: {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nota nova"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Totes les notes"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Segur que voleu suprimir este bloc de notes?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1252,35 +1368,41 @@ msgstr "Cap bloc de notes"
 msgid "New \"{0}\" Note"
 msgstr "Nota «{0}» nova"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Posa esta nota al bloc de notes"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Bloc de notes"
 
 #
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Bloc de notes nou..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Segur que voleu suprimir esta nota?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nota nova {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Segur que voleu suprimir «{0}»?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, 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:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Si suprimiu una nota la perdreu definitivament."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1292,13 +1414,13 @@ msgstr ""
 "detalls de l'error a {1}."
 
 #
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 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:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Plantilla de nota nova"
 
@@ -1419,14 +1541,14 @@ msgstr ""
 "actual\n"
 "\n"
 "En canviar el títol de la nota s'actualitzaran els enllaços presents a "
-"altres notes, prevenint així que es trenquin els enllaços quan es reanomena "
-"una nota.\n"
+"altres notes, prevenint així que es trenquin els enllaços quan es canvia el "
+"nom d'una nota.\n"
 "\n"
 "Addicionalment, si teclegeu el nom d'una altra nota en la nota actual, "
 "s'enllaçarà automàticament.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Comenceu ací"
 
@@ -1434,14 +1556,9 @@ msgstr "Comenceu ací"
 msgid "Using Links in Tomboy"
 msgstr "Utilització dels enllaços al Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, 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:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Descriviu la vostra nota nova ací."
 
@@ -1505,139 +1622,165 @@ msgstr "No canvies mai els noms dels _enllaços"
 msgid "Alwa_ys rename links"
 msgstr "Canvia sempre els noms dels _enllaços"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Cerca en esta nota"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Enllaça a una nota nova"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_xt"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Cerca en esta nota"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Tanca tot_es les notes"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Cerca"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Cerca les vostres notes (Ctrl-Maj-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Cerqueu les vostres notes"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Enllaça"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Enllaça el text seleccionat a una nota nova (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Enllaça el text seleccionat a una nota nova"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Text"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Estableix les propietats del text"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "E_ines"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Usa les eines en esta nota"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Suprimeix esta nota"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Sincronitza les notes"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Esta nota és una plantilla de notes. Determina el contingut per defecte de "
+"les notes normals i no es mostrarà en el menú de notes ni a la finestra de "
+"cerca."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Converteix a una nota normal"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Alça la m_ida"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Alça la se_lecció"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Alça el _títol"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Cerca..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Cerca la s_egüent"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Cerca l'_anterior"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "No es pot crear una nota nova"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Cerca:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Següent"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Negreta"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Cursiva"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Barrat"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Ressaltat"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Mida de la lletra"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "_Molt gran"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Gran"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Petita"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Augmenta la mida de la lletra"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Redueix la mida de la lletra"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Pics"
 
@@ -1657,11 +1800,11 @@ msgstr "Sincronització"
 msgid "Add-ins"
 msgstr "Complements"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "_Verifica l'ortografia a mesura que escric"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1671,11 +1814,11 @@ msgstr ""
 
 # ViquiParaules ? (josep)
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "_Ressalta les WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1684,31 +1827,31 @@ msgstr ""
 "clic a la paraula es crearà una nota amb este nom."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Habilita llistes de vinyetes automàtiques"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "_Usa el tipus de lletra personalitzat"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "En canviar el nom d'una nota enllaçada: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Demana'm què vull fer"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "No canvies mai els noms dels enllaços"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Canvia sempre els noms dels enllaços"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1716,16 +1859,16 @@ msgstr ""
 "Utilitzeu la plantilla de nota nova per especificar el text que s'hauria "
 "d'utilitzar quan es cree una nota nova."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Obri la plantilla de nota nova"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Presta atenció a les _dreceres"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1736,82 +1879,82 @@ msgstr ""
 "Control><Maj>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Mo_stra el menú de les notes"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Obri «_Comenceu ací»"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Crea una _nota nova"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Obr_e «Cerca totes les notes»"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Ser_vei:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "No és configurable"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 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
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "Minuts"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Avançat..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Els complements següents estan instal·lats"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Obté més complements..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Habilita"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Inhabilita"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Encara no està implementat"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Preferències"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Trieu el tipus de lletra de la nota"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Altres opcions de sincronització"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1819,24 +1962,23 @@ msgstr ""
 "Quan es detecta un conflicte entre una nota local i una nota al servidor de "
 "sincronització configurat:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Demana'm sempre que vull fer."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
-msgstr "Reanomena la nota local."
+msgstr "Canvia el nom de la nota local."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Reemplaça la nota local amb l'actualització del servidor."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:1142
 msgid "Are you sure?"
-msgstr "Avís: n'esteu segur?"
+msgstr "N'esteu segur?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1844,25 +1986,25 @@ msgstr ""
 "No es recomana netejar els paràmetres de sincronització. Potser vos vegeu "
 "forçats a sincronitzar de nou totes les notes en alçar els paràmetres nous."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "S'estan reiniciant els paràmetres de sincronització"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Heu inhabilitat el servei de sincronització configurat. Es netejaran els "
 "paràmetres de sincronització. Potser vos vegeu forçats a sincronitzar de nou "
-"totes les notes en alçar els paràmetres nous"
+"totes les notes en alçar els paràmetres nous."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
+#: ../Tomboy/PreferencesDialog.cs:1237
 msgid "Connection successful"
-msgstr ""
+msgstr "S'ha connectat"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1870,19 +2012,18 @@ msgstr ""
 "El Tomboy està preparat per sincronitzar les notes. Voleu sincronitzar-les "
 "ara?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
-#, fuzzy, csharp-format
+#: ../Tomboy/PreferencesDialog.cs:1262
+#, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
 "more information about the error."
 msgstr ""
-"S'ha produït un error. Reviseu la informació i torneu-ho a provar. El fitxer "
-"{0} vos pot ser útil."
+"Comproveu la vostra informació i proveu-ho de nou. El fitxer de registre {0} "
+"pot contindre més informació sobre l'error."
 
-#: ../Tomboy/PreferencesDialog.cs:1281
-#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:1274
 msgid "Error connecting"
-msgstr "S'ha produït un error en connectar: ("
+msgstr "S'ha produït un error en connectar"
 
 #: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
@@ -1900,294 +2041,102 @@ msgstr "Copyright:"
 msgid "Add-in Dependencies:"
 msgstr "Dependències del complement:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Cerca:"
 
-#: ../Tomboy/RecentChanges.cs:334
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Nota"
 
-#: ../Tomboy/RecentChanges.cs:356
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Darrer canvi"
 
-#: ../Tomboy/RecentChanges.cs:487
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Coincidències"
 
 # csharp-format
-#: ../Tomboy/RecentChanges.cs:538
-#, fuzzy
+#: ../Tomboy/RecentChanges.cs:563
 msgid "Title match"
-msgstr "{0} coincidència"
+msgstr "Coincidència de títol"
 
 # csharp-format
-#: ../Tomboy/RecentChanges.cs:541
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} coincidència"
 msgstr[1] "{0} coincidències"
 
-#: ../Tomboy/RecentChanges.cs:555
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Total: {0} nota"
 msgstr[1] "Total: {0} notes"
 
-#: ../Tomboy/RecentChanges.cs:566
+#: ../Tomboy/RecentChanges.cs:591
 #, 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:702
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"No s'ha trobat cap resultat al bloc de notes seleccionat.\n"
+"Feu clic ací per cercar a totes les notes."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Feu clic ací per cercar a totes les notes"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Notes"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "No es pot crear una nota nova"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"L'ordinador no permet utilitzar este complement de sincronització. Assegureu-"
+"vos de tindre correctament instal·lats i configurats el FUSE i {0}"
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Desenvolupament principal:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "No s'ha pogut llegir el fitxer de prova."
 
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "Col·laboradors:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "El test d'escriptura ha fallat."
 
-#: ../Tomboy/Tomboy.cs:405
-msgid "translator-credits"
-msgstr "Jordi Mas i Hernàndez <jmas at softcatala.org>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Temps d'espera en connectar al servidor."
 
-#: ../Tomboy/Tomboy.cs:414
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Altres\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "S'ha produït un error en connectar al servidor."
 
-#: ../Tomboy/Tomboy.cs:416
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Una senzilla aplicació d'escriptori, fàcil d'usar, per prendre notes."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "No s'ha pogut habilitar el FUSE."
 
-#: ../Tomboy/Tomboy.cs:426
-msgid "Homepage"
-msgstr "Pàgina inicial"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "S'ha produït un error mentre es connectava al servidor:"
 
-#: ../Tomboy/Tomboy.cs:544
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: Una senzilla aplicació d'escriptori, fàcil d'usar, per prendre "
-"notes.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:556
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Forma d'ús:\n"
-"  --version\t\t\tMostra informació de la versió.\n"
-"  --help\t\t\tImprimeix este missatge.\n"
-"  --note-path [camí]\t\tCarrega/alça les dades de la nota en este directori\n"
-"  --search [text]\t\tObre la finestra de cerca totes les notes amb el text "
-"de la cerca.\n"
-
-#: ../Tomboy/Tomboy.cs:566
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tCrea i mostra una nota nova\n"
-"  --new-note [títol]\t\tCrea i mostra una nova nota amb títol\n"
-"  --open-note [títol/url]\tMostra la nota que coincideix amb el títol\n"
-"  --start-here\t\t\tMostra la nota «Comenceu ací»\n"
-"  --highlight-search [text]\tCerca i ressalta el text a la nota oberta\n"
-
-#: ../Tomboy/Tomboy.cs:580
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versió {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nova) "
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_Quant al Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"No s'ha pogut trobar el «manual de notes del Tomboy». Comproveu que la "
-"instal·lació s'ha realitzat correctament."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "No s'ha trobat l'ajuda"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "No es pot obrir la ubicació"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Hui, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Hui"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Ahir, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Ahir"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Fa {0} dia, {1}"
-msgstr[1] "Fa {0} dies, {1}"
-
-# csharp-format
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Fa {0} dia"
-msgstr[1] "Fa {0} dies"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Demà, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Demà"
-
-#: ../Tomboy/Utils.cs:266
-#, 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:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "En {0} dia"
-msgstr[1] "En {0} dies"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, H:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Sense data"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "MMMM d yyyy, H:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Sense títol {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Ja existeix una nota amb el títol <b>{0}</b>. Trieu un altre nom per a esta "
-"nota abans de continuar."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "El títol de la nota ja és en ús"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Copia l'adreça de l'enllaç"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Obri l'enllaç"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"L'ordinador no permet utilitzar este complement de sincronització. Assegureu-"
-"vos de tindre correctament instal·lats i configurats el FUSE i {0}"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "No s'ha pogut llegir el fitxer de prova."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "El test d'escriptura ha fallat."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Temps d'espera en connectar al servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "S'ha produït un error en connectar al servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "No s'ha pogut habilitar el FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-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:89
-msgid "Details"
-msgstr "Detalls:"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Detalls:"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2359,7 +2308,7 @@ msgstr " (antiga)"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
-msgstr "Reanomena la nota local:"
+msgstr "Canvia el nom d'una nota local:"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
@@ -2387,10 +2336,6 @@ 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:161
-msgid "_Tools"
-msgstr "E_ines"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2425,12 +2370,228 @@ msgstr ""
 "l'inici. Afegiu «modprobe fuse» to /etc/init.d/boot.local or «fuse» to etc/"
 "modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "No es pot crear una nota nova"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Desenvolupament principal:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Col·laboradors:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr "Jordi Mas i Hernàndez <jmas at softcatala.org>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Altres\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Una senzilla aplicació d'escriptori, fàcil d'usar, per prendre notes."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Pàgina inicial"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Una senzilla aplicació d'escriptori, fàcil d'usar, per prendre "
+"notes.\n"
+"Copyright (C) 2004-2006 Alex Graveley\n"
+" <alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Altres\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Forma d'ús:\n"
+"  --version\t\t\tMostra informació de la versió.\n"
+"  --help\t\t\tImprimeix este missatge.\n"
+"  --note-path [camí]\t\tCarrega/alça les dades de la nota en este directori\n"
+"  --search [text]\t\tObre la finestra de cerca totes les notes amb el text "
+"de la cerca.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tCrea i mostra una nota nova\n"
+"  --new-note [títol]\t\tCrea i mostra una nova nota amb títol\n"
+"  --open-note [títol/url]\tMostra la nota que coincideix amb el títol\n"
+"  --start-here\t\t\tMostra la nota «Comenceu ací»\n"
+"  --highlight-search [text]\tCerca i ressalta el text a la nota oberta\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versió {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nova) "
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Quant al Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"No s'ha pogut trobar el «manual de notes del Tomboy». Comproveu que la "
+"instal·lació s'ha realitzat correctament."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "No s'ha trobat l'ajuda"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "No es pot obrir la ubicació"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Hui, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Hui"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Ahir, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Ahir"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Fa {0} dia, {1}"
+msgstr[1] "Fa {0} dies, {1}"
+
+# csharp-format
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Fa {0} dia"
+msgstr[1] "Fa {0} dies"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Demà, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Demà"
+
+#: ../Tomboy/Utils.cs:266
+#, 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:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "En {0} dia"
+msgstr[1] "En {0} dies"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, H:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Sense data"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "MMMM d yyyy, H:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Sense títol {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Ja existeix una nota amb el títol <b>{0}</b>. Trieu un altre nom per a esta "
+"nota abans de continuar."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "El títol de la nota ja és en ús"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copia l'adreça de l'enllaç"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Obri l'enllaç"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Darrer directori de l'exportació HTML"
+
 #~ msgid "SSH (sshfs FUSE)"
 #~ msgstr "SSH (sshfs FUSE)"
 
 #~ msgid "WebDAV (wdfs FUSE)"
 #~ msgstr "WebDAV (wdfs FUSE)"
 
+#~ msgid "Really delete this note?"
+#~ msgstr "Segur que voleu suprimir aquesta nota?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Cerca les vostres notes (Ctrl-Maj-F)"
+
 #~ msgid "Success! You're connected!"
 #~ msgstr "S'ha establert la connexió"
 
diff --git a/po/da.po b/po/da.po
index f684868..274cc54 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 # Michael Hastrup Bendsen <michael.bendsen at tele2adsl.dk>, 2007.
 # Ask Hjorth Larsen <asklarsen at gmail.com>, 2008, 09.
 # Peter Bach <bach.peter at gmail.com>, 2007, 09.
-#
+# flemming christensen <fc at stromata.dk>, 2011.
 # Konventioner
 # ------------
 #
@@ -16,14 +16,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-02 10:50+0100\n"
-"PO-Revision-Date: 2010-12-26 23:48+0100\n"
-"Last-Translator: Peter Bach <bach.peter at gmail.com>\n"
+"POT-Creation-Date: 2011-09-20 11:10+0200\n"
+"PO-Revision-Date: 2011-09-20 07:58+0200\n"
+"Last-Translator: flemming christensen <fc at stromata.dk>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+"Language: da\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"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -87,37 +88,52 @@ msgid "Custom Font Face"
 msgstr "Tilpasset skrifttype"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "Bestemmer x-koordinaten af søgevinduet; gemmes når Tomboy afsluttes."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Bestemmer x-koordinaten af vinduet \"Søg i alle noterne\"; gemmes når Tomboy "
+"afsluttes."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "Bestemmer y-koordinaten af søgevinduet; gemmes når Tomboy afsluttes."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Bestemmer y-koordinaten af vinduet \"Søg i alle noterne\"; gemmes når Tomboy "
+"afsluttes."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr "Bestemmer pixelhøjden af søgevinduet; gemmes når Tomboy afsluttes."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Bestemmer pixelhøjden af vinduet \"Søg i alle noterne\"; gemmes når Tomboy "
+"afsluttes."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
-msgstr "Bestemmer pixelbredden af søgevinduet; gemmes når Tomboy afsluttes."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"Bestemmer pixelbredden af vinduet \"Søg i alle noterne\"; gemmes når Tomboy "
+"afsluttes."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Aktivér autolistepunkter."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Aktivér mellemklik-tekstindsættelse på ikon."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Aktivér statusikon"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Aktivér WikiWord-fremhævning"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Aktivér automatiske punktlister."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Aktivér notelukning med esc."
@@ -175,20 +191,16 @@ msgid "HTML Export All Linked Notes"
 msgstr "HTML-eksportér alle sammenkædede noter"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "HTML-eksportér sidste mappe"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "HTML-eksportér sammenkædede noter"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Hvis deaktiveret, vil \"Slet note\"-bekræftelsesdialogen blive undertrykt."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -196,7 +208,7 @@ msgstr ""
 "Hvis enable_custom_font er sand, vil skrifttypen her blive brugt ved visning "
 "af noter."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -204,11 +216,11 @@ msgstr ""
 "Hvis aktiveret, vil alle noter der var åbne, da Tomboy lukkede, automatisk "
 "blive genåbnet ved næste programstart."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "Hvis aktiveret, kan en åben note lukkes ved at trykke esc-tasten."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -218,7 +230,7 @@ msgstr ""
 "dette fra kan være praktisk, når et andet program giver statusikonets "
 "funktionalitet."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -226,7 +238,7 @@ msgstr ""
 "Hvis sand, vil stavefejl blive understreget med rødt, og forslag til korrekt "
 "staving vil kunne vælges i højrekliksmenuen."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -236,7 +248,7 @@ msgstr ""
 "global_keybindings blive aktiveret og dermed tillade brugen af nyttige "
 "Tomboy-handlinger fra alle programmer."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -245,7 +257,7 @@ msgstr ""
 "noter. Ellers vil den forvalgte skrifttype for skrivebordet blive brugt i "
 "stedet."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -253,14 +265,14 @@ msgstr ""
 "Indikerer om Sticky Note-importeringsmodulet ikke er blevet kørt, så det "
 "bliver automatisk kørt næste gang Tomboy startes."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr ""
 "Heltal der viser det mindste antal af noter, der vises i Tomboy-notemenuen."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -272,7 +284,7 @@ msgstr ""
 "1 angiver, at automatisk synkronisering er slået fra. Den laveste acceptable "
 "positive værdi er 5. Værdien er i minutter."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -285,7 +297,7 @@ msgstr ""
 "gang. Værdien svarer til en intern nummerering. 0 indikerer at brugeren vil "
 "spørges hver gang så den enkelte konflikt kan blive håndteret særskilt."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -301,6 +313,10 @@ msgstr ""
 "nummerering. 0 indikerer at brugeren vil spørges hver gang så den enkelte "
 "konflikt kan blive håndteret særskilt."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Seneste mappe brugt i HTML-eksport"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Opdateringsopførsel for henvisninger ved noteomdøbning"
@@ -371,20 +387,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS-serveradresse til synkronisering"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Gemt højde af søgevindue"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Gemt højde af vinduet \"Søg i alle noterne\""
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Gemt vandret position af søgevindue"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Gemt vandret position af vinduet \"Søg i alle noterne\""
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Gemt lodret position af søgevindue"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Gemt lodret position af vinduet \"Søg i alle noterne\""
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Gem bredde af søgevindue"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Gem bredde af vinduet \"Søg i alle noterne\""
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -632,7 +648,7 @@ msgstr "_Slet"
 msgid "Delete the selected note"
 msgstr "Slet den valgte note"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Luk"
 
@@ -676,7 +692,7 @@ msgstr "Statusikon"
 msgid "Create _New Note"
 msgstr "Opret _ny note"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Søg i alle noterne"
 
@@ -688,11 +704,22 @@ msgstr "Åbn søg i alle noterne-vinduet"
 msgid "Start synchronizing notes"
 msgstr "Start synkronisering af noter"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avanceret"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Mindste antal af noter der vises i Nylige filer (maksimalt 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Hvad kædes her?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(intet)"
 
@@ -745,6 +772,26 @@ msgstr "Er du sikker på at du vil fjerne dette ikon?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Hvis du fjerner et ikon bliver det fjernet permanent."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Kan ikke åbne e-post"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Mål for HTML-eksportering"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Eksportér sammenkædede noter"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Inkludér alle andre sammenkædede noter"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Eksportér til HTML"
@@ -756,13 +803,17 @@ msgstr "Din note blev eksporteret til \"{0}\"."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
 msgid "Note exported successfully"
-msgstr "Note eksporteret problemfrit"
+msgstr "Note eksporteret med succes"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Ingen adgang."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Mappe findes ikke."
 
@@ -771,22 +822,6 @@ msgstr "Mappe findes ikke."
 msgid "Could not save the file \"{0}\""
 msgstr "Kunne ikke gemme filen \"{0}\""
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Mål for HTML-eksportering"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Eksportér sammenkædede noter"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Inkludér alle andre sammenkædede noter"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Kan ikke åbne e-post"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Mappesti:"
@@ -795,18 +830,18 @@ msgstr "_Mappesti:"
 msgid "Select Synchronization Folder..."
 msgstr "Vælg synkroniseringsmappe..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Felt til mappens sti er tomt."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr ""
 "Den specificerede mappesti findes ikke og Tomboy var ikke i stand til at "
 "oprette den."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Lokal mappe"
 
@@ -869,11 +904,11 @@ msgstr "Aftaler"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Ændr noten <span weight=\"bold\">I dag: Skabelonen</span> for at tilpasse "
-"teksten som nye i dag-noter anvender."
+"Ændr noten <b>I dag: Skabelonen</b> for at tilpasse teksten som nye i dag-"
+"noter anvender."
 
 # Det er lidt uklart hvad det betyder, men med denne her oversættelse er det vist begrænset hvor galt det kan gå
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
@@ -899,26 +934,31 @@ msgstr "Side {0} af {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd dd/MM/yyyy, hh:mm:ss tt"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Fjern ugyldige henvisninger"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Tilføj en skitse"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rver:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "Bruger_navn:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Sti til mappe (valgfri):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -926,15 +966,15 @@ msgstr ""
 "SSH-synkronisering kræver at en eksisterende SSH-nøgle for denne server og "
 "bruger er tilføjet til en kørende SSH-dæmon."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Feltet til server eller brugernavn er tomt."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -961,14 +1001,18 @@ msgstr "Sticky Notes import fuldført"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> af <b>{1}</b> Sticky Notes blev problemfrit importeret."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> af <b>{1}</b> Klæbrig note blev importeret med succes."
+msgstr[1] ""
+"<b>{0}</b> af <b>{1}</b> Klæbrige noter blev problemfrit importeret."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Sticky Note: "
 
@@ -992,23 +1036,23 @@ msgstr "--- Tasque kører ikke ---"
 msgid "_Underline"
 msgstr "_Understreg"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Adgangskode:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "URL, brugernavn eller kodeordsfeltet er tomt."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1021,19 +1065,15 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Forsøget på at gemme konfiguration til GNOME-nøgleringen slog fejl med den "
 "følgende besked:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy-web"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Forbind til server"
 
@@ -1042,23 +1082,23 @@ msgid "Connected"
 msgstr "Tilsluttet"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Serveren svarer ikke. Prøv igen senere."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Autorisering slog fejl, prøv igen"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy-webautorisering fuldført"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1066,22 +1106,121 @@ msgstr ""
 "Gå venligst tilbage til Tomboys indstillingsvindue og tryk Gem for at "
 "påbegynde synkronisering."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Tilsluttet. Tryk Gem for at påbegynde synkronisering"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Autoriserer i browser (Tryk for at nulstille forbindelsen)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Indstil standardbrowser og prøv igen"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy-web"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Eksportér alle noter til {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Start eksport af noter til {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Eksportér den valgte notesblok til {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Start eksport af notesblok til {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Værktøjer"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Eksportér"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Eksportér dine noter."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Eksportér Alle noter Til {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Eksportér den valgte notesblok Til {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Alle noter {0} Eksportér"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Kunne ikke eksportere, adgang nægtet."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Kunne ikke eksportere, mappen findes ikke."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Kunne ikke eksportere: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Ukendt fejl."
+
+# ???
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Ugemte noter"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Dine noter blev eksporteret til \"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Noterne blev eksporteret problemfrit"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Kunne ikke gemme filerne i \"{0}\""
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Opret destinationsmappe til {0} eksport"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Søg i alle noterne"
 
@@ -1134,27 +1273,6 @@ msgstr "Navnet er allerede brugt"
 msgid "C_reate"
 msgstr "O_pret"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0}-notesblokskabelon"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Alle noter"
-
-# ???
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Ugemte noter"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "Notes_blok"
@@ -1194,15 +1312,35 @@ msgid "Delete the selected notebook"
 msgstr "Slet den valgte notesblok"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Notesblokke"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0}-notesblokskabelon"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Ny note"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Alle noter"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Er du sikker på at du vil slette denne notesblok?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1223,34 +1361,40 @@ msgstr "Ingen notesblok"
 msgid "New \"{0}\" Note"
 msgstr "Ny \"{0}\"-note"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Indsæt denne note i en notesblok"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Notesblok"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Ny notesblok..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Er du sikker på at du vil slette denne note?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Ny note {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Er du sikker på at du vil slette \"{0}\"?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Er du sikker på at du vil slette {0} note?"
 msgstr[1] "Er du sikker på at du vil slette disse {0} noter?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Hvis du sletter en note, bliver den slettet permanent."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1261,13 +1405,13 @@ msgstr ""
 "tilstrækkeligt med diskplads, og at du har passende rettigheder til {0}. "
 "Fejldetaljer kan findes i {1}."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Fejl ved gemning af notedata."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Ny noteskabelon"
 
@@ -1391,7 +1535,7 @@ msgstr ""
 "automatisk blive kædet for dig.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Start her"
 
@@ -1399,14 +1543,9 @@ msgstr "Start her"
 msgid "Using Links in Tomboy"
 msgstr "Brug kæder i Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Ny note {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Beskriv din nye note her."
 
@@ -1470,139 +1609,167 @@ msgstr "Omdøb aldrig _henvisninger"
 msgid "Alwa_ys rename links"
 msgstr "O_mdøb altid henvisninger"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Søg i denne note"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Kæd til ny note"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "_Tekst"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Søg i denne note"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "_Luk alle noterne"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Søg"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Søg i dine noter (Ctrl-Skift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Søg i dine noter"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Kæde"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Kæd markeret tekst til en ny note (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Kæd markeret tekst til en ny note"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Tekst"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Angiv tekstegenskaber"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Værktøjer"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Brug værktøjer på denne note"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Slet denne note"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Synkronisér noter"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Denne note er en skabelon-note. Den bestemmer det forvalgte indhold af de "
+"almindelige noter og vil hverken blive vist i menuen note eller i "
+"søgevinduet."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Omdan til almindelig note"
+
+# Er det ok?
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Gem S_tørrelse"
+
+# Er det en rigtig måde at gøre det på?
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Gem _markering"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Gem _Titel"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Find..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Find _næste"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Find _forrige"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Kan ikke oprette note"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Find:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Næste"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Fed"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Kursiv"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Gennemstreget"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Fremhævet"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Skriftstørrelse"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "_Meget stor"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Stor"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Lille"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Forøg skriftstørrelse"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Formindsk skriftstørrelse"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Punkter"
 
@@ -1622,11 +1789,11 @@ msgstr "Synkronisering"
 msgid "Add-ins"
 msgstr "Tilføjelser"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "Løbende _stavekontrol"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1635,11 +1802,11 @@ msgstr ""
 "vil blive vist i højreknapsmenuen."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Fremhæv _wiki-ord"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1648,31 +1815,31 @@ msgstr ""
 "på ordet vil oprette en ny note med samme navn som ordet."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Aktivér auto-liste_punkttegn"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Brug tilpasset _skrifttype"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Når en note med henvisninger omdøbes: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Spørg mig om hvad der skal gøres"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Omdøb aldrig henvisninger"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Omdøb altid henvisninger"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1680,16 +1847,16 @@ msgstr ""
 "Brug den nye noteskabelon til at angive den tekst, der skal bruges ved "
 "oprettelse af en ny note."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Åbn ny noteskabelon"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Lyt efter _genvejstaster"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1700,83 +1867,83 @@ msgstr ""
 "Control><Shift>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Vis note_menuen"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Åbn \"_Start her\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Opret _ny note"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Åbn \"Søg i _alle noterne\""
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Tje_neste:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Ikke konfigurerbar"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "S_ynkronisér automatisk i baggrunden hvert"
 
 # Det er nok til konstruktion af strengen "Synkronisér automatisk i baggrunden hvert %d minut"
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "minut"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Avanceret..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "De følgende tilføjelser er installeret"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Hent flere tilføjelser..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Deaktivér"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Ikke implementeret"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Indstillinger"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Vælg skrifttype for note"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Andre synkroniseringsindstillinger"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1784,23 +1951,23 @@ msgstr ""
 "Når der bliver opdaget en konflikt mellem en lokal note og en note på en "
 "synkroniseringsserver:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Spørg mig altid hvad der skal gøres."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Omdøb min lokale note."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Erstat min lokale note med serverens opdatering."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "ADVARSEL: Er du sikker?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Er du sikker?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1809,345 +1976,150 @@ msgstr ""
 "blive tvunget til at synkronisere alle dine noter igen, når du gemmer dine "
 "nye indstillinger."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Nulstiller synkroniseringsindstillinger"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Du har deaktiveret den konfigurerede synkroniseringsservice. Dine "
 "synkroniserings-indstillinger vil nu blive ryddet. Du vil måske være nødt "
-"til at synkronisere alle dine noter igen når du gemmer de nye indstillinger"
+"til at synkronisere alle dine noter igen når du gemmer de nye indstillinger."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Succes! Du er nu tilsluttet!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Forbindelsen er oprettet"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr ""
 "Tomboy er klar til at synkronisere dine noter. Vil du synkronisere dem nu?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Beklager, men noget gik galt.  Kontrollér venligst dine informationer og "
-"prøv igen. Filen {0} kan også være behjælpelig."
+"Kontrollér venligst dine informationer og prøv igen. Logfilen {0} indeholder "
+"muligvis flere oplysninger om fejlen."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Fejl ved tilslutning :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Fejl ved tilslutning"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Version:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Forfatter:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Tilføjelses-afhængigheder:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Søg:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Note"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Sidst ændret"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Matchende"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Titel fundet"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} fundet"
 msgstr[1] "{0} fundet"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Total: {0} note"
 msgstr[1] "Total: {0} noter"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Træf: {0} note"
 msgstr[1] "Træf: {0} noter"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Der er ikke fundet resultater i den valgte notesblok.\n"
+"Klik her for at søge i alle noterne."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Klik her for at søge i alle notesblokkene"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Noter"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Kan ikke oprette ny note"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Primær udvikling:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Dette udvidelsesmodul til synkronisering er ikke understøttet på din "
+"computer. Sikr dig at du har FUSE og {0} korrekt installeret og konfigureret"
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Bidragydere:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Kunne ikke læse testfil."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"Martin Willemoes Hansen\n"
-"Peter Bach\n"
-"Kenneth Nielsen\n"
-"Michael Hastrup\n"
-"Ask Hjorth Larsen\n"
-"\n"
-"Dansk-gruppen <dansk at dansk-gruppen.dk>\n"
-"Mere info: http://www.dansk-gruppen.dk"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Skrivetest fejlede."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Andre\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Tidsudløb ved forbindelse til server."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "En enkel og brugervenlig notesblok til skrivebordet."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Fejl ved forbindelse til server."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Hjemmeside"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "FUSE kunne ikke aktiveres."
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
 msgstr ""
-"Tomboy: En enkel og brugervenlig notesblok.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Brug:\n"
-"  --version\t\t\tVis versionsinformation.\n"
-"  --help\t\t\tVis denne brugstekst.\n"
-"  --note-path [sti]\t\tHent/gem notedata i denne mappe.\n"
-"  --search [tekst]\t\tÅben søg i alle noter-vinduet med søgeteksten.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tOpret og vis en ny note.\n"
-"  --new-note [titel]\t\tOpret og vis en ny note med en titel.\n"
-"  --open-note [titel/url]\tVis den eksisterende note samme titel.\n"
-"  --start-here\t\t\tVis \"Start her\"-noten.\n"
-"  --highlight-search [tekst]\tSøg og fremhæv tekst i den åbnede note.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Version {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (ny)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_Om Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"Tomboy-notemanualen kunne ikke findes. Kontrollér at din installation er "
-"udført korrekt."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Hjælp ikke fundet"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Kan ikke åbne sted"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "I dag, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "I dag"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "I går, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "I går"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} dag siden, {1}"
-msgstr[1] "{0} dage siden, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} dag siden"
-msgstr[1] "{0} dage siden"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "I morgen, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "I morgen"
-
-# Et kig i kildekoden afslører at der her er tale om at udtrykke en forskel i dage mellem to datoer og den korrekte oversættelse må derfor være "Om .."
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Om {0} dag, {1}"
-msgstr[1] "Om {0} dage, {1}"
-
-# Et kig i kildekoden afslører at der her er tale om at udtrykke en forskel i dage mellem to datoer og den korrekte oversættelse må derfor være "Om .."
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Om {0} dag"
-msgstr[1] "Om {0} dage"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Ingen Dato"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, h:mm tt"
-
-# TILFØJET FEJLRAPPORT. Det er tåbeligt at bede os om at lokalisere sådanne strenge uden at fortælle os i hvilken sammen hæng de skal bruges. Jeg har beholdt det der ser ud til at være konventionen ved oversættelse nemlig at overæstte MMMM d til d MMMM indtil jeg finder ud af i hvilken sammenhæng det skal bruges
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Uden titel {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"En note med navnet <b>{0}</b> findes allerede. Vælg venligst et andet navn "
-"til denne note før du fortsætter."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Notetitel optaget"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Kopiér kædeadresse"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Åbn kæde"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Dette udvidelsesmodul til synkronisering er ikke understøttet på din "
-"computer. Sikr dig at du har FUSE og {0} korrekt installeret og konfigureret"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Kunne ikke læse testfil."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Skrivetest fejlede."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Tidsudløb ved forbindelse til server."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Fejl ved forbindelse til server."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "FUSE kunne ikke aktiveres."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr ""
-"Der opstod en fejl ved forsøg på forbindelse til den specificerede server:"
+"Der opstod en fejl ved forsøg på forbindelse til den specificerede server:"
 
 #. Expander containing TreeView
 #: ../Tomboy/Synchronization/SyncDialog.cs:89
@@ -2284,7 +2256,8 @@ msgstr "Servicefejl"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
-msgstr "Fejl ved forbindelsen til synkroniseringsservicen. Prøv venligst igen."
+msgstr ""
+"Fejl ved forbindelsen til synkroniseringstjenesten. Prøv venligst igen."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
@@ -2349,10 +2322,6 @@ msgstr ""
 "Der er konflikt mellem serverversionen af \"{0}\" og din lokale version. "
 "Hvad ønsker du at gøre med din lokale note?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Værktøjer"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2390,6 +2359,238 @@ msgstr ""
 "\"modprobe fuse\" i /etc/init.d/boot.local eller tilføje \"fuse\" i /etc/"
 "modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Kan ikke oprette ny note"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Primær udvikling:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Bidragydere:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Martin Willemoes Hansen\n"
+"Peter Bach\n"
+"Kenneth Nielsen\n"
+"Michael Hastrup\n"
+"Ask Hjorth Larsen\n"
+"\n"
+"Dansk-gruppen <dansk at dansk-gruppen.dk>\n"
+"Mere info: http://www.dansk-gruppen.dk"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2010 Andre\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "En enkel og brugervenlig notesblok til skrivebordet."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Hjemmeside"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Et enkelt og letanvendeligt program til oprettelse af noter.\n"
+"Copyright (C) 2004-2007 Alex Graveley <alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Andre\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Brug:\n"
+"  --version\t\t\tVis versionsinformation.\n"
+"  --help\t\t\tVis denne brugstekst.\n"
+"  --note-path [sti]\t\tHent/gem notedata i denne mappe.\n"
+"  --search [tekst]\t\tÅben søg i alle noter-vinduet med søgeteksten.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tOpret og vis en ny note.\n"
+"  --new-note [titel]\t\tOpret og vis en ny note med en titel.\n"
+"  --open-note [titel/url]\tVis den eksisterende note samme titel.\n"
+"  --start-here\t\t\tVis \"Start her\"-noten.\n"
+"  --highlight-search [tekst]\tSøg og fremhæv tekst i den åbnede note.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Version {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (ny)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Om Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"Tomboy-notemanualen kunne ikke findes. Kontrollér at din installation er "
+"udført korrekt."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Hjælp ikke fundet"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Kan ikke åbne sted"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "I dag, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "I dag"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "I går, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "I går"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} dag siden, {1}"
+msgstr[1] "{0} dage siden, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} dag siden"
+msgstr[1] "{0} dage siden"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "I morgen, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "I morgen"
+
+# Et kig i kildekoden afslører at der her er tale om at udtrykke en forskel i dage mellem to datoer og den korrekte oversættelse må derfor være "Om .."
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Om {0} dag, {1}"
+msgstr[1] "Om {0} dage, {1}"
+
+# Et kig i kildekoden afslører at der her er tale om at udtrykke en forskel i dage mellem to datoer og den korrekte oversættelse må derfor være "Om .."
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Om {0} dag"
+msgstr[1] "Om {0} dage"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Ingen Dato"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, h:mm tt"
+
+# TILFØJET FEJLRAPPORT. Det er tåbeligt at bede os om at lokalisere sådanne strenge uden at fortælle os i hvilken sammen hæng de skal bruges. Jeg har beholdt det der ser ud til at være konventionen ved oversættelse nemlig at overæstte MMMM d til d MMMM indtil jeg finder ud af i hvilken sammenhæng det skal bruges
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Uden titel {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"En note med navnet <b>{0}</b> findes allerede. Vælg venligst et andet navn "
+"til denne note før du fortsætter."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Notetitel optaget"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Kopiér kædeadresse"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Åbn kæde"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "HTML-eksportér sidste mappe"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Er du sikker på at du vil slette denne note?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Søg i dine noter (Ctrl-Skift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Succes! Du er nu tilsluttet!"
+
 #~ msgid "_Browse..."
 #~ msgstr "_Gennemse..."
 
diff --git a/po/de.po b/po/de.po
index c6aaf2f..5f4531d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: tomboy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-22 21:48+0000\n"
-"PO-Revision-Date: 2011-08-28 14:11+0100\n"
+"POT-Creation-Date: 2011-09-05 17:55+0000\n"
+"PO-Revision-Date: 2011-09-16 21:58+0100\n"
 "Last-Translator: Mario Blättermann <mariobl at freenet.de>\n"
 "Language-Team: Deutsch <gnome-de at gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -1137,20 +1137,24 @@ msgid "Tomboy Web"
 msgstr "Tomboy im Internet"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "Alle Notizen exportieren nach"
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Alle Notizen nach {0} exportieren"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "Notizexport beginnen nach"
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Notizexport beginnen nach {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "Ausgewähltes Notizbuch exportieren nach"
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Ausgewähltes Notizbuch nach {0} exportieren"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Notizbuchexport beginnen nach"
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Notizbuchexport beginnen nach {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:65
 #: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1166,12 +1170,19 @@ msgid "Export your notes."
 msgstr "Ihre Notizen exportieren."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "Alle Notizen exportieren nach"
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Alle Notizen nach {0} exportieren"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "Ausgewähltes Notizbuch exportieren nach"
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Ausgewähltes Notizbuch nach {0} exportieren"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Alle Notizen nach {0} exportieren"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:193
 #: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -1213,7 +1224,8 @@ msgstr "Notizen wurden erfolgreich exportiert"
 msgid "Could not save the files in \"{0}\""
 msgstr "Die Dateien konnten nicht in »{0}« gespeichert werden"
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
 #, csharp-format
 msgid "Create destination folder for {0} export"
 msgstr "Zielordner anlegen für {0}-Export"
@@ -2571,302 +2583,3 @@ msgstr "Link-Adresse _kopieren"
 msgid "_Open Link"
 msgstr "Link ö_ffnen"
 
-#~ msgid "Really delete this note?"
-#~ msgstr "Diese Notiz wirklich löschen?"
-
-#~ msgid "HTML Export Last Directory"
-#~ msgstr "HTML-Export: Letzter Ordner"
-
-#~ msgid "SSH (sshfs FUSE)"
-#~ msgstr "SSH (sshfs FUSE)"
-
-#~ msgid "WebDAV (wdfs FUSE)"
-#~ msgstr "WebDAV (wdfs FUSE)"
-
-#~ msgid "Search your notes (Ctrl-Shift-F)"
-#~ msgstr "Ihre Notizen durchsuchen (Strg+Umschalt+F)"
-
-#~ msgid "Success! You're connected!"
-#~ msgstr "Erfolg! Sie sind verbunden!"
-
-#~ msgid "_Browse..."
-#~ msgstr "_Durchsuchen …"
-
-#~ msgid "D-BUS remote control disabled.\n"
-#~ msgstr "D-BUS Fernsteuerung deaktiviert.\n"
-
-#~ msgid ""
-#~ "Tomboy: unsupported option '{0}'\n"
-#~ "Try 'tomboy --help' for more information.\n"
-#~ "D-BUS remote control disabled."
-#~ msgstr ""
-#~ "Tomboy: Unbekannte Option »{0}«\n"
-#~ "Versuchen Sie »tomboy --help« um weitere\n"
-#~ "Informationen zu erhalten.\n"
-#~ "D-BUS Fernsteuerung deaktiviert."
-
-#~ msgid "Click Here After Authorizing"
-#~ msgstr "Nach der Legitimierung hier klicken"
-
-#~ msgid "Processing..."
-#~ msgstr "Verarbeitung läuft …"
-
-#~ msgid "C_ase Sensitive"
-#~ msgstr "_Groß-/Kleinschreibung berücksichtigen"
-
-#~ msgid "Really delete these notes?"
-#~ msgstr "Diese Notizen wirklich löschen?"
-
-#~ msgid "Add-in"
-#~ msgstr "Add-In"
-
-#~ msgid "Version"
-#~ msgstr "Version"
-
-#~ msgid "Other"
-#~ msgstr "Andere"
-
-#~ msgid "Preparing pages..."
-#~ msgstr "Seiten werden vorbereitet …"
-
-#~ msgid "Rendering page %d of %d..."
-#~ msgstr "Seite %d von %d wird erstellt …"
-
-#~ msgid "Printing page %d of %d..."
-#~ msgstr "Seite %d von %d wird gedruckt …"
-
-#~ msgid "Print preview"
-#~ msgstr "Druckvorschau"
-
-#~ msgid "%A %x, %X"
-#~ msgstr "%A %x, %X"
-
-#~ msgid "Configuration"
-#~ msgstr "Konfiguration"
-
-#~ msgid "Configuration options for the print job"
-#~ msgstr "Konfigurationsoptionen für den Druckauftrag"
-
-#~ msgid "Source Buffer"
-#~ msgstr "Quellzwischenspeicher"
-
-#~ msgid "GtkTextBuffer object to print"
-#~ msgstr "Zu druckendes GtkTextBuffer-Objekt"
-
-#~ msgid "Tabs Width"
-#~ msgstr "Tabulatorbreite"
-
-#~ msgid "Width in equivalent space characters of tabs"
-#~ msgstr "Breite von Tabulatoren in entsprechenden Leerzeichen"
-
-#~ msgid "Wrap Mode"
-#~ msgstr "Umbruchmodus"
-
-#~ msgid "Word wrapping mode"
-#~ msgstr "Wortumbruchmodus"
-
-#~ msgid "Highlight"
-#~ msgstr "Hervorheben"
-
-#~ msgid "Whether to print the document with highlighted syntax"
-#~ msgstr ""
-#~ "Festlegung, ob das Dokument mit hervorgehobenem Syntax gedruckt werden soll"
-
-#~ msgid "Font"
-#~ msgstr "Schriftart"
-
-#~ msgid "GnomeFont name to use for the document text (deprecated)"
-#~ msgstr ""
-#~ "Name des »GnomeFont«, der für den Text des Dokuments verwendet wird "
-#~ "(veraltet)"
-
-#~ msgid "Font Description"
-#~ msgstr "Beschreibung der Schriftart:"
-
-#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-#~ msgstr ""
-#~ "Zu verwendende Schriftart für den Text des Dokuments (z.B. »Monospace 10«)"
-
-#~ msgid "Numbers Font"
-#~ msgstr "Nummernschriftart"
-
-#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
-#~ msgstr ""
-#~ "Name des »GnomeFont«, der für die Zeilennummern verwendet wird (veraltet)"
-
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr ""
-#~ "Beschreibung der Schriftart, die für die Zeilennummern verwendet wird"
-
-#~ msgid "Print Line Numbers"
-#~ msgstr "Zeilennummern drucken"
-
-#~ msgid "Interval of printed line numbers (0 means no numbers)"
-#~ msgstr "Intervall der gedruckten Zeilennummern (0 bedeutet keine Nummern)"
-
-#~ msgid "Print Header"
-#~ msgstr "Kopfzeilen drucken"
-
-#~ msgid "Whether to print a header in each page"
-#~ msgstr "Festlegung, ob Kopfzeilen auf jeder Seite gedruckt werden"
-
-#~ msgid "Print Footer"
-#~ msgstr "Fußzeilen drucken"
-
-#~ msgid "Whether to print a footer in each page"
-#~ msgstr "Festlegung, ob Fußzeilen auf jeder Seite gedruckt werden"
-
-#~ msgid "Header and Footer Font"
-#~ msgstr "Kopf- und Fußzeilenschriftart"
-
-#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
-#~ msgstr ""
-#~ "Name des »GnomeFont«, der für die Kopf- und Fußzeilen verwendet wird "
-#~ "(veraltet)"
-
-#~ msgid "Header and Footer Font Description"
-#~ msgstr "Schriftartbeschreibung für Kopf- und Fußzeilen"
-
-#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-#~ msgstr ""
-#~ "Zu verwendende Schriftart für die Kopf- und Fußzeilen (z.B. »Monospace 10«)"
-
-#~ msgid "_Open New Note Template..."
-#~ msgstr "Vorlage für neue Notizen _öffnen …"
-
-#~ msgid "NoteOfTheDay"
-#~ msgstr "NoteOfTheDay"
-
-#~ msgid "Delete"
-#~ msgstr "Löschen"
-
-#~ msgid "Case _sensitive"
-#~ msgstr "_Groß-/Kleinschreibung berücksichtigen"
-
-#~ msgid "Default Plugins"
-#~ msgstr "Standard-Plugins"
-
-#~ msgid "Directory containing system-installed Plugins"
-#~ msgstr "Verzeichnis mit den auf dem System installierten Plugins"
-
-#~ msgid "_Open Plugins Folder"
-#~ msgstr "Plugin-Ordner ö_ffnen"
-
-#~ msgid "Currently enabled plugins."
-#~ msgstr "Aktuell aktive Plugins."
-
-#~ msgid "List containing the names of currently enabled plugins."
-#~ msgstr "Liste, welche die Namen der momentan aktiven Plugins enthält."
-
-#~ msgid "Tomboy Project"
-#~ msgstr "Tomboy-Projekt"
-
-#~ msgid "Cannot fully disable {0}."
-#~ msgstr "{0} kann nicht vollständig deaktiviert werden."
-
-#~ msgid ""
-#~ "Cannot fully disable {0} as there still are at least {1} reference to this "
-#~ "plugin. This indicates a programming error. Contact the plugin's author "
-#~ "and report this problem.\n"
-#~ "\n"
-#~ "<b>Developer Information:</b> This problem usually occurs when the "
-#~ "plugin's Dispose method fails to disconnect all event handlers. The heap-"
-#~ "shot profiler ({2}) can help to identify leaking references."
-#~ msgstr ""
-#~ "{0} kann nicht vollständig deaktiviert werden, da noch mindestens {1} "
-#~ "Verweis zu diesem Plugin besteht. Dieses lässt einen Programmierfehler "
-#~ "vermuten.Nehmen Sie mit dem Autor des Plugins Kontakt auf und melden Sie "
-#~ "dieses Problem.\n"
-#~ "\n"
-#~ "<b>Entwicklerinformationen:</b> Dieses Problem tritt üblicherweise auf, "
-#~ "wenndie Dispose-Methode nicht alle Event Handler abmelden kann. Der Heap "
-#~ "Shot Profiler({2}) kann dabei helfen, problematische Referenzen zu "
-#~ "identifizieren."
-
-#~ msgid "Plugins"
-#~ msgstr "Plugins"
-
-#~ msgid "Written by:"
-#~ msgstr "Geschrieben von:"
-
-#~ msgid "Web site:"
-#~ msgstr "Web-Seite:"
-
-#~ msgid "Settings"
-#~ msgstr "Einstellungen"
-
-#~ msgid "{0} Settings"
-#~ msgstr "{0} Einstellungen"
-
-#~ msgid "Homepage & Donations"
-#~ msgstr "Homepage & Spenden"
-
-#~ msgid "  --check-plugin-unloading\tCheck if plugins are unloaded properly.\n"
-#~ msgstr ""
-#~ " --check-plugin-unloading\tüberprüft, ob Plugins korrekt deaktiviert "
-#~ "werden.\n"
-
-#~ msgid "Use the following:"
-#~ msgstr "Folgendes benutzen:"
-
-#~ msgid "NotD: "
-#~ msgstr "NdT:"
-
-#~ msgid "Quick and handy note-taker"
-#~ msgstr "Schnelle und handliche Notizanwendung"
-
-#~ msgid "Welcome to Tomboy!"
-#~ msgstr "Willkommen zu Tomboy!"
-
-#~ msgid ""
-#~ "Use this page as a Start Page for organizing your notes and keeping "
-#~ "unorganized ideas around."
-#~ msgstr ""
-#~ "Verwenden Sie diese Seite als Startseite um Ihre Notizen zu verwalten und "
-#~ "umherschwirrende Ideen zu sammeln."
-
-#~ msgid "_Search..."
-#~ msgstr "_Suchen …"
-
-#~ msgid "Table of Contents"
-#~ msgstr "Inhaltsverzeichnis"
-
-#~ msgid ""
-#~ "<b>Table of Contents</b> lists all your notes.\n"
-#~ "Double click to open a note."
-#~ msgstr ""
-#~ "<b>Inhaltsverzeichnis</b> listet alle Notizen auf.\n"
-#~ "Doppelklick, um eine Notiz anzuzeigen."
-
-#~ msgid "Search Note"
-#~ msgstr "Notiz suchen"
-
-#~ msgid "Search _Results"
-#~ msgstr "Suche_rgebnisse"
-
-#~ msgid "_Search Notes..."
-#~ msgstr "Notizen _durchsuchen …"
-
-#~ msgid "%A %D, %I:%M %p"
-#~ msgstr "%A, %d. %b %Y, %H:%M"
-
-#~ msgid "_About Tomboy..."
-#~ msgstr "_Info zu Tomboy …"
-
-#~ msgid "Run Plugin actions"
-#~ msgstr "Plugin-Aktionen ausführen"
-
-#~ msgid "<b>_Bold</b>"
-#~ msgstr "<b>_Fett</b>"
-
-#~ msgid "_Recent Changes"
-#~ msgstr "_Letzte Änderungen"
-
-#~ msgid "Related to: "
-#~ msgstr "In Bezug auf: "
-
-#~ msgid "_Install Plugins..."
-#~ msgstr "Plugins _installieren …"
-
-#~ msgid "({0} matches)"
-#~ msgstr "({0} Treffer)"
diff --git a/po/en_GB.po b/po/en_GB.po
index b941238..d52fd88 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 12:58+0000\n"
-"PO-Revision-Date: 2011-03-17 12:59+0100\n"
+"POT-Creation-Date: 2011-09-07 16:42+0100\n"
+"PO-Revision-Date: 2011-09-07 16:45+0100\n"
 "Last-Translator: Bruce Cowan <bruce at bcowan.me.uk>\n"
 "Language-Team: British English <en at li.org>\n"
 "Language: en_GB\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -80,37 +80,48 @@ msgid "Custom Font Face"
 msgstr "Custom Font Face"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy exit."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy exit."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy exit."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
-msgstr "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Enable Auto bulleted lists."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Enable Middle-Click Paste On Icon."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Enable Tray Icon"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Enable WikiWord highlighting"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Enable automatic bulleted lists."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Enable closing notes with escape."
@@ -168,20 +179,16 @@ msgid "HTML Export All Linked Notes"
 msgstr "HTML Export All Linked Notes"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "HTML Export Last Directory"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "HTML Export Linked Notes"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "If disabled, the \"Delete Note\" confirmation dialogue will be suppressed."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -189,7 +196,7 @@ msgstr ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -197,11 +204,11 @@ msgstr ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "If enabled, an opened note can be closed by hitting the escape key."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -211,7 +218,7 @@ msgstr ""
 "Disabling this may be useful when another application is providing the "
 "functionality of the tray icon."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -219,7 +226,7 @@ msgstr ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -229,7 +236,7 @@ msgstr ""
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
 "available from any application."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -237,7 +244,7 @@ msgstr ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -245,7 +252,7 @@ msgstr ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -253,7 +260,7 @@ msgstr ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -265,7 +272,7 @@ msgstr ""
 "autosync is disabled. The lowest acceptable positive value is 5. Value is in "
 "minutes."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -279,7 +286,7 @@ msgstr ""
 "wishes to be prompted when a conflict occurs, so that they may handle each "
 "conflict situation on a case-by-case basis."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -297,6 +304,10 @@ msgstr ""
 "removed. 2 indicates that link text should be updated to the new note name "
 "so that it will continue linking to the renamed note."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Last Directory used in HTML Export"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Link Updating Behaviour on Note Rename"
@@ -366,20 +377,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS Synchronisation Server URL"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Saved height of Search window"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Saved height of \"Search All Notes\" window"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Saved horizontal position of Search window"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Saved horizontal position of \"Search All Notes\" window"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Saved vertical position of Search window"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Saved vertical position of \"Search All Notes\" window"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Saved width of Search window"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Saved width of \"Search All Notes\" window"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -457,9 +468,8 @@ msgstr ""
 "The global keybinding for opening the Note Search dialogue. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
 "fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special "
+"string \"disabled\", then there will be no keybinding for this action."
 
 #: ../data/tomboy.schemas.in.h:69
 msgid ""
@@ -622,7 +632,7 @@ msgstr "_Delete"
 msgid "Delete the selected note"
 msgstr "Delete the selected note"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Close"
 
@@ -666,7 +676,7 @@ msgstr "TrayIcon"
 msgid "Create _New Note"
 msgstr "Create _New Note"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Search All Notes"
 
@@ -678,11 +688,22 @@ msgstr "Open the Search All Notes window"
 msgid "Start synchronizing notes"
 msgstr "Start synchronising notes"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Advanced"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Minimum number of notes to show in Recent list (maximum 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "What links here?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(none)"
 
@@ -735,6 +756,26 @@ msgstr "Really remove this icon?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "If you remove an icon it is permanently lost."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Cannot open e-mail"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destination for HTML Export"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Export linked notes"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Include all other linked notes"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Export to HTML"
@@ -749,10 +790,14 @@ msgid "Note exported successfully"
 msgstr "Note exported successfully"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Access denied."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Folder does not exist."
 
@@ -761,22 +806,6 @@ msgstr "Folder does not exist."
 msgid "Could not save the file \"{0}\""
 msgstr "Could not save the file \"{0}\""
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destination for HTML Export"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Export linked notes"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Include all other linked notes"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Cannot open e-mail"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Folder Path:"
@@ -785,17 +814,17 @@ msgstr "_Folder Path:"
 msgid "Select Synchronization Folder..."
 msgstr "Select Synchronisation Folder…"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Folder path field is empty."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Local Folder"
 
@@ -858,11 +887,11 @@ msgstr "Appointments"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customise "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customise the text that new Today "
+"notes have."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -887,26 +916,31 @@ msgstr "Page {0} of {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd dd/MM/yyyy, HH:mm:ss"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Remove broken links"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Add a sketch"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rver:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "User_name:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Folder Path (optional):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -914,15 +948,15 @@ msgstr ""
 "SSH synchronisation requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Server or username field is empty."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -949,14 +983,17 @@ msgstr "Sticky Notes import completed"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgstr[1] "<b>{0}</b> of <b>{1}</b> Sticky Notes was successfully imported."
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Sticky Note: "
 
@@ -980,23 +1017,23 @@ msgstr "--- Tasque is not running ---"
 msgid "_Underline"
 msgstr "_Underline"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "URL, username, or password field is empty."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1009,18 +1046,14 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy Web"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Connect to Server"
 
@@ -1029,23 +1062,23 @@ msgid "Connected"
 msgstr "Connected"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Server not responding. Try again later."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Authorisation Failed, Try Again"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy Web Authorisation Successful"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1053,22 +1086,120 @@ msgstr ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronising."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Connected. Press Save to start synchronising"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Authorising in browser (Press to reset connection)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Set the default browser and try again"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy Web"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Export All Notes to {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Start exporting notes to {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Export selected notebook to {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Start exporting notebook to {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Tools"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Export"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Export your notes."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Export All Notes To {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Export Selected Notebook To {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "All Notes {0} Export"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Could not export, access denied."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Could not export, folder does not exist."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Could not export: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Unknown error."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Unfiled Notes"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Your notes were exported to \"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Notes exported successfully"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Could not save the files in \"{0}\""
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Create destination folder for {0} export"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Search All Notes"
 
@@ -1121,26 +1252,6 @@ msgstr "Name already taken"
 msgid "C_reate"
 msgstr "C_reate"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} Notebook Template"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "All Notes"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Unfiled Notes"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "Note_books"
@@ -1180,15 +1291,35 @@ msgid "Delete the selected notebook"
 msgstr "Delete the selected notebook"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Notebooks"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} Notebook Template"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "New Note"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "All Notes"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Really delete this notebook?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1209,34 +1340,40 @@ msgstr "No notebook"
 msgid "New \"{0}\" Note"
 msgstr "New \"{0}\" Note"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Place this note into a notebook"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Notebook"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_New notebook…"
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Really delete this note?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "New Note {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Really delete \"{0}\"?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Really delete this {0} note?"
 msgstr[1] "Really delete these {0} notes?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "If you delete a note it is permanently lost."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1247,13 +1384,13 @@ msgstr ""
 "sufficient disk space, and that you have appropriate rights on {0}. Error "
 "details can be found in {1}."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Error saving note data."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "New Note Template"
 
@@ -1378,7 +1515,7 @@ msgstr ""
 "automatically be linked for you.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Start Here"
 
@@ -1386,14 +1523,9 @@ msgstr "Start Here"
 msgid "Using Links in Tomboy"
 msgstr "Using Links in Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "New Note {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Describe your new note here."
 
@@ -1457,139 +1589,164 @@ msgstr "Never rename _links"
 msgid "Alwa_ys rename links"
 msgstr "Alwa_ys rename links"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Find in This Note"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Link to New Note"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_xt"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Find in This Note"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Clos_e All Notes"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Search"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Search your notes (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Search your notes"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Link"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Link selected text to a new note (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Link selected text to a new note"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Text"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Set properties of text"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "T_ools"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Use tools on this note"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Delete this note"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Synchronise Notes"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Convert to regular note"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Save Si_ze"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Save Se_lection"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Save _Title"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Find…"
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Find _Next"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Find _Previous"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Cannote create note"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Find:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Next"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Bold"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Italic"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Strikeout"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Highlight"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Font Size"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "Hu_ge"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Large"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "S_mall"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Increase Font Size"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Decrease Font Size"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Bullets"
 
@@ -1609,11 +1766,11 @@ msgstr "Synchronisation"
 msgid "Add-ins"
 msgstr "Add-ins"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "_Spell check while typing"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1622,11 +1779,11 @@ msgstr ""
 "shown in the context menu."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Highlight _WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1635,31 +1792,31 @@ msgstr ""
 "word will create a note with that name."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Enable auto-_bulleted lists"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Use custom _font"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "When renaming a linked note: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Ask me what to do"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Never rename links"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Always rename links"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1667,16 +1824,16 @@ msgstr ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Open New Note Template"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Listen for _Hotkeys"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1687,82 +1844,82 @@ msgstr ""
 "Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Show notes _menu"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Open \"_Start Here\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Create _new note"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Open \"Search _All Notes\""
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Ser_vice:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Not configurable"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Automaticall_y Sync in Background Every"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "Minutes"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Advanced…"
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "The following add-ins are installed"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Get More Add-Ins…"
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Enable"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Not Implemented"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Preferences"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Choose Note Font"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Other Synchronisation Options"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1770,23 +1927,23 @@ msgstr ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronisation server:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Always ask me what to do."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Rename my local note."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Replace my local note with the server's update."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "WARNING: Are you sure?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Are you sure?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1794,25 +1951,25 @@ msgstr ""
 "Clearing your synchronisation settings is not recommended.  You may be "
 "forced to synchronise all of your notes again when you save new settings."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Resetting Synchronisation Settings"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "You have disabled the configured synchronisation service.  Your "
 "synchronisation settings will now be cleared.  You may be forced to "
-"synchronise all of your notes again when you save new settings"
+"synchronise all of your notes again when you save new settings."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Success! You're connected!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Connection successful"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1820,318 +1977,129 @@ msgstr ""
 "Tomboy is ready to synchronise your notes. Would you like to synchronise "
 "them now?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Error connecting :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Error connecting"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Version:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Author:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Add-in Dependencies:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Search:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Note"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Last Changed"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Matches"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Title match"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} match"
 msgstr[1] "{0} matches"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Total: {0} note"
 msgstr[1] "Total: {0} notes"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Matches: {0} note"
 msgstr[1] "Matches: {0} notes"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Click here to search across all notebooks"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Notes"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Cannot create new note"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"This synchronisation addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Primary Development:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Could not read test file."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Contributors:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Write test failed."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"David Lodge <dave at cirt.net>\n"
-"James Ogley <james at usr-local-bin.org>\n"
-"Christopher Orr <chris at orr.me.uk>\n"
-"Philip Withnall <philip at tecnocode.co.uk>\n"
-"Bruce Cowan <bruce at bcowan.me.uk>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Timeout connecting to server."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Error connecting to server."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "A simple and easy to use desktop note-taking application."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "FUSE could not be enabled."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Homepage"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "An error occurred while connecting to the specified server:"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright © 2004–2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Version {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (new)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_About Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Help not found"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Cannot open location"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Today, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Today"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Yesterday, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Yesterday"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} day ago, {1}"
-msgstr[1] "{0} days ago, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} day ago"
-msgstr[1] "{0} days ago"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Tomorrow, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Tomorrow"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "In {0} day, {1}"
-msgstr[1] "In {0} days, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "In {0} day"
-msgstr[1] "In {0} days"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, HH:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "No Date"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, HH:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Untitled {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Note title taken"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Copy Link Address"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Open Link"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"This synchronisation addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Could not read test file."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Write test failed."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Timeout connecting to server."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Error connecting to server."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "FUSE could not be enabled."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "An error occurred while connecting to the specified server:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Details"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Details"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2327,10 +2295,6 @@ msgstr ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
 "want to do with your local note?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Tools"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2365,6 +2329,233 @@ msgstr ""
 "startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
 "etc/modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Cannot create new note"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Primary Development:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Contributors:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"David Lodge <dave at cirt.net>\n"
+"James Ogley <james at usr-local-bin.org>\n"
+"Christopher Orr <chris at orr.me.uk>\n"
+"Philip Withnall <philip at tecnocode.co.uk>\n"
+"Bruce Cowan <bruce at bcowan.me.uk>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "A simple and easy to use desktop note-taking application."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Homepage"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Version {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (new)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_About Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Help not found"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Cannot open location"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Today, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Today"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Yesterday, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} day ago, {1}"
+msgstr[1] "{0} days ago, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} day ago"
+msgstr[1] "{0} days ago"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Tomorrow, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Tomorrow"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "In {0} day, {1}"
+msgstr[1] "In {0} days, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "In {0} day"
+msgstr[1] "In {0} days"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, HH:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "No Date"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, HH:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Untitled {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Note title taken"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copy Link Address"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Open Link"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "HTML Export Last Directory"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Really delete this note?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Search your notes (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Success! You're connected!"
+
 #~ msgid "_Browse..."
 #~ msgstr "_Browse…"
 
@@ -2595,9 +2786,6 @@ msgstr ""
 #~ msgid "_Search..."
 #~ msgstr "_Search…"
 
-#~ msgid "S_earch notes"
-#~ msgstr "S_earch notes"
-
 #~ msgid "Table of Contents"
 #~ msgstr "Table of Contents"
 
diff --git a/po/es.po b/po/es.po
index 7db2a47..6cd2afb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,2734 +4,2728 @@
 # Spanish translation for tomboy
 # Copyright (C) 2004 Adam Weinberger and the GNOME Foundation
 # This file is distributed under the same licence as the Tomboy package.
-# Daniel Mustieles <daniel.mustieles at gmail.com>, 2009, 2010, 2011.
 # Jorge González <jorgegonz at svn.gnome.org>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: tomboy.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-30 20:22+0000\n"
-"PO-Revision-Date: 2011-08-31 15:42Centra\n"
-"Last-Translator: Jorge González <jorgegonz at svn.gnome.org>\n"
-"Language-Team: Español; Castellano <gnome-es-list at gnome.org>\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"
-msgstr "Accesorios"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:2
-msgid "Simple and easy to use note-taking"
-msgstr "Toma de notas simple y fácil de usar"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:3
-msgid "Tomboy Applet Factory"
-msgstr "Fábrica de la miniaplicación Tomboy"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:579
-msgid "Tomboy Notes"
-msgstr "Notas Tomboy"
-
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
-#: ../Tomboy/Tray.cs:274
-msgid "S_ynchronize Notes"
-msgstr "S_incronizar las notas"
-
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
-msgid "_About"
-msgstr "Acerca _de"
-
-#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:288
-msgid "_Help"
-msgstr "Ay_uda"
-
-#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:283
-msgid "_Preferences"
-msgstr "Prefere_ncias"
-
-#: ../data/tomboy.desktop.in.h:1
-msgid "Note-taker"
-msgstr "Anotador"
-
-#: ../data/tomboy.desktop.in.h:2
-msgid "Take notes, link ideas, and stay organized"
-msgstr "Tome notas, enlace ideas y manténgase organizado"
-
-#: ../data/tomboy.schemas.in.h:1
-msgid "Accept SSL Certificates"
-msgstr "Aceptar certificados SSL"
-
-#: ../data/tomboy.schemas.in.h:2
-msgid "Automatic Background Synchronization Timeout"
-msgstr "El tiempo de la sincronización automática en segundo plano ha expirado"
-
-#: ../data/tomboy.schemas.in.h:3
-msgid "Create a new Note"
-msgstr "Crear una nota nueva"
-
-#: ../data/tomboy.schemas.in.h:4
-msgid "Custom Font Face"
-msgstr "Personalizar tipografía"
-
-#: ../data/tomboy.schemas.in.h:5
-msgid ""
-"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Determina la coordenada X de la ventana «Buscar todas las notas»; almacenado "
-"en Tomboy al salir."
-
-#: ../data/tomboy.schemas.in.h:6
-msgid ""
-"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Determina la coordenada Y de la ventana «Buscar todas las notas»; almacenado "
-"en Tomboy al salir."
-
-#: ../data/tomboy.schemas.in.h:7
-msgid ""
-"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Determina la altura en píxeles de la ventana «Buscar todas las notas»; "
-"almacenado en Tomboy al salir."
-
-#: ../data/tomboy.schemas.in.h:8
-msgid ""
-"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
-msgstr ""
-"Determina la anchura en píxeles de la ventana «Buscar todas las notas»; "
-"almacenado en Tomboy al salir."
-
-#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "Activar pegar con el botón del medio del ratón."
-
-#: ../data/tomboy.schemas.in.h:10
-msgid "Enable Tray Icon"
-msgstr "Activar icono de la bandeja de notificación"
-
-#: ../data/tomboy.schemas.in.h:11
-msgid "Enable WikiWord highlighting"
-msgstr "Activar resaltado de Wikipalabras"
-
-#: ../data/tomboy.schemas.in.h:12
-msgid "Enable automatic bulleted lists."
-msgstr "Activar listas de topos automáticas."
-
-#: ../data/tomboy.schemas.in.h:13
-msgid "Enable closing notes with escape."
-msgstr "Activar cerrar las notas con escape."
-
-#: ../data/tomboy.schemas.in.h:14
-msgid "Enable custom font"
-msgstr "Activar tipografía personalizada"
-
-#: ../data/tomboy.schemas.in.h:15
-msgid "Enable global keybindings"
-msgstr "Activar combinaciones de teclas globales"
-
-#: ../data/tomboy.schemas.in.h:16
-msgid "Enable spellchecking"
-msgstr "Activar el corrector ortográfico"
-
-#: ../data/tomboy.schemas.in.h:17
-msgid "Enable startup notes"
-msgstr "Activar notas al inicio"
-
-#: ../data/tomboy.schemas.in.h:18
-msgid "Enable the Delete Note confirmation dialog"
-msgstr "Activar o desactivar el diálogo de confirmación de Eliminar nota"
-
-#: ../data/tomboy.schemas.in.h:19
-msgid ""
-"Enable this option if you want bulleted lists to be automatic when you place "
-"- or * at the beginning of a line."
-msgstr ""
-"Active esta opción si quiere que las listas de topos sean automáticas cuando "
-"introduce un - o un *^al principio de una línea."
-
-#: ../data/tomboy.schemas.in.h:20
-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 ""
-"Active esta opción si quiere poder pegar contenido con marca de tiempo en la "
-"nota Comenzar aquí, pulsando con el botón del medio en el icono de Tomboy."
-
-#: ../data/tomboy.schemas.in.h:21
-msgid ""
-"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
-"will create a note with that name."
-msgstr ""
-"Active esta opción para resaltar palabras QueSeVenAsí. Al pulsar en la "
-"palabra se creará una nota con ese nombre."
-
-#: ../data/tomboy.schemas.in.h:22
-msgid "FUSE Mounting Timeout (ms)"
-msgstr "Tiempo de expiración FUSE (ms)"
-
-#: ../data/tomboy.schemas.in.h:23
-msgid "HTML Export All Linked Notes"
-msgstr "Exportar todas las notas enlazadas a HTML"
-
-#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Linked Notes"
-msgstr "Exportar las notas enlazadas a HTML"
-
-#: ../data/tomboy.schemas.in.h:25
-msgid ""
-"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
-msgstr ""
-"Si está desactivado, se eliminará el diálogo de confirmación de «Eliminar "
-"nota»."
-
-#: ../data/tomboy.schemas.in.h:26
-msgid ""
-"If enable_custom_font is true, the font name set here will be used as the "
-"font when displaying notes."
-msgstr ""
-"Si enable_custom_font está activado, la tipografía aquí seleccionada se "
-"usará al mostrar las notas."
-
-#: ../data/tomboy.schemas.in.h:27
-msgid ""
-"If enabled, all notes that were open when Tomboy quit will automatically be "
-"reopened at startup."
-msgstr ""
-"Si está activado, todas las notas que estaban abiertas cuando se cerró "
-"Tomboy, se abrirán automáticamente al inicio."
-
-#: ../data/tomboy.schemas.in.h:28
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr ""
-"Si está activado, una nota abierta se puede cerrar pulsando la tecla escape."
-
-#: ../data/tomboy.schemas.in.h:29
-msgid ""
-"If true, Tomboy's tray icon will be displayed in the notification area. "
-"Disabling this may be useful when another application is providing the "
-"functionality of the tray icon."
-msgstr ""
-"Si es verdadero, se mostrará el icono de la bandeja de Tomboy en el área de "
-"notificación. Puede ser útil desactivarlo cuando otra aplicación proporcione "
-"la funcionalidad del icono de la bandeja."
-
-#: ../data/tomboy.schemas.in.h:30
-msgid ""
-"If true, misspellings will be underlined in red, and correct spelling "
-"suggestions shown in the right-click menu."
-msgstr ""
-"Si está activado, las faltas de ortografía se subrayarán en rojo, y pulsando "
-"con el botón derecho del ratón se mostrarán sugerencias."
-
-#: ../data/tomboy.schemas.in.h:31
-msgid ""
-"If true, the desktop-global keybindings set in /apps/tomboy/"
-"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
-"available from any application."
-msgstr ""
-"Si está activado, las combinaciones globales de teclas del escritorio "
-"fijadas en /apps/tomboy/global_keybindings también se activará, permitiendo "
-"al resto de aplicaciones usar las opciones útiles de Tomboy."
-
-#: ../data/tomboy.schemas.in.h:32
-msgid ""
-"If true, the font name set in custom_font_face will be used as the font when "
-"displaying notes. Otherwise the desktop default font will be used."
-msgstr ""
-"Si está activado, el nombre del conjunto de tipo en custom_font_face se "
-"usará como tipografía para mostrar las notas. De otra manera se usará la "
-"tipografía predeterminada del escritorio."
-
-#: ../data/tomboy.schemas.in.h:33
-msgid ""
-"Indicates that the Sticky Note Importer plugin has not been run, so it "
-"should run automatically the next time Tomboy starts."
-msgstr ""
-"Indica que el complemento de importador de notas adhesivas no ha sido "
-"ejecutado, así que debería ejecutarse automáticamente la próxima vez que "
-"arranque Tomboy."
-
-#: ../data/tomboy.schemas.in.h:34
-msgid ""
-"Integer determining the minimum number of notes to show in the Tomboy note "
-"menu."
-msgstr ""
-"Entero determinando el número mínimo de notas que mostrar en el menú de "
-"notas de Tomboy."
-
-#: ../data/tomboy.schemas.in.h:35
-msgid ""
-"Integer value indicating how frequently to perform a background sync of your "
-"notes (when sync is configured). Any value less than 1 indicates that "
-"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
-"minutes."
-msgstr ""
-"Valor entero que indica con qué frecuencia realizar una sincronización en "
-"segundo plano de sus notas (cuando la sincronización está configurada). "
-"Cualquier valor menor que 1 indica que la autosincronización está "
-"desactivada. El valor mínimo es 5. Este valor se expresa en minutos."
-
-#: ../data/tomboy.schemas.in.h:36
-msgid ""
-"Integer value indicating if there is a preference to always perform a "
-"specific behavior when a conflict is detected, instead of prompting the "
-"user. The values map to an internal enumeration. 0 indicates that the user "
-"wishes to be prompted when a conflict occurs, so that they may handle each "
-"conflict situation on a case-by-case basis."
-msgstr ""
-"Valor entero que indica si existe una preferencia para realizar siempre una "
-"acción específica cuando se detecta un conflicto, en lugar de preguntar al "
-"usuario. Los valores denotan una enumeración interna. 0 indica que el "
-"usuario desea ser preguntado cuando suceda un conflicto, de tal forma que el "
-"usuario manejará cada situación de conflicto caso por caso."
-
-#: ../data/tomboy.schemas.in.h:37
-msgid ""
-"Integer value indicating if there is a preference to always perform a "
-"specific link updating behavior when a note is renamed, instead of prompting "
-"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 ""
-"Valor entero que indica si existe una preferencia para actualizar "
-"específicamente un enlace cuando se renombra una nota, en lugar de preguntar "
-"al usuario. Los valores denotan una enumeración interna. 0 indica que el "
-"usuario desea que le pregunten cuando al renombrar una nota puede afectar a "
-"los enlaces existentes en otras notas. 1 indica que los enlaces se deben "
-"eliminar automáticamente. 2 indica que se debe actualizar el texto del "
-"enlace con el nuevo nombre de la nota para que siga apuntando a la nota "
-"renombrada."
-
-#: ../data/tomboy.schemas.in.h:38
-msgid "Last Directory used in HTML Export"
-msgstr "Última carpeta usada al exportar en HTML"
-
-#: ../data/tomboy.schemas.in.h:39
-msgid "Link Updating Behavior on Note Rename"
-msgstr "Comportamiento al actualizar un enlace al renombrar una nota"
-
-#: ../data/tomboy.schemas.in.h:40
-msgid "List of pinned notes."
-msgstr "Lista de notas pinchadas."
-
-#: ../data/tomboy.schemas.in.h:41
-msgid ""
-"Maximum characters of note title to show in the Tomboy tray or panel applet "
-"note menu."
-msgstr ""
-"Número máximo de caracteres del título de la nota que mostrar en la bandeja "
-"de Tomboy o en el menú de la miniaplicación de notas del panel."
-
-#: ../data/tomboy.schemas.in.h:42
-msgid "Maximum note title length to show in tray menu."
-msgstr ""
-"Longitud máxima del título de la nota que mostrar en el menú de la bandeja."
-
-#: ../data/tomboy.schemas.in.h:43
-msgid "Minimum number of notes to show in menu"
-msgstr "Número mínimo de notas que mostrar en el menú"
-
-#: ../data/tomboy.schemas.in.h:44
-msgid "Note Synchronization Conflict Saved Behavior"
-msgstr ""
-"Comportamiento predeterminado para conflictos de sincronización de notas"
-
-#: ../data/tomboy.schemas.in.h:45
-msgid "Open Recent Changes"
-msgstr "Abrir cambios recientes"
-
-#: ../data/tomboy.schemas.in.h:46
-msgid "Open Search Dialog"
-msgstr "Abrir el cuadro de diálogo de buscar"
-
-#: ../data/tomboy.schemas.in.h:47
-msgid "Open Start Here"
-msgstr "Abrir comenzar aquí"
-
-#: ../data/tomboy.schemas.in.h:48
-msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr ""
-"Ruta en el servidor SSH al directorio de sincronización de Tomboy (opcional)."
-
-#: ../data/tomboy.schemas.in.h:49
-msgid ""
-"Path to the synchronization server when using the filesystem synchronization "
-"service addin."
-msgstr ""
-"Ruta al servidor de sincronización cuando se use el complemento del servicio "
-"de sincronización de sistema de archivos."
-
-#: ../data/tomboy.schemas.in.h:50
-msgid "SSHFS Remote Synchronization Folder"
-msgstr "Carpeta de sincronización remota SSHFS"
-
-#: ../data/tomboy.schemas.in.h:51
-msgid "SSHFS Remote Synchronization User Name"
-msgstr "Nombre de usuario de la sincronización remota SSHFS"
-
-#: ../data/tomboy.schemas.in.h:52
-msgid "SSHFS Synchronization Server Port"
-msgstr "Puerto del servidor de sincronización remoto SSHFS"
-
-#: ../data/tomboy.schemas.in.h:53
-msgid "SSHFS Synchronization Server URL"
-msgstr "URL del servidor de sincronización remota SSHFS"
-
-#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of \"Search All Notes\" window"
-msgstr "Altura guardada de la ventana «Buscar todas las notas»"
-
-#: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr "Posición horizontal guardada de la ventana «Buscar todas las notas»"
-
-#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr "Posición vertical guardada de la ventana «Buscar todas las notas»"
-
-#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of \"Search All Notes\" window"
-msgstr "Anchura guardada de la ventana «Buscar todas las notas»"
-
-#: ../data/tomboy.schemas.in.h:58
-msgid "Selected Synchronization Service Addin"
-msgstr "Seleccione el complemento del servicio de sincronización"
-
-#: ../data/tomboy.schemas.in.h:59
-msgid "Set to TRUE to activate"
-msgstr "Establecer a «TRUE» para activar"
-
-#: ../data/tomboy.schemas.in.h:60
-msgid "Show applet menu"
-msgstr "Mostrar el menú de miniaplicaciones"
-
-#: ../data/tomboy.schemas.in.h:61
-msgid "Start Here Note"
-msgstr "Nota «Comenzar aquí»"
-
-#: ../data/tomboy.schemas.in.h:62
-msgid "Sticky Note Importer First Run"
-msgstr "Primera ejecución del importador de notas adhesivas"
-
-#: ../data/tomboy.schemas.in.h:63
-msgid "Synchronization Client ID"
-msgstr "ID del cliente de sincronización"
-
-#: ../data/tomboy.schemas.in.h:64
-msgid "Synchronization Local Server Path"
-msgstr "Ruta al servidor local de sincronización"
-
-#: ../data/tomboy.schemas.in.h:65
-msgid "The date format that is used for the timestamp."
-msgstr "El formato de la fecha que se usa para la marca de tiempo."
-
-#: ../data/tomboy.schemas.in.h:66
-msgid ""
-"The global keybinding for creating and displaying a new Note. The format "
-"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
-"parser is fairly liberal and allows lower or upper case, and also "
-"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
-"option to the special string \"disabled\", then there will be no keybinding "
-"for this action."
-msgstr ""
-"Combinación de teclas global para crear y mostrar una nota nueva. El formato "
-"sería \"<Control>a\" o \"<Shift><Alt>F1\". El analizador "
-"léxico es bastante tolerante y permite letras mayúsculas o minúsculas, y "
-"abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". Si activa la "
-"opción de cadena especial \"disabled\" (desactivada) no habrá combinación de "
-"teclas para esta acción."
-
-#: ../data/tomboy.schemas.in.h:67
-msgid ""
-"The global keybinding for opening the \"Start Here\" note. The format looks "
-"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
-"fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
-msgstr ""
-"Combinación de teclas global para abrir «Comenzar aquí». El formato sería "
-"\"<Control>a\" o \"<Shift><Alt>F1\". El analizador léxico "
-"es bastante tolerante y permite letras mayúsculas o minúsculas, y "
-"abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". Si activa la "
-"opción de cadena especial \"disabled\" (desactivada) no habrá combinación de "
-"teclas para esta acción."
-
-#: ../data/tomboy.schemas.in.h:68
-msgid ""
-"The global keybinding for opening the Note Search dialog. The format looks "
-"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
-"fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
-msgstr ""
-"Combinación de teclas global para abrir el diálogo de buscar notas. El "
-"formato sería \"<Control>a\" o \"<Shift><Alt>F1\". El "
-"analizador léxico es bastante tolerante y permite letras mayúsculas o "
-"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
-"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
-"combinación de teclas para esta acción."
-
-#: ../data/tomboy.schemas.in.h:69
-msgid ""
-"The global keybinding for opening the Recent Changes dialog. The format "
-"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
-"parser is fairly liberal and allows lower or upper case, and also "
-"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
-"option to the special string \"disabled\", then there will be no keybinding "
-"for this action."
-msgstr ""
-"Combinación de teclas global para abrir el diálogo de cambios recientes. El "
-"formato sería \"<Control>a\" o \"<Shift><Alt>F1\". El "
-"analizador léxico es bastante tolerante y permite letras mayúsculas o "
-"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
-"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
-"combinación de teclas para esta acción."
-
-#: ../data/tomboy.schemas.in.h:70
-msgid ""
-"The global keybinding for showing the Tomboy applet's menu. The format looks "
-"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
-"fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
-msgstr ""
-"Combinación de teclas global para mostrar el menú de miniaplicaciones de "
-"Tomboy. El formato sería \"<Control>a\" o \"<Shift><Alt>F1"
-"\". El analizador léxico es bastante tolerante y permite letras mayúsculas o "
-"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
-"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
-"combinación de teclas para esta acción."
-
-#: ../data/tomboy.schemas.in.h:71
-msgid "The handler for \"note://\" URLs"
-msgstr "El manejador para las URL «note://»"
-
-#: ../data/tomboy.schemas.in.h:72
-msgid ""
-"The last directory a note was exported to using the Export To HTML plugin."
-msgstr ""
-"El último directorio donde se exportó una nota usando el complemento "
-"Exportar a HTML."
-
-#: ../data/tomboy.schemas.in.h:73
-msgid ""
-"The last setting for the 'Export linked notes' checkbox in the Export to "
-"HTML plugin."
-msgstr ""
-"Las última casilla de preferencias para «Exportar las notas enlazadas a HTML» "
-"en el complemento Exportar a HTML."
-
-#: ../data/tomboy.schemas.in.h:74
-msgid ""
-"The last setting for the 'Include all other linked notes' checkbox in the "
-"Export to HTML plugin. This setting is used in conjunction with the 'HTML "
-"Export Linked Notes' setting and is used to specify whether all notes (found "
-"recursively) should be included during an export to HTML."
-msgstr ""
-"El último ajuste para la casilla de «Incluir todas las notas enlazadas» en el "
-"complemento de exportar a HTML. Esta opción se usa junto con los ajustes de "
-"«Exportar las notas enlazadas a HTML» y se usa para especificar si todas las "
-"notas (encontradas recursivamente) deberían ser incluídas durante la "
-"exportación a HTML."
-
-#: ../data/tomboy.schemas.in.h:75
-msgid ""
-"The note URI of the note that should be considered the \"Start Here\" note, "
-"which is always placed at the bottom of the Tomboy note menu and also "
-"accessible by hotkey."
-msgstr ""
-"La URI de la nota que debería ser considerada como la nota «Comenzar aquí», "
-"que siempre estará al final del menú de notas de Tomboy y que también es "
-"accesible por una tecla rápida."
-
-#: ../data/tomboy.schemas.in.h:76
-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 puerto que usar al conectar con el servidor de sincronización a través de "
-"SSH. Establecido a -1 o menos si se debe usar el puerto predeterminado de "
-"SSH en su lugar."
-
-#: ../data/tomboy.schemas.in.h:77
-msgid ""
-"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
-"mount a sync share."
-msgstr ""
-"Tiempo (en milisegundos) que Tomboy debe esperar una respuesta al usar FUSE "
-"para montar una compartición sincronizada."
-
-#: ../data/tomboy.schemas.in.h:78
-msgid "Timestamp format"
-msgstr "Formato de la marca de tiempo"
-
-#: ../data/tomboy.schemas.in.h:79
-msgid "URL of SSH server containing Tomboy synchronization directory."
-msgstr ""
-"URL del servidor SSH que contiene el directorio de sincronización de Tomboy."
-
-#: ../data/tomboy.schemas.in.h:80
-msgid ""
-"Unique identifier for the currently configured note synchronization service "
-"addin."
-msgstr ""
-"Identificador único para el complemento configurado del servicio de "
-"sincronización de notas."
-
-#: ../data/tomboy.schemas.in.h:81
-msgid ""
-"Unique identifier for this Tomboy client, used when communicating with a "
-"sychronization server."
-msgstr ""
-"Identificador único para este cliente Tomboy, usado al comunicar con un "
-"servidor de sincronización."
-
-#: ../data/tomboy.schemas.in.h:82
-msgid ""
-"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
-"user."
-msgstr ""
-"Usar la opción wdfs «-ac» para aceptar certificados SSL sin preguntar al "
-"usuario."
-
-#: ../data/tomboy.schemas.in.h:83
-msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr ""
-"Nombre de usuario que usar al conectar con el servidor de sincronización a "
-"través de SSH."
-
-#: ../data/tomboy.schemas.in.h:84
-msgid ""
-"Whitespace-separated list of note URIs for notes that should always appear "
-"in the Tomboy note menu."
-msgstr ""
-"Lista separada por espacios en blanco de URI de notas para las notas que "
-"deberían aparecer en el menú de notas de Tomboy."
-
-#: ../Tomboy/ActionManager.cs:127
-msgid "_File"
-msgstr "_Archivo"
-
-#: ../Tomboy/ActionManager.cs:130
-msgid "_New"
-msgstr "_Nueva"
-
-#: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
-msgid "Create a new note"
-msgstr "Crear una nota nueva"
-
-#: ../Tomboy/ActionManager.cs:134
-msgid "_Open..."
-msgstr "_Abrir…"
-
-#: ../Tomboy/ActionManager.cs:135
-msgid "Open the selected note"
-msgstr "Abrir la nota seleccionada"
-
-#: ../Tomboy/ActionManager.cs:138
-msgid "_Delete"
-msgstr "_Eliminar"
-
-#: ../Tomboy/ActionManager.cs:139
-msgid "Delete the selected note"
-msgstr "Eliminar la nota seleccionada"
-
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: ../Tomboy/ActionManager.cs:143
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
-msgid "_Quit"
-msgstr "_Salir"
-
-#: ../Tomboy/ActionManager.cs:147
-msgid "Quit Tomboy"
-msgstr "Salir de Tomboy"
-
-#: ../Tomboy/ActionManager.cs:150
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
-msgid "Tomboy Preferences"
-msgstr "Preferencias de Tomboy"
-
-#: ../Tomboy/ActionManager.cs:160
-msgid "_Contents"
-msgstr "Índ_ice"
-
-#: ../Tomboy/ActionManager.cs:161
-msgid "Tomboy Help"
-msgstr "Ayuda de Tomboy"
-
-#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
-msgid "About Tomboy"
-msgstr "Acerca de Tomboy"
-
-#: ../Tomboy/ActionManager.cs:168
-msgid "TrayIcon"
-msgstr "Icono del área de notificación"
-
-#: ../Tomboy/ActionManager.cs:171
-msgid "Create _New Note"
-msgstr "Crear una nota _nueva"
-
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
-msgid "_Search All Notes"
-msgstr "_Buscar en todas las notas"
-
-#: ../Tomboy/ActionManager.cs:176
-msgid "Open the Search All Notes window"
-msgstr "Abrir la ventana de Búsqueda en todas las notas"
-
-#: ../Tomboy/ActionManager.cs:180
-msgid "Start synchronizing notes"
-msgstr "Comenzar a sincronizar las notas"
-
-#. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
-msgid "Advanced"
-msgstr "Avanzadas"
-
-#. Menu Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
-msgid "Minimum number of notes to show in Recent list (maximum 18)"
-msgstr ""
-"Número mínimo de notas que mostrar en la lista de recientes (máximo 18)"
-
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
-msgid "What links here?"
-msgstr "¿Qué enlaza aquí?"
-
-#. This is a disabled placeholder item for an empty menu
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
-msgid "(none)"
-msgstr "(ninguna)"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:23
-msgid ""
-"You can use any bugzilla just by dragging links into notes.  If you want a "
-"special icon for certain hosts, add them here."
-msgstr ""
-"Puede usar cualquier bugzilla simplemente arrastrando los enlaces en las "
-"notas. Si quiere un icono especial para algunos servidores, añádalos aquí."
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
-msgid "Host Name"
-msgstr "Nombre del servidor"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:58
-msgid "Icon"
-msgstr "Icono"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:176
-msgid "Select an icon..."
-msgstr "Seleccione un icono…"
-
-#. Extra Widget
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:191
-msgid "_Host name:"
-msgstr "Nombre del _equipo:"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:220
-msgid "No host name specified"
-msgstr "No se especificó ningún nombre para el equipo"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
-msgid "You must specify the Bugzilla host name to use with this icon."
-msgstr ""
-"Debe especificar el nombre del equipo de Bugzilla para usar con este icono."
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
-msgid "Error saving icon"
-msgstr "Error al guardar el icono"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
-msgid "Could not save the icon file."
-msgstr "No se pudo guardar el icono de archivo."
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
-msgid "Really remove this icon?"
-msgstr "¿Desea quitar este icono?"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
-msgid "If you remove an icon it is permanently lost."
-msgstr "Si borra un icono se perderá permanentemente."
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "No se puede abrir el correo-e"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
-msgid "HTML"
-msgstr "HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destino para la exportación a HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Exportar las notas enlazadas"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Incluir todas las notas enlazadas"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
-msgid "Export to HTML"
-msgstr "Exportar a HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
-#, csharp-format
-msgid "Your note was exported to \"{0}\"."
-msgstr "Su nota se exportó a «{0}»."
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
-msgid "Note exported successfully"
-msgstr "Nota exportada con éxito"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
-#: ../Tomboy/ExportAllApplicationAddin.cs:195
-#: ../Tomboy/ExportAllApplicationAddin.cs:273
-msgid "Access denied."
-msgstr "Acceso denegado."
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
-#: ../Tomboy/ExportAllApplicationAddin.cs:200
-#: ../Tomboy/ExportAllApplicationAddin.cs:278
-msgid "Folder does not exist."
-msgstr "La carpeta no existe."
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
-#, csharp-format
-msgid "Could not save the file \"{0}\""
-msgstr "No se pudo guardar el archivo «{0}»"
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
-msgid "_Folder Path:"
-msgstr "Ruta de la ca_rpeta:"
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
-msgid "Select Synchronization Folder..."
-msgstr "Seleccione la carpeta para sincronizar…"
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
-msgid "Folder path field is empty."
-msgstr "El campo de la ruta de la carpeta está vacío."
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
-msgid ""
-"Specified folder path does not exist, and Tomboy was unable to create it."
-msgstr "La ruta de la carpeta especificada no existe y Tomboy no pudo crearla."
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
-msgid "Local Folder"
-msgstr "Carpeta local"
-
-#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
-msgid "Fixed Wid_th"
-msgstr "Anchura _fija"
-
-#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
-#, csharp-format
-msgid "Cannot contact '{0}'"
-msgstr "No se puede contactar con «{0}»"
-
-#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
-#, csharp-format
-msgid "Error running gaim-remote: {0}"
-msgstr "Error al ejecutar gaim-remote: {0}"
-
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs:29
-msgid "Insert Timestamp"
-msgstr "Insertar marca de tiempo"
-
-#. initial newline
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
-msgid "dddd, MMMM d, h:mm tt"
-msgstr "dddd, d MMMM, HH:mm"
-
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
-msgid "Choose one of the predefined formats or use your own."
-msgstr "Elija uno de los formatos predefinidos o use uno propio."
-
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
-msgid "Use _Selected Format"
-msgstr "Usar el formato _seleccionado"
-
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:87
-msgid "_Use Custom Format"
-msgstr "_Usar tipografía personalizada"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:10
-msgid "Today: Template"
-msgstr "Hoy: Plantilla"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:12
-msgid "Today: "
-msgstr "Hoy: "
-
-#. Format: "Today: Friday, July 01 2005"
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
-msgid "dddd, MMMM d yyyy"
-msgstr "dddd, d MMMM yyyy"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:43
-msgid "Tasks"
-msgstr "Tareas"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:44
-msgid "Appointments"
-msgstr "Citas"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-msgid ""
-"Change the <b>Today: Template</b> note to customize the text that new Today "
-"notes have."
-msgstr ""
-"Cambiar la nota <b>Hoy: plantilla</b> para personalizar el texto que las "
-"nuevas notas «Hoy» tendrán."
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
-msgid "_Open Today: Template"
-msgstr "_Abrir hoy: Plantilla"
-
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:52
-msgid "Print"
-msgstr "Imprimir"
-
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:82
-msgid "Error printing note"
-msgstr "Error al imprimir la nota"
-
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:223
-#, csharp-format
-msgid "Page {0} of {1}"
-msgstr "Página {0} de {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:242
-msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
-msgstr "dddd dd/MM/yyyy, hh:mm:ss"
-
-#. Adding menu item when note is opened and window created
-#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
-msgid "Remove broken links"
-msgstr "Quitar enlaces rotos"
-
-#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
-msgid "Add a sketch"
-msgstr "Añadir un dibujo"
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
-msgid "Se_rver:"
-msgstr "Se_rvidor:"
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
-msgid "User_name:"
-msgstr "_Usuario:"
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
-msgid "_Folder Path (optional):"
-msgstr "Ruta de la ca_rpeta (opcional):"
-
-#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
-msgid ""
-"SSH synchronization requires an existing SSH key for this server and user, "
-"added to a running SSH daemon."
-msgstr ""
-"La sincronización SSH requiere una clave SSH existente para este servidor y "
-"usuario que esté añadida al demonio SSH en ejecución."
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
-msgid "Server or username field is empty."
-msgstr "El campo del usuario o del servidor está vacío."
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
-msgid "SSH"
-msgstr "SSH"
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
-msgid ""
-"Timeout connecting to server. Please ensure that your SSH key has been added "
-"to a running SSH daemon."
-msgstr ""
-"Se superó el tiempo de espera máximo al conectar con el servidor. Asegúrese "
-"de que su clave SSH se ha añadido al demonio SSH en ejecución."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
-msgid "Import from Sticky Notes"
-msgstr "Importar de notas adhesivas"
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:133
-msgid "No Sticky Notes found"
-msgstr "No se encontraron notas adhesivas"
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
-#, csharp-format
-msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "No se ha encontrado ningún archivo de Notas Adhesivas en «{0}»."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
-msgid "Sticky Notes import completed"
-msgstr "Importación de notas adhesivas completada"
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
-#, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
-msgid_plural ""
-"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr[0] "Se importó con éxito <b>{0}</b> de <b>{1}</b> nota adhesiva."
-msgstr[1] "Se importaron con éxito <b>{0}</b> de <b>{1}</b> notas adhesivas."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
-msgid "Untitled"
-msgstr "Sin título"
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
-msgid "Sticky Note: "
-msgstr "Nota adhesiva: "
-
-#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:62
-msgid "Tasque"
-msgstr "Tasque"
-
-#. Note to translators: "All" here must match up with the "All"
-#. category translation in Tasque for this to work properly.  "All"
-#. is used here to allow Tasque to decide which default category
-#. will be used to create the new task.
-#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:86
-msgid "All"
-msgstr "Todo"
-
-#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:145
-msgid "--- Tasque is not running ---"
-msgstr "--- Tasque no se está ejecutando ---"
-
-#: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
-msgid "_Underline"
-msgstr "_Subrayado"
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
-msgid "_Password:"
-msgstr "Contrase_ña:"
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
-msgid "URL, username, or password field is empty."
-msgstr "El campo URL, usuario o contraseña está vacío."
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
-msgid ""
-"There was an error connecting to the server.  This may be caused by using an "
-"incorrect user name and/or password."
-msgstr ""
-"Ocurrió un error al conectar con el servidor. Esto pudo ocurrir por usar un "
-"nombre de usuario y/o contraseña incorrectos."
-
-#. TODO: If the above fails (no keyring daemon), save all but password
-#. to GConf, and notify user.
-#. 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:268
-msgid ""
-"Saving configuration to the GNOME keyring failed with the following message:"
-msgstr ""
-"Falló al guardar la configuración al depósito de claves con el siguiente "
-"mensaje:"
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
-msgid "Connect to Server"
-msgstr "Conectar al servidor"
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
-msgid "Connected"
-msgstr "Conectado"
-
-#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
-msgid "Server not responding. Try again later."
-msgstr "El servidor no está respondiendo. Inténtelo de nuevo más tarde."
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
-msgid "Authorization Failed, Try Again"
-msgstr "Falló la autorización. Inténtelo de nuevo."
-
-#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
-msgid "Tomboy Web Authorization Successful"
-msgstr "Autorización web de Tomboy satisfactoria"
-
-#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
-msgid ""
-"Please return to the Tomboy Preferences window and press Save to start "
-"synchronizing."
-msgstr ""
-"Regrese a la ventana de preferencias de Tomboy y pulse guardar para iniciar "
-"la sincronización."
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
-msgid "Connected. Press Save to start synchronizing"
-msgstr "Conectado. Pulse Guardar para iniciar la sincronización."
-
-#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
-msgid "Authorizing in browser (Press to reset connection)"
-msgstr "Autorizar en el navegador (pulse para reiniciar la conexión)"
-
-#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
-msgid "Set the default browser and try again"
-msgstr "Establecer el navegador predeterminado e intentarlo de nuevo"
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Web de Tomboy"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:53
-#, csharp-format
-#| msgid "Export All Notes to "
-msgid "Export All Notes to {0}"
-msgstr "Exportar todas las notas en {0}"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:54
-#, csharp-format
-#| msgid "Start exporting notes to "
-msgid "Start exporting notes to {0}"
-msgstr "Comenzar a exportar las notas en {0}"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:58
-#, csharp-format
-#| msgid "Export selected notebook to "
-msgid "Export selected notebook to {0}"
-msgstr "Exportar el cuaderno de notas seleccionado en {0}"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:59
-#, csharp-format
-#| msgid "Start exporting notebook to "
-msgid "Start exporting notebook to {0}"
-msgstr "Comenzar a exportar el cuaderno en {0}"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:65
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Herramientas"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:68
-msgid "Export"
-msgstr "Exportar"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:69
-msgid "Export your notes."
-msgstr "Exportar sus notas."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:72
-#, csharp-format
-#| msgid "Export All Notes To "
-msgid "Export All Notes To {0}"
-msgstr "Exportar todas las notas en {0}"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:77
-#, csharp-format
-#| msgid "Export Selected Notebook To "
-msgid "Export Selected Notebook To {0}"
-msgstr "Exportar el cuaderno de notas seleccionado en {0}"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:153
-#, csharp-format
-#| msgid "All Notes"
-msgid "All Notes {0} Export"
-msgstr "Exportado en {0} de todas las notas"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:193
-#: ../Tomboy/ExportAllApplicationAddin.cs:271
-msgid "Could not export, access denied."
-msgstr "No se pudo exportar, acceso denegado."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:198
-#: ../Tomboy/ExportAllApplicationAddin.cs:276
-msgid "Could not export, folder does not exist."
-msgstr "No se pudo exportar, la carpeta no existe."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:203
-#: ../Tomboy/ExportAllApplicationAddin.cs:281
-#, csharp-format
-msgid "Could not export: {0}"
-msgstr "No se pudo exportar: {0}"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:205
-#: ../Tomboy/ExportAllApplicationAddin.cs:283
-msgid "Unknown error."
-msgstr "Error desconocido."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:237
-msgid "Unfiled Notes"
-msgstr "Notas sin archivar"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:389
-#, csharp-format
-msgid "Your notes were exported to \"{0}\"."
-msgstr "Sus notas se exportaron a «{0}»."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:398
-msgid "Notes exported successfully"
-msgstr "Notas exportadas correctamente"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:421
-#, csharp-format
-msgid "Could not save the files in \"{0}\""
-msgstr "No se pudieron guardar los archivos «{0}»"
-
-#. Translators: {0} is the export type, e.g. HTML
-#: ../Tomboy/ExportAllApplicationAddin.cs:507
-#, csharp-format
-msgid "Create destination folder for {0} export"
-msgstr "Crear carpeta de destino para exportar {0}"
-
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
-msgid "Search All Notes"
-msgstr "Buscar en todas las notas"
-
-#. 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:106
-msgid "Create New Note"
-msgstr "Crear una nota nueva"
-
-#: ../Tomboy/JumpListManager.cs:136
-#, csharp-format
-msgid "{0} (new)"
-msgstr "{0} (nueva)"
-
-#: ../Tomboy/JumpListManager.cs:158
-msgid "Recent Notes"
-msgstr "Notas recientes"
-
-#. Translators: This is the name of "Window" menu in the Mac menubar
-#: ../Tomboy/MacApplication.cs:215
-msgid "_Window"
-msgstr "_Ventana"
-
-#: ../Tomboy/MacApplication.cs:234
-msgid "Preferences..."
-msgstr "Preferencias…"
-
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:24
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
-msgid "Create a new notebook"
-msgstr "Crear un cuaderno de notas nuevo"
-
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:25
-msgid "Type the name of the notebook you'd like to create."
-msgstr "Escriba el nombre del cuaderno de notas que desea crear."
-
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:31
-msgid "N_otebook name:"
-msgstr "Nombre del cuaderno de n_otas:"
-
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:45
-msgid "Name already taken"
-msgstr "El nombre ya existe"
-
-#. Translation note: This is the Create button in the Create
-#. New Note Dialog.
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:59
-msgid "C_reate"
-msgstr "C_rear"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
-msgid "Note_books"
-msgstr "Cua_dernos de notas"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:69
-msgid "Create a new note in a notebook"
-msgstr "Crear una nota nueva en un cuaderno de notas"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:52
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:223
-msgid "New Note_book..."
-msgstr "Cua_derno de notas nuevo…"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:56
-msgid "_New Note"
-msgstr "Nota _nueva"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:57
-msgid "Create a new note in this notebook"
-msgstr "Crear una nota nueva en éste portátil"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:60
-msgid "_Open Template Note"
-msgstr "_Abrir la nota de plantilla"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:61
-msgid "Open this notebook's template note"
-msgstr "Abrir la nota de plantilla de este cuaderno de notas"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:64
-msgid "Delete Note_book"
-msgstr "Eliminar cua_derno de notas"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:65
-msgid "Delete the selected notebook"
-msgstr "Eliminar el cuaderno de notas seleccionado"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:276
-msgid "Notebooks"
-msgstr "Cuadernos de notas"
-
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Plantilla del cuaderno de notas de {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:153
-msgid "New Note"
-msgstr "Nota nueva"
-
-#: ../Tomboy/Notebooks/Notebook.cs:205
-msgid "All Notes"
-msgstr "Todas las notas"
-
-#: ../Tomboy/Notebooks/NotebookManager.cs:367
-msgid "Really delete this notebook?"
-msgstr "¿Desea eliminar este cuaderno de notas?"
-
-#: ../Tomboy/Notebooks/NotebookManager.cs:369
-msgid ""
-"The notes that belong to this notebook will not be deleted, but they will no "
-"longer be associated with this notebook.  This action cannot be undone."
-msgstr ""
-"Las notas que pertenecen a este cuaderno de notas no se eliminarán, pero ya "
-"no estarán asociadas a este cuaderno de notas. Esta acción no se puede "
-"deshacer."
-
-#: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
-msgid "No notebook"
-msgstr "Sin cuadernos de notas"
-
-#. Translators should preserve the "{0}" in the following
-#. string.  After being formatted for a notebook named,
-#. "Meetings", for example, the resultant string would be:
-#. New "Meetings" Note
-#: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
-#, csharp-format
-msgid "New \"{0}\" Note"
-msgstr "Nota nueva de «{0}»"
-
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
-msgid "Place this note into a notebook"
-msgstr "Meter esta nota en un cuaderno de notas"
-
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
-msgid "Notebook"
-msgstr "Cuaderno de notas"
-
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
-msgid "_New notebook..."
-msgstr "Cuaderno de _notas nuevo…"
-
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nota nueva {0}"
-
-#: ../Tomboy/Note.cs:1607
-#, csharp-format
-msgid "Really delete \"{0}\"?"
-msgstr "¿Quiere eliminar «{0}»?"
-
-#: ../Tomboy/Note.cs:1610
-#, csharp-format
-msgid "Really delete this {0} note?"
-msgid_plural "Really delete these {0} notes?"
-msgstr[0] "¿Desea eliminar esta nota?"
-msgstr[1] "¿Desea eliminar estas {0} notas?"
-
-#: ../Tomboy/Note.cs:1621
-msgid "If you delete a note it is permanently lost."
-msgstr "Si borra esta nota se perderá permanentemente."
-
-#: ../Tomboy/Note.cs:1655
-#, 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 {1}."
-msgstr ""
-"Ocurrió un error al guardar sus notas. Compruebe que tiene suficiente "
-"espacio en disco y que tiene los permisos apropiados en {0}. Puede encontrar "
-"detalles sobre el error en {1}."
-
-#: ../Tomboy/Note.cs:1671
-msgid "Error saving note data."
-msgstr "Error al guardar los datos de la nota"
-
-#. New Note Template
-#. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
-msgid "New Note Template"
-msgstr "Plantilla de Nota nueva"
-
-#. Create migration notification note
-#. Translators: The title of the data migration note
-#: ../Tomboy/NoteManager.cs:147
-msgid "Your Notes Have Moved!"
-msgstr "Sus notas se han movido"
-
-#. 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 ""
-"En la última versión de Tomboy se han movido sus archivos de notas. "
-"Probablemente nunca le ha importado dónde se guardan sus notas y, si todavía "
-"no le importa, siga adelante y <bold>borre esta nota</bold>.\n"
-"\n"
-"Su antigua carpeta de notas está sana y salva en <link:url>{0}</link:url>. "
-"Si vuelve a una versión anterior de Tomboy, éste buscará las notas ahí.\n"
-"\n"
-"Pero se han copiado sus notas y su configuración en las carpetas nuevas que "
-"serán las que se usen a partir de ahora, en:\n"
-"\n"
-"<list><list-item dir=\"ltr\">Las notas las puede encontrar en <link:url>{1}</"
-"link:url>\n"
-"</list-item><list-item dir=\"ltr\">La configuración está en <link:url>{2}</"
-"link:url>\n"
-"</list-item><list-item dir=\"ltr\">Puede instalar complementos en <link:url>"
-"{3}</link:url>\n"
-"</list-item><list-item dir=\"ltr\">Los archivos de registro se pueden "
-"encontrar en <link:url>{4}</link:url></list-item></list>\n"
-"\n"
-"Hasta luego."
-
-#: ../Tomboy/NoteManager.cs:265
-msgid ""
-"<note-content>Start Here\n"
-"\n"
-"<bold>Welcome to Tomboy!</bold>\n"
-"\n"
-"Use this \"Start Here\" note to begin organizing your ideas and thoughts.\n"
-"\n"
-"You can create new notes to hold your ideas by selecting the \"Create New "
-"Note\" item from the Tomboy Notes menu in your GNOME Panel. Your note will "
-"be saved automatically.\n"
-"\n"
-"Then organize the notes you create by linking related notes and ideas "
-"together!\n"
-"\n"
-"We've created a note called <link:internal>Using Links in Tomboy</link:"
-"internal>.  Notice how each time we type <link:internal>Using Links in "
-"Tomboy</link:internal> it automatically gets underlined?  Click on the link "
-"to open the note.</note-content>"
-msgstr ""
-"<note-content>Comenzar aquí\n"
-"\n"
-"<bold>Bienvenido a Tomboy</bold>\n"
-"\n"
-"Use esta nota «Comenzar aquí» para empezar a organizar sus ideas y "
-"pensamientos.\n"
-"\n"
-"Puede crear nuevas notas para mantener sus ideas seleccionando el elemento "
-"«Crear nota nueva» del menú de Tomboy en el panel de GNOME. Su nota se "
-"guardará automáticamente.\n"
-"\n"
-"Después organice las notas que cree enlazando las notas relacionadas y sus "
-"ideas de una forma conjunta.\n"
-"\n"
-"Hemos creado una nota llamada <link:internal>Usando enlaces en Tomboy</link:"
-"internal>. ¿Se ha dado cuenta de que cada vez que escribimos <link:"
-"internal>Usando enlaces en Tomboy</link:internal> automáticamente aparece "
-"subrayado? Pulse en el enlace para abrir la nota.</note-content>"
-
-#: ../Tomboy/NoteManager.cs:284
-msgid ""
-"<note-content>Using Links in Tomboy\n"
-"\n"
-"Notes in Tomboy can be linked together by highlighting text in the current "
-"note and clicking the <bold>Link</bold> button above in the toolbar.  Doing "
-"so will create a new note and also underline the note's title in the current "
-"note.\n"
-"\n"
-"Changing the title of a note will update links present in other notes.  This "
-"prevents broken links from occurring when a note is renamed.\n"
-"\n"
-"Also, if you type the name of another note in your current note, it will "
-"automatically be linked for you.</note-content>"
-msgstr ""
-"<note-content>Usando enlaces en Tomboy\n"
-"\n"
-"Las notas en Tomboy se pueden enlazar subrayando el texto en la nota actual "
-"y pulsando el botón <bold>Enlazar</bold> en la barra de herramientas. Al "
-"hacerlo se creará una nueva nota así como subrayar el título de la nueva "
-"nota en la nota actual.\n"
-"\n"
-"Cambiar el título de una nota hará que se actualicen los enlaces presentes "
-"en otras notas. Esto previene que aparezcan enlaces rotos cuando se renombra "
-"una nota.\n"
-"\n"
-"Además, si escribe el nombre de otra nota en su nota actual, se enlazará "
-"automáticamente.</note-content>"
-
-#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
-msgid "Start Here"
-msgstr "Comenzar aquí"
-
-#: ../Tomboy/NoteManager.cs:304
-msgid "Using Links in Tomboy"
-msgstr "Usando los enlaces en Tomboy"
-
-#. Use a simple "Describe..." body and highlight
-#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
-msgid "Describe your new note here."
-msgstr "Describa aquí su nota nueva."
-
-#: ../Tomboy/NoteRenameDialog.cs:50
-msgid "Rename Note Links?"
-msgstr "¿Renombrar los enlaces de la nota?"
-
-#: ../Tomboy/NoteRenameDialog.cs:56
-msgid "_Rename Links"
-msgstr "Renom_brar enlaces"
-
-#: ../Tomboy/NoteRenameDialog.cs:59
-msgid "_Don't Rename Links"
-msgstr "_No renombrar enlaces"
-
-#: ../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 ""
-"Renombrar enlaces en otras notas de «<span underline=\"single\">{0}</span>» a "
-"«<span underline=\"single\">{1}</span>»?\n"
-"\n"
-"Si no renombra los enlaces, no apuntarán a nada."
-
-#: ../Tomboy/NoteRenameDialog.cs:83
-msgid "Rename Links"
-msgstr "Renombrar enlaces"
-
-#: ../Tomboy/NoteRenameDialog.cs:95
-#: ../Tomboy/Synchronization/SyncDialog.cs:119
-msgid "Note Title"
-msgstr "Título de la nota"
-
-#. Translators: This button causes all notes in the list to be selected
-#: ../Tomboy/NoteRenameDialog.cs:118
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#. Translators: This button causes all notes in the list to be unselected
-#: ../Tomboy/NoteRenameDialog.cs:127
-msgid "Select None"
-msgstr "No seleccionar nada"
-
-#: ../Tomboy/NoteRenameDialog.cs:144
-msgid "Ad_vanced"
-msgstr "A_vanzado"
-
-#: ../Tomboy/NoteRenameDialog.cs:147
-msgid "Always show this _window"
-msgstr "Mostrar siempre esta _ventana"
-
-#: ../Tomboy/NoteRenameDialog.cs:155
-msgid "Never rename _links"
-msgstr "No renombrar nunca _enlaces"
-
-#: ../Tomboy/NoteRenameDialog.cs:163
-msgid "Alwa_ys rename links"
-msgstr "Siempre renombrar en_laces"
-
-#: ../Tomboy/NoteWindow.cs:59
-msgid "Find in This Note"
-msgstr "Buscar en esta nota"
-
-#: ../Tomboy/NoteWindow.cs:366
-msgid "_Link to New Note"
-msgstr "_Enlazar a una nota nueva"
-
-#: ../Tomboy/NoteWindow.cs:378
-msgid "Te_xt"
-msgstr "_Texto"
-
-#: ../Tomboy/NoteWindow.cs:386
-msgid "_Find in This Note"
-msgstr "_Buscar en esta nota"
-
-#: ../Tomboy/NoteWindow.cs:401
-msgid "Clos_e All Notes"
-msgstr "C_errar todas las notas"
-
-#: ../Tomboy/NoteWindow.cs:441
-msgid "Search"
-msgstr "Buscar"
-
-#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:445
-msgid "Search your notes"
-msgstr "Buscar sus notas"
-
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link"
-msgstr "Enlazar"
-
-#: ../Tomboy/NoteWindow.cs:464
-msgid "Link selected text to a new note"
-msgstr "Enlazar el texto seleccionado a una nota nueva"
-
-#: ../Tomboy/NoteWindow.cs:477
-msgid "_Text"
-msgstr "_Texto"
-
-#: ../Tomboy/NoteWindow.cs:482
-msgid "Set properties of text"
-msgstr "Establecer las propiedades del texto"
-
-#: ../Tomboy/NoteWindow.cs:487
-msgid "T_ools"
-msgstr "_Herramientas"
-
-#: ../Tomboy/NoteWindow.cs:491
-msgid "Use tools on this note"
-msgstr "Usar las herramientas en esta nota"
-
-#: ../Tomboy/NoteWindow.cs:499
-msgid "Delete this note"
-msgstr "Eliminar esta nota"
-
-#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
-msgid "Synchronize Notes"
-msgstr "Sincronizar las notas"
-
-#: ../Tomboy/NoteWindow.cs:565
-msgid ""
-"This note is a template note. It determines the default content of regular "
-"notes, and will not show up in the note menu or search window."
-msgstr ""
-"Esta nota es una plantilla de nota. Determina el contenido predeterminado de "
-"las notas normales y no se mostrará en el menú de notas o la ventana de "
-"búsqueda."
-
-#: ../Tomboy/NoteWindow.cs:571
-msgid "Convert to regular note"
-msgstr "Convertir en una nota normal"
-
-#: ../Tomboy/NoteWindow.cs:576
-msgid "Save Si_ze"
-msgstr "Guardar tama_ño"
-
-#: ../Tomboy/NoteWindow.cs:585
-msgid "Save Se_lection"
-msgstr "Guardar se_lección"
-
-#: ../Tomboy/NoteWindow.cs:594
-msgid "Save _Title"
-msgstr "Guardar _título"
-
-#: ../Tomboy/NoteWindow.cs:639
-msgid "_Find..."
-msgstr "_Buscar…"
-
-#: ../Tomboy/NoteWindow.cs:650
-msgid "Find _Next"
-msgstr "Buscar _siguiente"
-
-#: ../Tomboy/NoteWindow.cs:663
-msgid "Find _Previous"
-msgstr "Buscar _anterior"
-
-#: ../Tomboy/NoteWindow.cs:751
-msgid "Cannot create note"
-msgstr "No se puede crear la nota"
-
-#: ../Tomboy/NoteWindow.cs:832
-msgid "_Find:"
-msgstr "_Buscar:"
-
-#: ../Tomboy/NoteWindow.cs:843
-msgid "_Previous"
-msgstr "_Anterior"
-
-#: ../Tomboy/NoteWindow.cs:852
-msgid "_Next"
-msgstr "_Siguiente"
-
-#: ../Tomboy/NoteWindow.cs:1335
-msgid "_Bold"
-msgstr "_Negrita"
-
-#: ../Tomboy/NoteWindow.cs:1347
-msgid "_Italic"
-msgstr "_Cursiva"
-
-#: ../Tomboy/NoteWindow.cs:1359
-msgid "_Strikeout"
-msgstr "_Tachado"
-
-#: ../Tomboy/NoteWindow.cs:1371
-msgid "_Highlight"
-msgstr "_Resaltado"
-
-#: ../Tomboy/NoteWindow.cs:1384
-msgid "Font Size"
-msgstr "Tamaño de la tipografía"
-
-#: ../Tomboy/NoteWindow.cs:1387
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../Tomboy/NoteWindow.cs:1404
-msgid "Hu_ge"
-msgstr "_Enorme"
-
-#: ../Tomboy/NoteWindow.cs:1412
-msgid "_Large"
-msgstr "_Grande"
-
-#: ../Tomboy/NoteWindow.cs:1420
-msgid "S_mall"
-msgstr "_Pequeña"
-
-#: ../Tomboy/NoteWindow.cs:1429
-msgid "Increase Font Size"
-msgstr "Aumentar el tamaño de la tipografía"
-
-#: ../Tomboy/NoteWindow.cs:1447
-msgid "Decrease Font Size"
-msgstr "Reducir el tamaño de la tipografía"
-
-#: ../Tomboy/NoteWindow.cs:1467
-msgid "Bullets"
-msgstr "Topos"
-
-#: ../Tomboy/PreferencesDialog.cs:81
-msgid "Editing"
-msgstr "Edición"
-
-#: ../Tomboy/PreferencesDialog.cs:84
-msgid "Hotkeys"
-msgstr "Teclas rápidas"
-
-#: ../Tomboy/PreferencesDialog.cs:86
-msgid "Synchronization"
-msgstr "Sincronización"
-
-#: ../Tomboy/PreferencesDialog.cs:88
-msgid "Add-ins"
-msgstr "Complementos"
-
-#: ../Tomboy/PreferencesDialog.cs:174
-msgid "_Spell check while typing"
-msgstr "Corrección _ortográfica al escribir"
-
-#: ../Tomboy/PreferencesDialog.cs:183
-msgid ""
-"Misspellings will be underlined in red, with correct spelling suggestions "
-"shown in the context menu."
-msgstr ""
-"Si está activado, las faltas de ortografía se subrayarán en rojo, mostrando "
-"las sugerencias de corrección en el menú contextual."
-
-#. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:194
-msgid "Highlight _WikiWords"
-msgstr "Resaltar _wikipalabras"
-
-#: ../Tomboy/PreferencesDialog.cs:202
-msgid ""
-"Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
-"word will create a note with that name."
-msgstr ""
-"Activar esta opción para resaltar palabras <b>QueSeVenAsí</b>. Al pulsar en "
-"la palabra se creará una nota con ese nombre."
-
-#. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:209
-msgid "Enable auto-_bulleted lists"
-msgstr "Activar listas de _topos automáticos"
-
-#: ../Tomboy/PreferencesDialog.cs:218
-msgid "Use custom _font"
-msgstr "Usar tipogra_fía personalizada"
-
-#: ../Tomboy/PreferencesDialog.cs:236
-msgid "When renaming a linked note: "
-msgstr "Al renombrar una nota enlazada: "
-
-#: ../Tomboy/PreferencesDialog.cs:239
-msgid "Ask me what to do"
-msgstr "Preguntarme qué hacer"
-
-#: ../Tomboy/PreferencesDialog.cs:240
-msgid "Never rename links"
-msgstr "No renombrar nunca los enlaces"
-
-#: ../Tomboy/PreferencesDialog.cs:241
-msgid "Always rename links"
-msgstr "Siempre renombrar los enlaces"
-
-#: ../Tomboy/PreferencesDialog.cs:261
-msgid ""
-"Use the new note template to specify the text that should be used when "
-"creating a new note."
-msgstr ""
-"Use la plantilla de la nota nueva para especificar el texto que se debe usar "
-"al crear una nota nueva."
-
-#: ../Tomboy/PreferencesDialog.cs:270
-msgid "Open New Note Template"
-msgstr "Abrir la plantilla Nota nueva"
-
-#. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:327
-msgid "Listen for _Hotkeys"
-msgstr "_Escuchar las teclas rápidas"
-
-#: ../Tomboy/PreferencesDialog.cs:336
-msgid ""
-"Hotkeys allow you to quickly access your notes from anywhere with a "
-"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
-"Alt>N</b>"
-msgstr ""
-"Las teclas rápidas le permiten acceder rápidamente a sus notas desde "
-"cualquier parte con una pulsación de tecla. Ejemplo de teclas rápidas: "
-"<b><Control><Mayús>F11</b>, <b><Alt>N</b>"
-
-#. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:356
-msgid "Show notes _menu"
-msgstr "Mostrar el _menú de notas"
-
-#. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:373
-msgid "Open \"_Start Here\""
-msgstr "Abrir «Comen_zar aquí»"
-
-#. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:390
-msgid "Create _new note"
-msgstr "Crear una nota _nueva"
-
-#. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:407
-msgid "Open \"Search _All Notes\""
-msgstr "Abrir «Buscar en _todas las notas»"
-
-#: ../Tomboy/PreferencesDialog.cs:434
-msgid "Ser_vice:"
-msgstr "_Servicio:"
-
-#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
-msgid "Not configurable"
-msgstr "No configurable"
-
-#: ../Tomboy/PreferencesDialog.cs:513
-msgid "Automaticall_y Sync in Background Every"
-msgstr "Sin_cronizar automáticamente en segundo plano cada"
-
-#. Translators: See above comment for details on
-#. this string.
-#: ../Tomboy/PreferencesDialog.cs:519
-msgid "Minutes"
-msgstr "Minutos"
-
-#. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:541
-msgid "_Advanced..."
-msgstr "_Avanzado…"
-
-#: ../Tomboy/PreferencesDialog.cs:602
-msgid "The following add-ins are installed"
-msgstr "Los siguientes complementos están instalados actualmente"
-
-#: ../Tomboy/PreferencesDialog.cs:623
-msgid "Get More Add-Ins..."
-msgstr "Obtener más complementos…"
-
-#: ../Tomboy/PreferencesDialog.cs:641
-msgid "_Enable"
-msgstr "_Activar"
-
-#: ../Tomboy/PreferencesDialog.cs:647
-msgid "_Disable"
-msgstr "_Desactivar"
-
-#: ../Tomboy/PreferencesDialog.cs:778
-msgid "Not Implemented"
-msgstr "No implementado"
-
-#: ../Tomboy/PreferencesDialog.cs:792
-#, csharp-format
-msgid "{0} Preferences"
-msgstr "{0} Preferencias"
-
-#: ../Tomboy/PreferencesDialog.cs:931
-msgid "Choose Note Font"
-msgstr "Elegir la tipografía de la nota"
-
-#: ../Tomboy/PreferencesDialog.cs:975
-msgid "Other Synchronization Options"
-msgstr "Otras opciones de sincronización"
-
-#: ../Tomboy/PreferencesDialog.cs:981
-msgid ""
-"When a conflict is detected between a local note and a note on the "
-"configured synchronization server:"
-msgstr ""
-"Cuando se detecta un conflicto entre una nota local y una nota en el "
-"servidor de sincronización configurado:"
-
-#: ../Tomboy/PreferencesDialog.cs:988
-msgid "Always ask me what to do."
-msgstr "Preguntarme siempre qué hacer."
-
-#: ../Tomboy/PreferencesDialog.cs:992
-msgid "Rename my local note."
-msgstr "Renombrar mi nota local."
-
-#: ../Tomboy/PreferencesDialog.cs:996
-msgid "Replace my local note with the server's update."
-msgstr "Reemplazar mi nota local con la actualización del servidor."
-
-#: ../Tomboy/PreferencesDialog.cs:1142
-msgid "Are you sure?"
-msgstr "¿Está seguro?"
-
-#: ../Tomboy/PreferencesDialog.cs:1144
-msgid ""
-"Clearing your synchronization settings is not recommended.  You may be "
-"forced to synchronize all of your notes again when you save new settings."
-msgstr ""
-"No se recomienda limpiar sus ajustes de sincronización. Quizá se vea forzado "
-"a sincronizar todas sus notas de nuevo cuando guarde los nuevos ajustes."
-
-#: ../Tomboy/PreferencesDialog.cs:1157
-msgid "Resetting Synchronization Settings"
-msgstr "Reiniciando los ajustes de sincronización"
-
-#: ../Tomboy/PreferencesDialog.cs:1159
-msgid ""
-"You have disabled the configured synchronization service.  Your "
-"synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings."
-msgstr ""
-"Ha desactivado el servicio de sincronización configurado. Sus ajustes de "
-"sincronización se limpiarán. Quizá se vea forzado a sincronizar todas sus "
-"notas de nuevo cuando guarde los ajustes nuevos."
-
-#: ../Tomboy/PreferencesDialog.cs:1237
-msgid "Connection successful"
-msgstr "Conectado correctamente"
-
-#: ../Tomboy/PreferencesDialog.cs:1239
-msgid ""
-"Tomboy is ready to synchronize your notes. Would you like to synchronize "
-"them now?"
-msgstr ""
-"Tomboy está preparado para sincronizar sus notas. ¿Quiere sincronizarlas "
-"ahora?"
-
-#: ../Tomboy/PreferencesDialog.cs:1262
-#, csharp-format
-msgid ""
-"Please check your information and try again.  The log file {0} may contain "
-"more information about the error."
-msgstr ""
-"Compruebe su información e inténtelo de nuevo. El archivo {0} puede contener "
-"información útil sobre el error."
-
-#: ../Tomboy/PreferencesDialog.cs:1274
-msgid "Error connecting"
-msgstr "Error al conectar"
-
-#: ../Tomboy/PreferencesDialog.cs:1357
-msgid "Version:"
-msgstr "Versión:"
-
-#: ../Tomboy/PreferencesDialog.cs:1364
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../Tomboy/PreferencesDialog.cs:1371
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: ../Tomboy/PreferencesDialog.cs:1377
-msgid "Add-in Dependencies:"
-msgstr "Dependencias de los complementos:"
-
-#: ../Tomboy/RecentChanges.cs:100
-msgid "_Search:"
-msgstr "_Buscar:"
-
-#: ../Tomboy/RecentChanges.cs:350
-msgid "Note"
-msgstr "Nota"
-
-#: ../Tomboy/RecentChanges.cs:373
-msgid "Last Changed"
-msgstr "Último cambio"
-
-#: ../Tomboy/RecentChanges.cs:512
-msgid "Matches"
-msgstr "Coincidencias"
-
-#: ../Tomboy/RecentChanges.cs:563
-msgid "Title match"
-msgstr "Coincidir con el título"
-
-#: ../Tomboy/RecentChanges.cs:566
-#, csharp-format
-msgid "{0} match"
-msgid_plural "{0} matches"
-msgstr[0] "{0} coincidencia"
-msgstr[1] "{0} coincidencias"
-
-#: ../Tomboy/RecentChanges.cs:580
-#, csharp-format
-msgid "Total: {0} note"
-msgid_plural "Total: {0} notes"
-msgstr[0] "Total: {0} nota"
-msgstr[1] "Total: {0} notas"
-
-#: ../Tomboy/RecentChanges.cs:591
-#, csharp-format
-msgid "Matches: {0} note"
-msgid_plural "Matches: {0} notes"
-msgstr[0] "Coincide con: {0} nota"
-msgstr[1] "Coincide con: {0} notas"
-
-#: ../Tomboy/RecentChanges.cs:603
-msgid ""
-"No results found in the selected notebook.\n"
-"Click here to search across all notes."
-msgstr ""
-"No se han encontrado resultados en el cuaderno de notas seleccionado.\n"
-"Pulse aquí para buscar en todas las notas."
-
-#: ../Tomboy/RecentChanges.cs:609
-msgid "Click here to search across all notebooks"
-msgstr "Pulse aquí para buscar en todos los cuadernos de notas"
-
-#: ../Tomboy/RecentChanges.cs:775
-msgid "Notes"
-msgstr "Notas"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Su equipo no soporta este complemento de sincronización. Asegúrese de que "
-"tiene FUSE instalado y {0} correctamente instalado y configurado."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "No se pudo leer el archivo de prueba."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Falló la prueba de escritura."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Expiró el tiempo de conexión con el servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Error al conectar con el servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "No se pudo activar FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Ocurrió un error al conectar con el servidor especificado:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Detalles"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:126
-msgid "Status"
-msgstr "Estado"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:236
-msgid "Acquiring sync lock..."
-msgstr "Adquiriendo bloqueo de sincronización…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:239
-msgid "Committing changes..."
-msgstr "Efectuando los cambios…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:242
-msgid "Synchronizing Notes"
-msgstr "Sincronizar las notas"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
-msgid "Synchronizing your notes..."
-msgstr "Sincronizando sus notas…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:244
-msgid "This may take a while, kick back and enjoy!"
-msgstr ""
-"Esto puede llevar un rato así que puede hacer otras cosas mientras tanto."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:246
-msgid "Connecting to the server..."
-msgstr "Conectando al servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:252
-msgid "Deleting notes off of the server..."
-msgstr "Borrando notas del servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:256
-msgid "Downloading new/updated notes..."
-msgstr "Descargando notas nuevas/actualizadas…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:268
-msgid "Server Locked"
-msgstr "Servidor bloqueado"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:269
-msgid "Server is locked"
-msgstr "El servidor está bloqueado"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:270
-msgid ""
-"One of your other computers is currently synchronizing.  Please wait 2 "
-"minutes and try again."
-msgstr ""
-"Uno de sus equipos está actualmente sincronizando. Espere 2 minutos e "
-"inténtelo de nuevo."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:274
-msgid "Preparing to download updates from server..."
-msgstr "Preparándose para descargar las actualizaciones del servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:277
-msgid "Preparing to upload updates to server..."
-msgstr "Preparándose para subir las actualizaciones al servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:280
-msgid "Uploading notes to server..."
-msgstr "Subiendo notas al servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:283
-msgid "Synchronization Failed"
-msgstr "Falló la sincronización"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:284
-msgid "Failed to synchronize"
-msgstr "Falló al sincronizar"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:285
-msgid "Could not synchronize notes.  Check the details below and try again."
-msgstr ""
-"No se pudieron sincronizar las notas. Compruebe los detalles de abajo e "
-"inténtelo de nuevo."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:291
-msgid "Synchronization Complete"
-msgstr "Sincronización completada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:292
-msgid "Synchronization is complete"
-msgstr "Sincronización completada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:294
-#, csharp-format
-msgid "{0} note updated."
-msgid_plural "{0} notes updated."
-msgstr[0] "{0} nota actualizada."
-msgstr[1] "{0} notas actualizadas."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:299
-msgid "Your notes are now up to date."
-msgstr "Ahora sus notas están actualizadas."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:303
-msgid "Synchronization Canceled"
-msgstr "Se canceló la sincronización"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:304
-msgid "Synchronization was canceled"
-msgstr "Se canceló la sincronización"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:305
-msgid "You canceled the synchronization.  You may close the window now."
-msgstr "Canceló la sincronización. Debería cerrar la ventana ahora."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
-msgid "Synchronization Not Configured"
-msgstr "La sincronización no está configurada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:310
-msgid "Synchronization is not configured"
-msgstr "La sincronización no está configurada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:311
-msgid "Please configure synchronization in the preferences dialog."
-msgstr "Configure la sincronización en el diálogo de preferencias."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
-msgid "Synchronization Service Error"
-msgstr "Error de sincronización en el servicio"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:316
-msgid "Service error"
-msgstr "Error del servicio"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:317
-msgid "Error connecting to the synchronization service.  Please try again."
-msgstr ""
-"Error al conectar con el servicio de sincronización. Inténtelo de nuevo."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:334
-msgid "Deleted locally"
-msgstr "Se borró la copia local"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:337
-msgid "Deleted from server"
-msgstr "Borradas del servidor"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:340
-msgid "Updated"
-msgstr "Actualizada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:343
-msgid "Added"
-msgstr "Añadida"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:346
-msgid "Uploaded changes to server"
-msgstr "Se subieron al servidor los cambios"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:349
-msgid "Uploaded new note to server"
-msgstr "Se subió la nota nueva al servidor"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:496
-msgid "Note Conflict"
-msgstr "Conflicto entre notas"
-
-#. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:502
-msgid " (old)"
-msgstr "(vieja)"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:541
-msgid "Rename local note:"
-msgstr "Renombrar la nota local:"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:547
-msgid "Update links in referencing notes"
-msgstr "Actualizar los enlaces en las notas referenciadas"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:554
-msgid "Overwrite local note"
-msgstr "Sobreescribir la nota local"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:558
-msgid "Always perform this action"
-msgstr "Siempre realizar esta acción"
-
-#. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:564
-msgid "Note conflict detected"
-msgstr "Se detectó un conflicto en las notas"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:565
-#, csharp-format
-msgid ""
-"The server version of \"{0}\" conflicts with your local note.  What do you "
-"want to do with your local note?"
-msgstr ""
-"La versión del servidor «{0}» está en conflicto con su nota local. ¿Qué "
-"quiere hacer con su nota local?"
-
-#: ../Tomboy/Synchronization/SyncUtils.cs:119
-#: ../Tomboy/Synchronization/SyncUtils.cs:163
-msgid "Could not enable FUSE"
-msgstr "No se pudo activar FUSE"
-
-#: ../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."
-msgstr ""
-"No se pudo cargar el módulo FUSE. Compruebe que está instalado correctamete "
-"e inténtelo de nuevo."
-
-#: ../Tomboy/Synchronization/SyncUtils.cs:135
-msgid "Enable FUSE?"
-msgstr "¿Activar FUSE?"
-
-#. TODO: This message isn't entirely accurate.
-#. We should fix it.
-#: ../Tomboy/Synchronization/SyncUtils.cs:139
-msgid ""
-"The synchronization you've chosen requires the FUSE module to be loaded.\n"
-"\n"
-"To avoid getting this prompt in the future, you should load FUSE at "
-"startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
-"etc/modules."
-msgstr ""
-"La sincronización que ha elegido requiere cargar el módulo FUSE.\n"
-"\n"
-"Para evitar que se le muestre este mensaje en el futuro, debería cargar FUSE "
-"al inicio. Añada \"modprobe fuse\" a /etc/init.d/boot.local o \"fuse\" a /"
-"etc/modules."
-
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "No se puede crear una nota nueva"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Desarrollo inicial:"
-
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "Colaboradores:"
-
-#: ../Tomboy/Tomboy.cs:415
-msgid "translator-credits"
-msgstr ""
-"Daniel Mustieles <daniel.mustieles at gmail.com>, 2009\n"
-"Jorge González <jorgegonz at svn.gnome.org>, 2004-2009"
-
-#: ../Tomboy/Tomboy.cs:424
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Otros\n"
-
-#: ../Tomboy/Tomboy.cs:426
-msgid "A simple and easy to use desktop note-taking application."
-msgstr ""
-"Una aplicación simple y fácil de usar para tomar notas en el escritorio."
-
-#: ../Tomboy/Tomboy.cs:436
-msgid "Homepage"
-msgstr "Página web"
-
-#: ../Tomboy/Tomboy.cs:554
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright © 2004-2007 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"Tomboy: Una aplicación simple y fácil de usar para tomar notas en el "
-"escritorio.\n"
-"Copyright © 2004-2007 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Copyright © 2004-2011 Otros\n"
-
-#: ../Tomboy/Tomboy.cs:568
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Uso:\n"
-"  --version\t\t\tMuestra información de la versión.\n"
-"  --help\t\t\tMuestra este mensaje de uso.\n"
-"  --note-path [ruta]\t\tCargar/almacenar los datos de las notas en esta "
-"carpeta.\n"
-"  --search [texto]\t\tAbre la ventana de búsqueda de todas las notas con el "
-"texto buscado.\n"
-
-#: ../Tomboy/Tomboy.cs:578
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tCrea y muestra una nota\n"
-"  --new-note [título]\t\tCrea y muestra una nota, con un título\n"
-"  --open-note [título/url]\tMuestra la nota existente que coincida con el "
-"título\n"
-"  --start-here\t\t\tMuestra la nota «Comenzar aquí»\n"
-"  --highlight-search [texto]\tBuscar y resaltar texto coincidente en la nota "
-"abierta\n"
-
-#: ../Tomboy/Tomboy.cs:592
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versión {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nueva)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "Acerca _de Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"No se pudo encontrar el «Manual de Tomboy Notas». Compruebe que su "
-"instalación terminó con éxito."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "No se encontró la ayuda"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "No se puede abrir la dirección"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Hoy, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Hoy"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Ayer, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Ayer"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Hace {0} día, {1}"
-msgstr[1] "Hace {0} días, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Hace {0} día"
-msgstr[1] "Hace {0} días"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Mañana, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Mañana"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Dentro de {0} día, {1}"
-msgstr[1] "Dentro de {0} días, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Dentro de {0} día"
-msgstr[1] "Dentro de {0} días"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, HH:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Sin fecha"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, HH:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Sin título {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Ya existe una nota con el título <b>{0}</b>. Por favor, escoja otro nombre "
-"para esta nota antes de continuar."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "El título de la nota ya existe"
-
-#: ../Tomboy/Watchers.cs:587
-msgid "_Copy Link Address"
-msgstr "_Copiar la dirección del enlace"
-
-#: ../Tomboy/Watchers.cs:592
-msgid "_Open Link"
-msgstr "_Abrir enlace"
-
-#~ msgid "Really delete this note?"
-#~ msgstr "¿Desea eliminar esta nota?"
-
-#~ msgid "HTML Export Last Directory"
-#~ msgstr "Exportar al último directorio usado en formato HTML"
-
-#~ msgid "Search your notes (Ctrl-Shift-F)"
-#~ msgstr "Buscar en sus notas (Ctrl-Mayús-F)"
-
-#~ msgid "SSH (sshfs FUSE)"
-#~ msgstr "SSH (sshfs FUSE)"
-
-#~ msgid "WebDAV (wdfs FUSE)"
-#~ msgstr "WebDAV (wdfs FUSE)"
-
-#~ msgid "Success! You're connected!"
-#~ msgstr "Está conectado."
-
-#~ msgid "_Browse..."
-#~ msgstr "_Examinar…"
-
-#~ msgid "D-BUS remote control disabled.\n"
-#~ msgstr "Control remoto de D-BUS desactivado.\n"
-
-#~ msgid ""
-#~ "Tomboy: unsupported option '{0}'\n"
-#~ "Try 'tomboy --help' for more information.\n"
-#~ "D-BUS remote control disabled."
-#~ msgstr ""
-#~ "Tomboy: opción no válida «{0}»\n"
-#~ "Pruebe 'tomboy --help' para más información.\n"
-#~ "Control remoto de D-BUS desactivado."
-
-#~ msgid "Click Here After Authorizing"
-#~ msgstr "Pulse aquí después de autorizar"
-
-#~ msgid "Processing..."
-#~ msgstr "Procesando…"
-
-#~ msgid "_Connect to Server"
-#~ msgstr "_Conectar con el servidor"
-
-#~ msgid "C_ase Sensitive"
-#~ msgstr "Sensible a _mayúsculas"
-
-#~ msgid "Really delete these notes?"
-#~ msgstr "¿Desea borrar estas notas?"
-
-#~ msgid "Preparing pages..."
-#~ msgstr "Preparando las páginas…"
-
-#~ msgid "Rendering page %d of %d..."
-#~ msgstr "Renderizando página %d de %d…"
-
-#~ msgid "Printing page %d of %d..."
-#~ msgstr "Imprimiendo página %d de %d…"
-
-#~ msgid "Print preview"
-#~ msgstr "Vista previa de impresión"
-
-#~ msgid "%A %x, %X"
-#~ msgstr "%A %x, %X"
-
-#~ msgid "Configuration"
-#~ msgstr "Configuración"
-
-#~ msgid "Configuration options for the print job"
-#~ msgstr "Opciones de configuración para el trabajo de impresión"
-
-#~ msgid "Source Buffer"
-#~ msgstr "Búfer del fuente"
-
-#~ msgid "GtkTextBuffer object to print"
-#~ msgstr "Objeto GtkTextBuffer que imprimir"
-
-#~ msgid "Tabs Width"
-#~ msgstr "Ancho de tabulación"
-
-#~ msgid "Width in equivalent space characters of tabs"
-#~ msgstr "Anchura en espacios equivalentes para los tabuladores"
-
-#~ msgid "Wrap Mode"
-#~ msgstr "Modo de ajuste"
-
-#~ msgid "Word wrapping mode"
-#~ msgstr "Modo de ajuste de palabras"
-
-#~ msgid "Highlight"
-#~ msgstr "Resaltado"
-
-#~ msgid "Whether to print the document with highlighted syntax"
-#~ msgstr "Indica si se imprime el documento con resaltado de sintaxis"
-
-#~ msgid "Font"
-#~ msgstr "Tipografía"
-
-#~ msgid "GnomeFont name to use for the document text (deprecated)"
-#~ msgstr "Nombre GnomeFont para usar en el texto del documento (obsoleto)"
-
-#~ msgid "Font Description"
-#~ msgstr "Descripción de la tipografía"
-
-#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-#~ msgstr ""
-#~ "Tipografía que se va a usar en el texto del documento (Ej: «Monospace 10»)"
-
-#~ msgid "Numbers Font"
-#~ msgstr "Tipografía para los números"
-
-#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
-#~ msgstr "Nombre GnomeFont para usar en los números de línea (obsoleto)"
-
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr "Descripción de la tipografía a usar en los números de línea"
-
-#~ msgid "Print Line Numbers"
-#~ msgstr "Imprimir números de línea"
-
-#~ msgid "Interval of printed line numbers (0 means no numbers)"
-#~ msgstr ""
-#~ "Intervalo de impresión de números de líneas (0 significa sin números)"
-
-#~ msgid "Print Header"
-#~ msgstr "Imprimir cabecera"
-
-#~ msgid "Whether to print a header in each page"
-#~ msgstr "Indica si se imprimirá una cabecera en cada página"
-
-#~ msgid "Print Footer"
-#~ msgstr "Imprimir pie de página"
-
-#~ msgid "Whether to print a footer in each page"
-#~ msgstr "Indica si se imprimirá un pie de página en cada página"
-
-#~ msgid "Header and Footer Font"
-#~ msgstr "Tipografía de cabecera y pie de página"
-
-#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
-#~ msgstr ""
-#~ "Nombre GnomeFont a usar para la cabecera y el pie de página (obsoleto)"
-
-#~ msgid "Header and Footer Font Description"
-#~ msgstr "Descripción de la tipografía de cabecera y pie de página"
-
-#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-#~ msgstr ""
-#~ "Tipografía que se va a usar para las cabeceras y el pie de página (Ej: "
-#~ "«Monospace 10»)"
-
-#~ msgid "Add-in"
-#~ msgstr "Complemento"
-
-#~ msgid "Version"
-#~ msgstr "Versión"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
+# 
+# Daniel Mustieles <daniel.mustieles at gmail.com>, 2009, 2010, 2011.
, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tomboy.master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-05 17:55+0000\n"
+"PO-Revision-Date: 2011-09-14 17:52+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
+"Language-Team: Español <gnome-es-list at gnome.org>\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"
+msgstr "Accesorios"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:2
+msgid "Simple and easy to use note-taking"
+msgstr "Toma de notas simple y fácil de usar"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:3
+msgid "Tomboy Applet Factory"
+msgstr "Fábrica de la miniaplicación Tomboy"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
+#: ../Tomboy/Tray.cs:579
+msgid "Tomboy Notes"
+msgstr "Notas Tomboy"
+
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:274
+msgid "S_ynchronize Notes"
+msgstr "S_incronizar las notas"
+
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
+msgid "_About"
+msgstr "Acerca _de"
+
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:288
+msgid "_Help"
+msgstr "Ay_uda"
+
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:283
+msgid "_Preferences"
+msgstr "Prefere_ncias"
+
+#: ../data/tomboy.desktop.in.h:1
+msgid "Note-taker"
+msgstr "Anotador"
+
+#: ../data/tomboy.desktop.in.h:2
+msgid "Take notes, link ideas, and stay organized"
+msgstr "Tome notas, enlace ideas y manténgase organizado"
+
+#: ../data/tomboy.schemas.in.h:1
+msgid "Accept SSL Certificates"
+msgstr "Aceptar certificados SSL"
+
+#: ../data/tomboy.schemas.in.h:2
+msgid "Automatic Background Synchronization Timeout"
+msgstr "El tiempo de la sincronización automática en segundo plano ha expirado"
+
+#: ../data/tomboy.schemas.in.h:3
+msgid "Create a new Note"
+msgstr "Crear una nota nueva"
+
+#: ../data/tomboy.schemas.in.h:4
+msgid "Custom Font Face"
+msgstr "Personalizar tipografía"
+
+#: ../data/tomboy.schemas.in.h:5
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determina la coordenada X de la ventana «Buscar todas las notas»; almacenado "
+"en Tomboy al salir."
+
+#: ../data/tomboy.schemas.in.h:6
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determina la coordenada Y de la ventana «Buscar todas las notas»; almacenado "
+"en Tomboy al salir."
+
+#: ../data/tomboy.schemas.in.h:7
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determina la altura en píxeles de la ventana «Buscar todas las notas»; "
+"almacenado en Tomboy al salir."
+
+#: ../data/tomboy.schemas.in.h:8
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"Determina la anchura en píxeles de la ventana «Buscar todas las notas»; "
+"almacenado en Tomboy al salir."
+
+#: ../data/tomboy.schemas.in.h:9
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "Activar pegar con el botón del medio del ratón."
+
+#: ../data/tomboy.schemas.in.h:10
+msgid "Enable Tray Icon"
+msgstr "Activar icono de la bandeja de notificación"
+
+#: ../data/tomboy.schemas.in.h:11
+msgid "Enable WikiWord highlighting"
+msgstr "Activar resaltado de Wikipalabras"
+
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Activar listas de topos automáticas."
+
+#: ../data/tomboy.schemas.in.h:13
+msgid "Enable closing notes with escape."
+msgstr "Activar cerrar las notas con escape."
+
+#: ../data/tomboy.schemas.in.h:14
+msgid "Enable custom font"
+msgstr "Activar tipografía personalizada"
+
+#: ../data/tomboy.schemas.in.h:15
+msgid "Enable global keybindings"
+msgstr "Activar combinaciones de teclas globales"
+
+#: ../data/tomboy.schemas.in.h:16
+msgid "Enable spellchecking"
+msgstr "Activar el corrector ortográfico"
+
+#: ../data/tomboy.schemas.in.h:17
+msgid "Enable startup notes"
+msgstr "Activar notas al inicio"
+
+#: ../data/tomboy.schemas.in.h:18
+msgid "Enable the Delete Note confirmation dialog"
+msgstr "Activar o desactivar el diálogo de confirmación de Eliminar nota"
+
+#: ../data/tomboy.schemas.in.h:19
+msgid ""
+"Enable this option if you want bulleted lists to be automatic when you place "
+"- or * at the beginning of a line."
+msgstr ""
+"Active esta opción si quiere que las listas de topos sean automáticas cuando "
+"introduce un - o un *^al principio de una línea."
+
+#: ../data/tomboy.schemas.in.h:20
+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 ""
+"Active esta opción si quiere poder pegar contenido con marca de tiempo en la "
+"nota Comenzar aquí, pulsando con el botón del medio en el icono de Tomboy."
+
+#: ../data/tomboy.schemas.in.h:21
+msgid ""
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
+msgstr ""
+"Active esta opción para resaltar palabras QueSeVenAsí. Al pulsar en la "
+"palabra se creará una nota con ese nombre."
+
+#: ../data/tomboy.schemas.in.h:22
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "Tiempo de expiración FUSE (ms)"
+
+#: ../data/tomboy.schemas.in.h:23
+msgid "HTML Export All Linked Notes"
+msgstr "Exportar todas las notas enlazadas a HTML"
+
+#: ../data/tomboy.schemas.in.h:24
+msgid "HTML Export Linked Notes"
+msgstr "Exportar las notas enlazadas a HTML"
+
+#: ../data/tomboy.schemas.in.h:25
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr ""
+"Si está desactivado, se eliminará el diálogo de confirmación de «Eliminar "
+"nota»."
+
+#: ../data/tomboy.schemas.in.h:26
+msgid ""
+"If enable_custom_font is true, the font name set here will be used as the "
+"font when displaying notes."
+msgstr ""
+"Si enable_custom_font está activado, la tipografía aquí seleccionada se "
+"usará al mostrar las notas."
+
+#: ../data/tomboy.schemas.in.h:27
+msgid ""
+"If enabled, all notes that were open when Tomboy quit will automatically be "
+"reopened at startup."
+msgstr ""
+"Si está activado, todas las notas que estaban abiertas cuando se cerró "
+"Tomboy, se abrirán automáticamente al inicio."
+
+#: ../data/tomboy.schemas.in.h:28
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr ""
+"Si está activado, una nota abierta se puede cerrar pulsando la tecla escape."
+
+#: ../data/tomboy.schemas.in.h:29
+msgid ""
+"If true, Tomboy's tray icon will be displayed in the notification area. "
+"Disabling this may be useful when another application is providing the "
+"functionality of the tray icon."
+msgstr ""
+"Si es verdadero, se mostrará el icono de la bandeja de Tomboy en el área de "
+"notificación. Puede ser útil desactivarlo cuando otra aplicación proporcione "
+"la funcionalidad del icono de la bandeja."
+
+#: ../data/tomboy.schemas.in.h:30
+msgid ""
+"If true, misspellings will be underlined in red, and correct spelling "
+"suggestions shown in the right-click menu."
+msgstr ""
+"Si está activado, las faltas de ortografía se subrayarán en rojo, y pulsando "
+"con el botón derecho del ratón se mostrarán sugerencias."
+
+#: ../data/tomboy.schemas.in.h:31
+msgid ""
+"If true, the desktop-global keybindings set in /apps/tomboy/"
+"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
+"available from any application."
+msgstr ""
+"Si está activado, las combinaciones globales de teclas del escritorio "
+"fijadas en /apps/tomboy/global_keybindings también se activará, permitiendo "
+"al resto de aplicaciones usar las opciones útiles de Tomboy."
+
+#: ../data/tomboy.schemas.in.h:32
+msgid ""
+"If true, the font name set in custom_font_face will be used as the font when "
+"displaying notes. Otherwise the desktop default font will be used."
+msgstr ""
+"Si está activado, el nombre del conjunto de tipo en custom_font_face se "
+"usará como tipografía para mostrar las notas. De otra manera se usará la "
+"tipografía predeterminada del escritorio."
+
+#: ../data/tomboy.schemas.in.h:33
+msgid ""
+"Indicates that the Sticky Note Importer plugin has not been run, so it "
+"should run automatically the next time Tomboy starts."
+msgstr ""
+"Indica que el complemento de importador de notas adhesivas no ha sido "
+"ejecutado, así que debería ejecutarse automáticamente la próxima vez que "
+"arranque Tomboy."
+
+#: ../data/tomboy.schemas.in.h:34
+msgid ""
+"Integer determining the minimum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"Entero determinando el número mínimo de notas que mostrar en el menú de "
+"notas de Tomboy."
+
+#: ../data/tomboy.schemas.in.h:35
+msgid ""
+"Integer value indicating how frequently to perform a background sync of your "
+"notes (when sync is configured). Any value less than 1 indicates that "
+"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
+"minutes."
+msgstr ""
+"Valor entero que indica con qué frecuencia realizar una sincronización en "
+"segundo plano de sus notas (cuando la sincronización está configurada). "
+"Cualquier valor menor que 1 indica que la autosincronización está "
+"desactivada. El valor mínimo es 5. Este valor se expresa en minutos."
+
+#: ../data/tomboy.schemas.in.h:36
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific behavior when a conflict is detected, instead of prompting the "
+"user. The values map to an internal enumeration. 0 indicates that the user "
+"wishes to be prompted when a conflict occurs, so that they may handle each "
+"conflict situation on a case-by-case basis."
+msgstr ""
+"Valor entero que indica si existe una preferencia para realizar siempre una "
+"acción específica cuando se detecta un conflicto, en lugar de preguntar al "
+"usuario. Los valores denotan una enumeración interna. 0 indica que el "
+"usuario desea ser preguntado cuando suceda un conflicto, de tal forma que el "
+"usuario manejará cada situación de conflicto caso por caso."
+
+#: ../data/tomboy.schemas.in.h:37
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific link updating behavior when a note is renamed, instead of prompting "
+"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 ""
+"Valor entero que indica si existe una preferencia para actualizar "
+"específicamente un enlace cuando se renombra una nota, en lugar de preguntar "
+"al usuario. Los valores denotan una enumeración interna. 0 indica que el "
+"usuario desea que le pregunten cuando al renombrar una nota puede afectar a "
+"los enlaces existentes en otras notas. 1 indica que los enlaces se deben "
+"eliminar automáticamente. 2 indica que se debe actualizar el texto del "
+"enlace con el nuevo nombre de la nota para que siga apuntando a la nota "
+"renombrada."
+
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Última carpeta usada al exportar en HTML"
+
+#: ../data/tomboy.schemas.in.h:39
+msgid "Link Updating Behavior on Note Rename"
+msgstr "Comportamiento al actualizar un enlace al renombrar una nota"
+
+#: ../data/tomboy.schemas.in.h:40
+msgid "List of pinned notes."
+msgstr "Lista de notas pinchadas."
+
+#: ../data/tomboy.schemas.in.h:41
+msgid ""
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
+msgstr ""
+"Número máximo de caracteres del título de la nota que mostrar en la bandeja "
+"de Tomboy o en el menú de la miniaplicación de notas del panel."
+
+#: ../data/tomboy.schemas.in.h:42
+msgid "Maximum note title length to show in tray menu."
+msgstr ""
+"Longitud máxima del título de la nota que mostrar en el menú de la bandeja."
+
+#: ../data/tomboy.schemas.in.h:43
+msgid "Minimum number of notes to show in menu"
+msgstr "Número mínimo de notas que mostrar en el menú"
+
+#: ../data/tomboy.schemas.in.h:44
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr ""
+"Comportamiento predeterminado para conflictos de sincronización de notas"
+
+#: ../data/tomboy.schemas.in.h:45
+msgid "Open Recent Changes"
+msgstr "Abrir cambios recientes"
+
+#: ../data/tomboy.schemas.in.h:46
+msgid "Open Search Dialog"
+msgstr "Abrir el cuadro de diálogo de buscar"
+
+#: ../data/tomboy.schemas.in.h:47
+msgid "Open Start Here"
+msgstr "Abrir comenzar aquí"
+
+#: ../data/tomboy.schemas.in.h:48
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr ""
+"Ruta en el servidor SSH a la carpeta de sincronización de Tomboy (opcional)."
+
+#: ../data/tomboy.schemas.in.h:49
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr ""
+"Ruta al servidor de sincronización cuando se use el complemento del servicio "
+"de sincronización de sistema de archivos."
+
+#: ../data/tomboy.schemas.in.h:50
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "Carpeta de sincronización remota SSHFS"
+
+#: ../data/tomboy.schemas.in.h:51
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "Nombre de usuario de la sincronización remota SSHFS"
+
+#: ../data/tomboy.schemas.in.h:52
+msgid "SSHFS Synchronization Server Port"
+msgstr "Puerto del servidor de sincronización remoto SSHFS"
+
+#: ../data/tomboy.schemas.in.h:53
+msgid "SSHFS Synchronization Server URL"
+msgstr "URL del servidor de sincronización remota SSHFS"
+
+#: ../data/tomboy.schemas.in.h:54
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Altura guardada de la ventana «Buscar todas las notas»"
+
+#: ../data/tomboy.schemas.in.h:55
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Posición horizontal guardada de la ventana «Buscar todas las notas»"
+
+#: ../data/tomboy.schemas.in.h:56
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Posición vertical guardada de la ventana «Buscar todas las notas»"
+
+#: ../data/tomboy.schemas.in.h:57
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Anchura guardada de la ventana «Buscar todas las notas»"
+
+#: ../data/tomboy.schemas.in.h:58
+msgid "Selected Synchronization Service Addin"
+msgstr "Seleccione el complemento del servicio de sincronización"
+
+#: ../data/tomboy.schemas.in.h:59
+msgid "Set to TRUE to activate"
+msgstr "Establecer a «TRUE» para activar"
+
+#: ../data/tomboy.schemas.in.h:60
+msgid "Show applet menu"
+msgstr "Mostrar el menú de miniaplicaciones"
+
+#: ../data/tomboy.schemas.in.h:61
+msgid "Start Here Note"
+msgstr "Nota «Comenzar aquí»"
+
+#: ../data/tomboy.schemas.in.h:62
+msgid "Sticky Note Importer First Run"
+msgstr "Primera ejecución del importador de notas adhesivas"
+
+#: ../data/tomboy.schemas.in.h:63
+msgid "Synchronization Client ID"
+msgstr "ID del cliente de sincronización"
+
+#: ../data/tomboy.schemas.in.h:64
+msgid "Synchronization Local Server Path"
+msgstr "Ruta al servidor local de sincronización"
+
+#: ../data/tomboy.schemas.in.h:65
+msgid "The date format that is used for the timestamp."
+msgstr "El formato de la fecha que se usa para la marca de tiempo."
+
+#: ../data/tomboy.schemas.in.h:66
+msgid ""
+"The global keybinding for creating and displaying a new Note. The format "
+"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
+"parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
+msgstr ""
+"Combinación de teclas global para crear y mostrar una nota nueva. El formato "
+"sería \"<Control>a\" o \"<Shift><Alt>F1\". El analizador "
+"léxico es bastante tolerante y permite letras mayúsculas o minúsculas, y "
+"abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". Si activa la "
+"opción de cadena especial \"disabled\" (desactivada) no habrá combinación de "
+"teclas para esta acción."
+
+#: ../data/tomboy.schemas.in.h:67
+msgid ""
+"The global keybinding for opening the \"Start Here\" note. The format looks "
+"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"Combinación de teclas global para abrir «Comenzar aquí». El formato sería "
+"\"<Control>a\" o \"<Shift><Alt>F1\". El analizador léxico "
+"es bastante tolerante y permite letras mayúsculas o minúsculas, y "
+"abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". Si activa la "
+"opción de cadena especial \"disabled\" (desactivada) no habrá combinación de "
+"teclas para esta acción."
+
+#: ../data/tomboy.schemas.in.h:68
+msgid ""
+"The global keybinding for opening the Note Search dialog. The format looks "
+"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"Combinación de teclas global para abrir el diálogo de buscar notas. El "
+"formato sería \"<Control>a\" o \"<Shift><Alt>F1\". El "
+"analizador léxico es bastante tolerante y permite letras mayúsculas o "
+"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
+"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
+"combinación de teclas para esta acción."
+
+#: ../data/tomboy.schemas.in.h:69
+msgid ""
+"The global keybinding for opening the Recent Changes dialog. The format "
+"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
+"parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
+msgstr ""
+"Combinación de teclas global para abrir el diálogo de cambios recientes. El "
+"formato sería \"<Control>a\" o \"<Shift><Alt>F1\". El "
+"analizador léxico es bastante tolerante y permite letras mayúsculas o "
+"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
+"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
+"combinación de teclas para esta acción."
+
+#: ../data/tomboy.schemas.in.h:70
+msgid ""
+"The global keybinding for showing the Tomboy applet's menu. The format looks "
+"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"Combinación de teclas global para mostrar el menú de miniaplicaciones de "
+"Tomboy. El formato sería \"<Control>a\" o \"<Shift><Alt>F1"
+"\". El analizador léxico es bastante tolerante y permite letras mayúsculas o "
+"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
+"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
+"combinación de teclas para esta acción."
+
+#: ../data/tomboy.schemas.in.h:71
+msgid "The handler for \"note://\" URLs"
+msgstr "El manejador para las URL «note://»"
+
+#: ../data/tomboy.schemas.in.h:72
+msgid ""
+"The last directory a note was exported to using the Export To HTML plugin."
+msgstr ""
+"La última carpeta donde se exportó una nota usando el complemento Exportar a "
+"HTML."
+
+#: ../data/tomboy.schemas.in.h:73
+msgid ""
+"The last setting for the 'Export linked notes' checkbox in the Export to "
+"HTML plugin."
+msgstr ""
+"Las última casilla de preferencias para «Exportar las notas enlazadas a HTML» "
+"en el complemento Exportar a HTML."
+
+#: ../data/tomboy.schemas.in.h:74
+msgid ""
+"The last setting for the 'Include all other linked notes' checkbox in the "
+"Export to HTML plugin. This setting is used in conjunction with the 'HTML "
+"Export Linked Notes' setting and is used to specify whether all notes (found "
+"recursively) should be included during an export to HTML."
+msgstr ""
+"El último ajuste para la casilla de «Incluir todas las notas enlazadas» en el "
+"complemento de exportar a HTML. Esta opción se usa junto con los ajustes de "
+"«Exportar las notas enlazadas a HTML» y se usa para especificar si todas las "
+"notas (encontradas recursivamente) deberían ser incluídas durante la "
+"exportación a HTML."
+
+#: ../data/tomboy.schemas.in.h:75
+msgid ""
+"The note URI of the note that should be considered the \"Start Here\" note, "
+"which is always placed at the bottom of the Tomboy note menu and also "
+"accessible by hotkey."
+msgstr ""
+"La URI de la nota que debería ser considerada como la nota «Comenzar aquí», "
+"que siempre estará al final del menú de notas de Tomboy y que también es "
+"accesible por una tecla rápida."
+
+#: ../data/tomboy.schemas.in.h:76
+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 puerto que usar al conectar con el servidor de sincronización a través de "
+"SSH. Establecido a -1 o menos si se debe usar el puerto predeterminado de "
+"SSH en su lugar."
+
+#: ../data/tomboy.schemas.in.h:77
+msgid ""
+"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
+"mount a sync share."
+msgstr ""
+"Tiempo (en milisegundos) que Tomboy debe esperar una respuesta al usar FUSE "
+"para montar una compartición sincronizada."
+
+#: ../data/tomboy.schemas.in.h:78
+msgid "Timestamp format"
+msgstr "Formato de la marca de tiempo"
+
+#: ../data/tomboy.schemas.in.h:79
+msgid "URL of SSH server containing Tomboy synchronization directory."
+msgstr ""
+"URL del servidor SSH que contiene la carpeta de sincronización de Tomboy."
+
+#: ../data/tomboy.schemas.in.h:80
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr ""
+"Identificador único para el complemento configurado del servicio de "
+"sincronización de notas."
+
+#: ../data/tomboy.schemas.in.h:81
+msgid ""
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
+msgstr ""
+"Identificador único para este cliente Tomboy, usado al comunicar con un "
+"servidor de sincronización."
+
+#: ../data/tomboy.schemas.in.h:82
+msgid ""
+"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
+"user."
+msgstr ""
+"Usar la opción wdfs «-ac» para aceptar certificados SSL sin preguntar al "
+"usuario."
+
+#: ../data/tomboy.schemas.in.h:83
+msgid "User name to use when connecting to the synchronization server via SSH."
+msgstr ""
+"Nombre de usuario que usar al conectar con el servidor de sincronización a "
+"través de SSH."
+
+#: ../data/tomboy.schemas.in.h:84
+msgid ""
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Tomboy note menu."
+msgstr ""
+"Lista separada por espacios en blanco de URI de notas para las notas que "
+"deberían aparecer en el menú de notas de Tomboy."
+
+#: ../Tomboy/ActionManager.cs:127
+msgid "_File"
+msgstr "_Archivo"
+
+#: ../Tomboy/ActionManager.cs:130
+msgid "_New"
+msgstr "_Nueva"
+
+#: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
+msgid "Create a new note"
+msgstr "Crear una nota nueva"
+
+#: ../Tomboy/ActionManager.cs:134
+msgid "_Open..."
+msgstr "_Abrir…"
+
+#: ../Tomboy/ActionManager.cs:135
+msgid "Open the selected note"
+msgstr "Abrir la nota seleccionada"
+
+#: ../Tomboy/ActionManager.cs:138
+msgid "_Delete"
+msgstr "_Eliminar"
+
+#: ../Tomboy/ActionManager.cs:139
+msgid "Delete the selected note"
+msgstr "Eliminar la nota seleccionada"
+
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: ../Tomboy/ActionManager.cs:143
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
+msgid "_Quit"
+msgstr "_Salir"
+
+#: ../Tomboy/ActionManager.cs:147
+msgid "Quit Tomboy"
+msgstr "Salir de Tomboy"
+
+#: ../Tomboy/ActionManager.cs:150
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
+msgid "Tomboy Preferences"
+msgstr "Preferencias de Tomboy"
+
+#: ../Tomboy/ActionManager.cs:160
+msgid "_Contents"
+msgstr "Índ_ice"
+
+#: ../Tomboy/ActionManager.cs:161
+msgid "Tomboy Help"
+msgstr "Ayuda de Tomboy"
+
+#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
+msgid "About Tomboy"
+msgstr "Acerca de Tomboy"
+
+#: ../Tomboy/ActionManager.cs:168
+msgid "TrayIcon"
+msgstr "Icono del área de notificación"
+
+#: ../Tomboy/ActionManager.cs:171
+msgid "Create _New Note"
+msgstr "Crear una nota _nueva"
+
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
+msgid "_Search All Notes"
+msgstr "_Buscar en todas las notas"
+
+#: ../Tomboy/ActionManager.cs:176
+msgid "Open the Search All Notes window"
+msgstr "Abrir la ventana de Búsqueda en todas las notas"
+
+#: ../Tomboy/ActionManager.cs:180
+msgid "Start synchronizing notes"
+msgstr "Comenzar a sincronizar las notas"
+
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avanzadas"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr ""
+"Número mínimo de notas que mostrar en la lista de recientes (máximo 18)"
+
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
+msgid "What links here?"
+msgstr "¿Qué enlaza aquí?"
+
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
+msgid "(none)"
+msgstr "(ninguna)"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:23
+msgid ""
+"You can use any bugzilla just by dragging links into notes.  If you want a "
+"special icon for certain hosts, add them here."
+msgstr ""
+"Puede usar cualquier bugzilla simplemente arrastrando los enlaces en las "
+"notas. Si quiere un icono especial para algunos servidores, añádalos aquí."
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
+msgid "Host Name"
+msgstr "Nombre del servidor"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:58
+msgid "Icon"
+msgstr "Icono"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:176
+msgid "Select an icon..."
+msgstr "Seleccione un icono…"
+
+#. Extra Widget
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:191
+msgid "_Host name:"
+msgstr "Nombre del _equipo:"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:220
+msgid "No host name specified"
+msgstr "No se especificó ningún nombre para el equipo"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
+msgid "You must specify the Bugzilla host name to use with this icon."
+msgstr ""
+"Debe especificar el nombre del equipo de Bugzilla para usar con este icono."
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
+msgid "Error saving icon"
+msgstr "Error al guardar el icono"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
+msgid "Could not save the icon file."
+msgstr "No se pudo guardar el icono de archivo."
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
+msgid "Really remove this icon?"
+msgstr "¿Desea quitar este icono?"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
+msgid "If you remove an icon it is permanently lost."
+msgstr "Si borra un icono se perderá permanentemente."
+
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "No se puede abrir el correo-e"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destino para la exportación a HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Exportar las notas enlazadas"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Incluir todas las notas enlazadas"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
+msgid "Export to HTML"
+msgstr "Exportar a HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#, csharp-format
+msgid "Your note was exported to \"{0}\"."
+msgstr "Su nota se exportó a «{0}»."
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+msgid "Note exported successfully"
+msgstr "Nota exportada con éxito"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
+msgid "Access denied."
+msgstr "Acceso denegado."
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
+msgid "Folder does not exist."
+msgstr "La carpeta no existe."
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#, csharp-format
+msgid "Could not save the file \"{0}\""
+msgstr "No se pudo guardar el archivo «{0}»"
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
+msgid "_Folder Path:"
+msgstr "Ruta de la ca_rpeta:"
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
+msgid "Select Synchronization Folder..."
+msgstr "Seleccione la carpeta para sincronizar…"
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
+msgid "Folder path field is empty."
+msgstr "El campo de la ruta de la carpeta está vacío."
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
+msgid ""
+"Specified folder path does not exist, and Tomboy was unable to create it."
+msgstr "La ruta de la carpeta especificada no existe y Tomboy no pudo crearla."
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
+msgid "Local Folder"
+msgstr "Carpeta local"
+
+#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
+msgid "Fixed Wid_th"
+msgstr "Anchura _fija"
+
+#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
+#, csharp-format
+msgid "Cannot contact '{0}'"
+msgstr "No se puede contactar con «{0}»"
+
+#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
+#, csharp-format
+msgid "Error running gaim-remote: {0}"
+msgstr "Error al ejecutar gaim-remote: {0}"
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs:29
+msgid "Insert Timestamp"
+msgstr "Insertar marca de tiempo"
+
+#. initial newline
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
+msgid "dddd, MMMM d, h:mm tt"
+msgstr "dddd, d MMMM, HH:mm"
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
+msgid "Choose one of the predefined formats or use your own."
+msgstr "Elija uno de los formatos predefinidos o use uno propio."
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
+msgid "Use _Selected Format"
+msgstr "Usar el formato _seleccionado"
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:87
+msgid "_Use Custom Format"
+msgstr "_Usar tipografía personalizada"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:10
+msgid "Today: Template"
+msgstr "Hoy: Plantilla"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:12
+msgid "Today: "
+msgstr "Hoy: "
+
+#. Format: "Today: Friday, July 01 2005"
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
+msgid "dddd, MMMM d yyyy"
+msgstr "dddd, d MMMM yyyy"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:43
+msgid "Tasks"
+msgstr "Tareas"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:44
+msgid "Appointments"
+msgstr "Citas"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
+msgid ""
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
+msgstr ""
+"Cambiar la nota <b>Hoy: plantilla</b> para personalizar el texto que las "
+"nuevas notas «Hoy» tendrán."
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
+msgid "_Open Today: Template"
+msgstr "_Abrir hoy: Plantilla"
+
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:52
+msgid "Print"
+msgstr "Imprimir"
+
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:82
+msgid "Error printing note"
+msgstr "Error al imprimir la nota"
+
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:223
+#, csharp-format
+msgid "Page {0} of {1}"
+msgstr "Página {0} de {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:242
+msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
+msgstr "dddd dd/MM/yyyy, hh:mm:ss"
+
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Quitar enlaces rotos"
+
+#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
+msgid "Add a sketch"
+msgstr "Añadir un dibujo"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
+msgid "Se_rver:"
+msgstr "Se_rvidor:"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
+msgid "User_name:"
+msgstr "_Usuario:"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
+msgid "_Folder Path (optional):"
+msgstr "Ruta de la ca_rpeta (opcional):"
+
+#. Text for label describing setup required for SSH sync addin to work
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
+msgid ""
+"SSH synchronization requires an existing SSH key for this server and user, "
+"added to a running SSH daemon."
+msgstr ""
+"La sincronización SSH requiere una clave SSH existente para este servidor y "
+"usuario que esté añadida al demonio SSH en ejecución."
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
+msgid "Server or username field is empty."
+msgstr "El campo del usuario o del servidor está vacío."
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
+msgid ""
+"Timeout connecting to server. Please ensure that your SSH key has been added "
+"to a running SSH daemon."
+msgstr ""
+"Se superó el tiempo de espera máximo al conectar con el servidor. Asegúrese "
+"de que su clave SSH se ha añadido al demonio SSH en ejecución."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
+msgid "Import from Sticky Notes"
+msgstr "Importar de notas adhesivas"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:133
+msgid "No Sticky Notes found"
+msgstr "No se encontraron notas adhesivas"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
+#, csharp-format
+msgid "No suitable Sticky Notes file was found at \"{0}\"."
+msgstr "No se ha encontrado ningún archivo de Notas Adhesivas en «{0}»."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
+msgid "Sticky Notes import completed"
+msgstr "Importación de notas adhesivas completada"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
+#, csharp-format
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "Se importó con éxito <b>{0}</b> de <b>{1}</b> nota adhesiva."
+msgstr[1] "Se importaron con éxito <b>{0}</b> de <b>{1}</b> notas adhesivas."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
+msgid "Untitled"
+msgstr "Sin título"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
+msgid "Sticky Note: "
+msgstr "Nota adhesiva: "
+
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:62
+msgid "Tasque"
+msgstr "Tasque"
+
+#. Note to translators: "All" here must match up with the "All"
+#. category translation in Tasque for this to work properly.  "All"
+#. is used here to allow Tasque to decide which default category
+#. will be used to create the new task.
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:86
+msgid "All"
+msgstr "Todo"
+
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:145
+msgid "--- Tasque is not running ---"
+msgstr "--- Tasque no se está ejecutando ---"
+
+#: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
+msgid "_Underline"
+msgstr "_Subrayado"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
+msgid "_Password:"
+msgstr "Contrase_ña:"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
+msgid "URL, username, or password field is empty."
+msgstr "El campo URL, usuario o contraseña está vacío."
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
+msgid ""
+"There was an error connecting to the server.  This may be caused by using an "
+"incorrect user name and/or password."
+msgstr ""
+"Ocurrió un error al conectar con el servidor. Esto pudo ocurrir por usar un "
+"nombre de usuario y/o contraseña incorrectos."
+
+#. TODO: If the above fails (no keyring daemon), save all but password
+#. to GConf, and notify user.
+#. 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:268
+msgid ""
+"Saving configuration to the GNOME keyring failed with the following message:"
+msgstr ""
+"Falló al guardar la configuración al depósito de claves con el siguiente "
+"mensaje:"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
+msgid "Connect to Server"
+msgstr "Conectar al servidor"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
+msgid "Connected"
+msgstr "Conectado"
+
+#. Translators: The web service supporting Tomboy WebSync is not responding as expected
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
+msgid "Server not responding. Try again later."
+msgstr "El servidor no está respondiendo. Inténtelo de nuevo más tarde."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
+msgid "Authorization Failed, Try Again"
+msgstr "Falló la autorización. Inténtelo de nuevo."
+
+#. Translators: Title of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
+msgid "Tomboy Web Authorization Successful"
+msgstr "Autorización web de Tomboy satisfactoria"
+
+#. Translators: Body of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
+msgid ""
+"Please return to the Tomboy Preferences window and press Save to start "
+"synchronizing."
+msgstr ""
+"Regrese a la ventana de preferencias de Tomboy y pulse guardar para iniciar "
+"la sincronización."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
+msgid "Connected. Press Save to start synchronizing"
+msgstr "Conectado. Pulse Guardar para iniciar la sincronización."
+
+#. Translators: The user must take action in their web browser to continue the authorization process
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
+msgid "Authorizing in browser (Press to reset connection)"
+msgstr "Autorizar en el navegador (pulse para reiniciar la conexión)"
+
+#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
+msgid "Set the default browser and try again"
+msgstr "Establecer el navegador predeterminado e intentarlo de nuevo"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Web de Tomboy"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Exportar todas las notas en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Comenzar a exportar las notas en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Exportar el cuaderno de notas seleccionado en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Comenzar a exportar el cuaderno en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Herramientas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exportar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Exportar sus notas."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Exportar todas las notas en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Exportar el cuaderno de notas seleccionado en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Exportado en {0} de todas las notas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "No se pudo exportar, acceso denegado."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "No se pudo exportar, la carpeta no existe."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "No se pudo exportar: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Error desconocido."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Notas sin archivar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Sus notas se exportaron a «{0}»."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Notas exportadas correctamente"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "No se pudieron guardar los archivos «{0}»"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Crear carpeta de destino para exportar {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
+msgid "Search All Notes"
+msgstr "Buscar en todas las notas"
+
+#. 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:106
+msgid "Create New Note"
+msgstr "Crear una nota nueva"
+
+#: ../Tomboy/JumpListManager.cs:136
+#, csharp-format
+msgid "{0} (new)"
+msgstr "{0} (nueva)"
+
+#: ../Tomboy/JumpListManager.cs:158
+msgid "Recent Notes"
+msgstr "Notas recientes"
+
+#. Translators: This is the name of "Window" menu in the Mac menubar
+#: ../Tomboy/MacApplication.cs:215
+msgid "_Window"
+msgstr "_Ventana"
+
+#: ../Tomboy/MacApplication.cs:234
+msgid "Preferences..."
+msgstr "Preferencias…"
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:24
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
+msgid "Create a new notebook"
+msgstr "Crear un cuaderno de notas nuevo"
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:25
+msgid "Type the name of the notebook you'd like to create."
+msgstr "Escriba el nombre del cuaderno de notas que desea crear."
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:31
+msgid "N_otebook name:"
+msgstr "Nombre del cuaderno de n_otas:"
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:45
+msgid "Name already taken"
+msgstr "El nombre ya existe"
+
+#. Translation note: This is the Create button in the Create
+#. New Note Dialog.
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:59
+msgid "C_reate"
+msgstr "C_rear"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
+msgid "Note_books"
+msgstr "Cua_dernos de notas"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:69
+msgid "Create a new note in a notebook"
+msgstr "Crear una nota nueva en un cuaderno de notas"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:52
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:223
+msgid "New Note_book..."
+msgstr "Cua_derno de notas nuevo…"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:56
+msgid "_New Note"
+msgstr "Nota _nueva"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:57
+msgid "Create a new note in this notebook"
+msgstr "Crear una nota nueva en éste portátil"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:60
+msgid "_Open Template Note"
+msgstr "_Abrir la nota de plantilla"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:61
+msgid "Open this notebook's template note"
+msgstr "Abrir la nota de plantilla de este cuaderno de notas"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:64
+msgid "Delete Note_book"
+msgstr "Eliminar cua_derno de notas"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:65
+msgid "Delete the selected notebook"
+msgstr "Eliminar el cuaderno de notas seleccionado"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
+#: ../Tomboy/RecentChanges.cs:276
+msgid "Notebooks"
+msgstr "Cuadernos de notas"
+
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Plantilla del cuaderno de notas de {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nota nueva"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Todas las notas"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
+msgid "Really delete this notebook?"
+msgstr "¿Desea eliminar este cuaderno de notas?"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
+msgid ""
+"The notes that belong to this notebook will not be deleted, but they will no "
+"longer be associated with this notebook.  This action cannot be undone."
+msgstr ""
+"Las notas que pertenecen a este cuaderno de notas no se eliminarán, pero ya "
+"no estarán asociadas a este cuaderno de notas. Esta acción no se puede "
+"deshacer."
+
+#: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
+msgid "No notebook"
+msgstr "Sin cuadernos de notas"
+
+#. Translators should preserve the "{0}" in the following
+#. string.  After being formatted for a notebook named,
+#. "Meetings", for example, the resultant string would be:
+#. New "Meetings" Note
+#: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
+#, csharp-format
+msgid "New \"{0}\" Note"
+msgstr "Nota nueva de «{0}»"
+
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
+msgid "Place this note into a notebook"
+msgstr "Meter esta nota en un cuaderno de notas"
+
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
+msgid "Notebook"
+msgstr "Cuaderno de notas"
+
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
+msgid "_New notebook..."
+msgstr "Cuaderno de _notas nuevo…"
+
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nota nueva {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "¿Quiere eliminar «{0}»?"
+
+#: ../Tomboy/Note.cs:1610
+#, csharp-format
+msgid "Really delete this {0} note?"
+msgid_plural "Really delete these {0} notes?"
+msgstr[0] "¿Desea eliminar esta nota?"
+msgstr[1] "¿Desea eliminar estas {0} notas?"
+
+#: ../Tomboy/Note.cs:1621
+msgid "If you delete a note it is permanently lost."
+msgstr "Si borra esta nota se perderá permanentemente."
+
+#: ../Tomboy/Note.cs:1655
+#, 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 {1}."
+msgstr ""
+"Ocurrió un error al guardar sus notas. Compruebe que tiene suficiente "
+"espacio en disco y que tiene los permisos apropiados en {0}. Puede encontrar "
+"detalles sobre el error en {1}."
+
+#: ../Tomboy/Note.cs:1671
+msgid "Error saving note data."
+msgstr "Error al guardar los datos de la nota"
+
+#. New Note Template
+#. Translators: This is 'New Note' Template, not New 'Note Template'
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
+msgid "New Note Template"
+msgstr "Plantilla de Nota nueva"
+
+#. Create migration notification note
+#. Translators: The title of the data migration note
+#: ../Tomboy/NoteManager.cs:147
+msgid "Your Notes Have Moved!"
+msgstr "Sus notas se han movido"
+
+#. 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 ""
+"En la última versión de Tomboy se han movido sus archivos de notas. "
+"Probablemente nunca le ha importado dónde se guardan sus notas y, si todavía "
+"no le importa, siga adelante y <bold>borre esta nota</bold>.\n"
+"\n"
+"Su antigua carpeta de notas está sana y salva en <link:url>{0}</link:url>. "
+"Si vuelve a una versión anterior de Tomboy, éste buscará las notas ahí.\n"
+"\n"
+"Pero se han copiado sus notas y su configuración en las carpetas nuevas que "
+"serán las que se usen a partir de ahora, en:\n"
+"\n"
+"<list><list-item dir=\"ltr\">Las notas las puede encontrar en <link:url>{1}</"
+"link:url>\n"
+"</list-item><list-item dir=\"ltr\">La configuración está en <link:url>{2}</"
+"link:url>\n"
+"</list-item><list-item dir=\"ltr\">Puede instalar complementos en <link:url>"
+"{3}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">Los archivos de registro se pueden "
+"encontrar en <link:url>{4}</link:url></list-item></list>\n"
+"\n"
+"Hasta luego."
+
+#: ../Tomboy/NoteManager.cs:265
+msgid ""
+"<note-content>Start Here\n"
+"\n"
+"<bold>Welcome to Tomboy!</bold>\n"
+"\n"
+"Use this \"Start Here\" note to begin organizing your ideas and thoughts.\n"
+"\n"
+"You can create new notes to hold your ideas by selecting the \"Create New "
+"Note\" item from the Tomboy Notes menu in your GNOME Panel. Your note will "
+"be saved automatically.\n"
+"\n"
+"Then organize the notes you create by linking related notes and ideas "
+"together!\n"
+"\n"
+"We've created a note called <link:internal>Using Links in Tomboy</link:"
+"internal>.  Notice how each time we type <link:internal>Using Links in "
+"Tomboy</link:internal> it automatically gets underlined?  Click on the link "
+"to open the note.</note-content>"
+msgstr ""
+"<note-content>Comenzar aquí\n"
+"\n"
+"<bold>Bienvenido a Tomboy</bold>\n"
+"\n"
+"Use esta nota «Comenzar aquí» para empezar a organizar sus ideas y "
+"pensamientos.\n"
+"\n"
+"Puede crear nuevas notas para mantener sus ideas seleccionando el elemento "
+"«Crear nota nueva» del menú de Tomboy en el panel de GNOME. Su nota se "
+"guardará automáticamente.\n"
+"\n"
+"Después organice las notas que cree enlazando las notas relacionadas y sus "
+"ideas de una forma conjunta.\n"
+"\n"
+"Hemos creado una nota llamada <link:internal>Usando enlaces en Tomboy</link:"
+"internal>. ¿Se ha dado cuenta de que cada vez que escribimos <link:"
+"internal>Usando enlaces en Tomboy</link:internal> automáticamente aparece "
+"subrayado? Pulse en el enlace para abrir la nota.</note-content>"
+
+#: ../Tomboy/NoteManager.cs:284
+msgid ""
+"<note-content>Using Links in Tomboy\n"
+"\n"
+"Notes in Tomboy can be linked together by highlighting text in the current "
+"note and clicking the <bold>Link</bold> button above in the toolbar.  Doing "
+"so will create a new note and also underline the note's title in the current "
+"note.\n"
+"\n"
+"Changing the title of a note will update links present in other notes.  This "
+"prevents broken links from occurring when a note is renamed.\n"
+"\n"
+"Also, if you type the name of another note in your current note, it will "
+"automatically be linked for you.</note-content>"
+msgstr ""
+"<note-content>Usando enlaces en Tomboy\n"
+"\n"
+"Las notas en Tomboy se pueden enlazar subrayando el texto en la nota actual "
+"y pulsando el botón <bold>Enlazar</bold> en la barra de herramientas. Al "
+"hacerlo se creará una nueva nota así como subrayar el título de la nueva "
+"nota en la nota actual.\n"
+"\n"
+"Cambiar el título de una nota hará que se actualicen los enlaces presentes "
+"en otras notas. Esto previene que aparezcan enlaces rotos cuando se renombra "
+"una nota.\n"
+"\n"
+"Además, si escribe el nombre de otra nota en su nota actual, se enlazará "
+"automáticamente.</note-content>"
+
+#. Attempt to find an existing Start Here note
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
+msgid "Start Here"
+msgstr "Comenzar aquí"
+
+#: ../Tomboy/NoteManager.cs:304
+msgid "Using Links in Tomboy"
+msgstr "Usando los enlaces en Tomboy"
+
+#. Use a simple "Describe..." body and highlight
+#. it so it can be easily overwritten
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
+msgid "Describe your new note here."
+msgstr "Describa aquí su nota nueva."
+
+#: ../Tomboy/NoteRenameDialog.cs:50
+msgid "Rename Note Links?"
+msgstr "¿Renombrar los enlaces de la nota?"
+
+#: ../Tomboy/NoteRenameDialog.cs:56
+msgid "_Rename Links"
+msgstr "Renom_brar enlaces"
+
+#: ../Tomboy/NoteRenameDialog.cs:59
+msgid "_Don't Rename Links"
+msgstr "_No renombrar enlaces"
+
+#: ../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 ""
+"Renombrar enlaces en otras notas de «<span underline=\"single\">{0}</span>» a "
+"«<span underline=\"single\">{1}</span>»?\n"
+"\n"
+"Si no renombra los enlaces, no apuntarán a nada."
+
+#: ../Tomboy/NoteRenameDialog.cs:83
+msgid "Rename Links"
+msgstr "Renombrar enlaces"
+
+#: ../Tomboy/NoteRenameDialog.cs:95
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "Título de la nota"
+
+#. Translators: This button causes all notes in the list to be selected
+#: ../Tomboy/NoteRenameDialog.cs:118
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#. Translators: This button causes all notes in the list to be unselected
+#: ../Tomboy/NoteRenameDialog.cs:127
+msgid "Select None"
+msgstr "No seleccionar nada"
+
+#: ../Tomboy/NoteRenameDialog.cs:144
+msgid "Ad_vanced"
+msgstr "A_vanzado"
+
+#: ../Tomboy/NoteRenameDialog.cs:147
+msgid "Always show this _window"
+msgstr "Mostrar siempre esta _ventana"
+
+#: ../Tomboy/NoteRenameDialog.cs:155
+msgid "Never rename _links"
+msgstr "No renombrar nunca _enlaces"
+
+#: ../Tomboy/NoteRenameDialog.cs:163
+msgid "Alwa_ys rename links"
+msgstr "Siempre renombrar en_laces"
+
+#: ../Tomboy/NoteWindow.cs:59
+msgid "Find in This Note"
+msgstr "Buscar en esta nota"
+
+#: ../Tomboy/NoteWindow.cs:366
+msgid "_Link to New Note"
+msgstr "_Enlazar a una nota nueva"
+
+#: ../Tomboy/NoteWindow.cs:378
+msgid "Te_xt"
+msgstr "_Texto"
+
+#: ../Tomboy/NoteWindow.cs:386
+msgid "_Find in This Note"
+msgstr "_Buscar en esta nota"
+
+#: ../Tomboy/NoteWindow.cs:401
+msgid "Clos_e All Notes"
+msgstr "C_errar todas las notas"
+
+#: ../Tomboy/NoteWindow.cs:441
+msgid "Search"
+msgstr "Buscar"
+
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Buscar sus notas"
+
+#: ../Tomboy/NoteWindow.cs:457
+msgid "Link"
+msgstr "Enlazar"
+
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Enlazar el texto seleccionado a una nota nueva"
+
+#: ../Tomboy/NoteWindow.cs:477
+msgid "_Text"
+msgstr "_Texto"
+
+#: ../Tomboy/NoteWindow.cs:482
+msgid "Set properties of text"
+msgstr "Establecer las propiedades del texto"
+
+#: ../Tomboy/NoteWindow.cs:487
+msgid "T_ools"
+msgstr "_Herramientas"
+
+#: ../Tomboy/NoteWindow.cs:491
+msgid "Use tools on this note"
+msgstr "Usar las herramientas en esta nota"
+
+#: ../Tomboy/NoteWindow.cs:499
+msgid "Delete this note"
+msgstr "Eliminar esta nota"
+
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
+msgid "Synchronize Notes"
+msgstr "Sincronizar las notas"
+
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Esta nota es una plantilla de nota. Determina el contenido predeterminado de "
+"las notas normales y no se mostrará en el menú de notas o la ventana de "
+"búsqueda."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Convertir en una nota normal"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Guardar tama_ño"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Guardar se_lección"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Guardar _título"
+
+#: ../Tomboy/NoteWindow.cs:639
+msgid "_Find..."
+msgstr "_Buscar…"
+
+#: ../Tomboy/NoteWindow.cs:650
+msgid "Find _Next"
+msgstr "Buscar _siguiente"
+
+#: ../Tomboy/NoteWindow.cs:663
+msgid "Find _Previous"
+msgstr "Buscar _anterior"
+
+#: ../Tomboy/NoteWindow.cs:751
+msgid "Cannot create note"
+msgstr "No se puede crear la nota"
+
+#: ../Tomboy/NoteWindow.cs:832
+msgid "_Find:"
+msgstr "_Buscar:"
+
+#: ../Tomboy/NoteWindow.cs:843
+msgid "_Previous"
+msgstr "_Anterior"
+
+#: ../Tomboy/NoteWindow.cs:852
+msgid "_Next"
+msgstr "_Siguiente"
+
+#: ../Tomboy/NoteWindow.cs:1335
+msgid "_Bold"
+msgstr "_Negrita"
+
+#: ../Tomboy/NoteWindow.cs:1347
+msgid "_Italic"
+msgstr "_Cursiva"
+
+#: ../Tomboy/NoteWindow.cs:1359
+msgid "_Strikeout"
+msgstr "_Tachado"
+
+#: ../Tomboy/NoteWindow.cs:1371
+msgid "_Highlight"
+msgstr "_Resaltado"
+
+#: ../Tomboy/NoteWindow.cs:1384
+msgid "Font Size"
+msgstr "Tamaño de la tipografía"
+
+#: ../Tomboy/NoteWindow.cs:1387
+msgid "_Normal"
+msgstr "_Normal"
+
+#: ../Tomboy/NoteWindow.cs:1404
+msgid "Hu_ge"
+msgstr "_Enorme"
+
+#: ../Tomboy/NoteWindow.cs:1412
+msgid "_Large"
+msgstr "_Grande"
+
+#: ../Tomboy/NoteWindow.cs:1420
+msgid "S_mall"
+msgstr "_Pequeña"
+
+#: ../Tomboy/NoteWindow.cs:1429
+msgid "Increase Font Size"
+msgstr "Aumentar el tamaño de la tipografía"
+
+#: ../Tomboy/NoteWindow.cs:1447
+msgid "Decrease Font Size"
+msgstr "Reducir el tamaño de la tipografía"
+
+#: ../Tomboy/NoteWindow.cs:1467
+msgid "Bullets"
+msgstr "Topos"
+
+#: ../Tomboy/PreferencesDialog.cs:81
+msgid "Editing"
+msgstr "Edición"
+
+#: ../Tomboy/PreferencesDialog.cs:84
+msgid "Hotkeys"
+msgstr "Teclas rápidas"
+
+#: ../Tomboy/PreferencesDialog.cs:86
+msgid "Synchronization"
+msgstr "Sincronización"
+
+#: ../Tomboy/PreferencesDialog.cs:88
+msgid "Add-ins"
+msgstr "Complementos"
+
+#: ../Tomboy/PreferencesDialog.cs:174
+msgid "_Spell check while typing"
+msgstr "Corrección _ortográfica al escribir"
+
+#: ../Tomboy/PreferencesDialog.cs:183
+msgid ""
+"Misspellings will be underlined in red, with correct spelling suggestions "
+"shown in the context menu."
+msgstr ""
+"Si está activado, las faltas de ortografía se subrayarán en rojo, mostrando "
+"las sugerencias de corrección en el menú contextual."
+
+#. WikiWords...
+#: ../Tomboy/PreferencesDialog.cs:194
+msgid "Highlight _WikiWords"
+msgstr "Resaltar _wikipalabras"
+
+#: ../Tomboy/PreferencesDialog.cs:202
+msgid ""
+"Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
+"word will create a note with that name."
+msgstr ""
+"Activar esta opción para resaltar palabras <b>QueSeVenAsí</b>. Al pulsar en "
+"la palabra se creará una nota con ese nombre."
+
+#. Auto bulleted list
+#: ../Tomboy/PreferencesDialog.cs:209
+msgid "Enable auto-_bulleted lists"
+msgstr "Activar listas de _topos automáticos"
+
+#: ../Tomboy/PreferencesDialog.cs:218
+msgid "Use custom _font"
+msgstr "Usar tipogra_fía personalizada"
+
+#: ../Tomboy/PreferencesDialog.cs:236
+msgid "When renaming a linked note: "
+msgstr "Al renombrar una nota enlazada: "
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Ask me what to do"
+msgstr "Preguntarme qué hacer"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Never rename links"
+msgstr "No renombrar nunca los enlaces"
+
+#: ../Tomboy/PreferencesDialog.cs:241
+msgid "Always rename links"
+msgstr "Siempre renombrar los enlaces"
+
+#: ../Tomboy/PreferencesDialog.cs:261
+msgid ""
+"Use the new note template to specify the text that should be used when "
+"creating a new note."
+msgstr ""
+"Use la plantilla de la nota nueva para especificar el texto que se debe usar "
+"al crear una nota nueva."
+
+#: ../Tomboy/PreferencesDialog.cs:270
+msgid "Open New Note Template"
+msgstr "Abrir la plantilla Nota nueva"
+
+#. Hotkeys...
+#: ../Tomboy/PreferencesDialog.cs:327
+msgid "Listen for _Hotkeys"
+msgstr "_Escuchar las teclas rápidas"
+
+#: ../Tomboy/PreferencesDialog.cs:336
+msgid ""
+"Hotkeys allow you to quickly access your notes from anywhere with a "
+"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
+"Alt>N</b>"
+msgstr ""
+"Las teclas rápidas le permiten acceder rápidamente a sus notas desde "
+"cualquier parte con una pulsación de tecla. Ejemplo de teclas rápidas: "
+"<b><Control><Mayús>F11</b>, <b><Alt>N</b>"
+
+#. Show notes menu keybinding...
+#: ../Tomboy/PreferencesDialog.cs:356
+msgid "Show notes _menu"
+msgstr "Mostrar el _menú de notas"
+
+#. Open Start Here keybinding...
+#: ../Tomboy/PreferencesDialog.cs:373
+msgid "Open \"_Start Here\""
+msgstr "Abrir «Comen_zar aquí»"
+
+#. Create new note keybinding...
+#: ../Tomboy/PreferencesDialog.cs:390
+msgid "Create _new note"
+msgstr "Crear una nota _nueva"
+
+#. Open Search All Notes window keybinding...
+#: ../Tomboy/PreferencesDialog.cs:407
+msgid "Open \"Search _All Notes\""
+msgstr "Abrir «Buscar en _todas las notas»"
+
+#: ../Tomboy/PreferencesDialog.cs:434
+msgid "Ser_vice:"
+msgstr "_Servicio:"
+
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
+msgid "Not configurable"
+msgstr "No configurable"
+
+#: ../Tomboy/PreferencesDialog.cs:513
+msgid "Automaticall_y Sync in Background Every"
+msgstr "Sin_cronizar automáticamente en segundo plano cada"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:519
+msgid "Minutes"
+msgstr "Minutos"
+
+#. "Advanced..." button to bring up extra sync config dialog
+#: ../Tomboy/PreferencesDialog.cs:541
+msgid "_Advanced..."
+msgstr "_Avanzado…"
+
+#: ../Tomboy/PreferencesDialog.cs:602
+msgid "The following add-ins are installed"
+msgstr "Los siguientes complementos están instalados actualmente"
+
+#: ../Tomboy/PreferencesDialog.cs:623
+msgid "Get More Add-Ins..."
+msgstr "Obtener más complementos…"
+
+#: ../Tomboy/PreferencesDialog.cs:641
+msgid "_Enable"
+msgstr "_Activar"
+
+#: ../Tomboy/PreferencesDialog.cs:647
+msgid "_Disable"
+msgstr "_Desactivar"
+
+#: ../Tomboy/PreferencesDialog.cs:778
+msgid "Not Implemented"
+msgstr "No implementado"
+
+#: ../Tomboy/PreferencesDialog.cs:792
+#, csharp-format
+msgid "{0} Preferences"
+msgstr "{0} Preferencias"
+
+#: ../Tomboy/PreferencesDialog.cs:931
+msgid "Choose Note Font"
+msgstr "Elegir la tipografía de la nota"
+
+#: ../Tomboy/PreferencesDialog.cs:975
+msgid "Other Synchronization Options"
+msgstr "Otras opciones de sincronización"
+
+#: ../Tomboy/PreferencesDialog.cs:981
+msgid ""
+"When a conflict is detected between a local note and a note on the "
+"configured synchronization server:"
+msgstr ""
+"Cuando se detecta un conflicto entre una nota local y una nota en el "
+"servidor de sincronización configurado:"
+
+#: ../Tomboy/PreferencesDialog.cs:988
+msgid "Always ask me what to do."
+msgstr "Preguntarme siempre qué hacer."
+
+#: ../Tomboy/PreferencesDialog.cs:992
+msgid "Rename my local note."
+msgstr "Renombrar mi nota local."
+
+#: ../Tomboy/PreferencesDialog.cs:996
+msgid "Replace my local note with the server's update."
+msgstr "Reemplazar mi nota local con la actualización del servidor."
+
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "¿Está seguro?"
+
+#: ../Tomboy/PreferencesDialog.cs:1144
+msgid ""
+"Clearing your synchronization settings is not recommended.  You may be "
+"forced to synchronize all of your notes again when you save new settings."
+msgstr ""
+"No se recomienda limpiar sus ajustes de sincronización. Quizá se vea forzado "
+"a sincronizar todas sus notas de nuevo cuando guarde los nuevos ajustes."
+
+#: ../Tomboy/PreferencesDialog.cs:1157
+msgid "Resetting Synchronization Settings"
+msgstr "Reiniciando los ajustes de sincronización"
+
+#: ../Tomboy/PreferencesDialog.cs:1159
+msgid ""
+"You have disabled the configured synchronization service.  Your "
+"synchronization settings will now be cleared.  You may be forced to "
+"synchronize all of your notes again when you save new settings."
+msgstr ""
+"Ha desactivado el servicio de sincronización configurado. Sus ajustes de "
+"sincronización se limpiarán. Quizá se vea forzado a sincronizar todas sus "
+"notas de nuevo cuando guarde los ajustes nuevos."
+
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Conectado correctamente"
+
+#: ../Tomboy/PreferencesDialog.cs:1239
+msgid ""
+"Tomboy is ready to synchronize your notes. Would you like to synchronize "
+"them now?"
+msgstr ""
+"Tomboy está preparado para sincronizar sus notas. ¿Quiere sincronizarlas "
+"ahora?"
+
+#: ../Tomboy/PreferencesDialog.cs:1262
+#, csharp-format
+msgid ""
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
+msgstr ""
+"Compruebe su información e inténtelo de nuevo. El archivo {0} puede contener "
+"información útil sobre el error."
+
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Error al conectar"
+
+#: ../Tomboy/PreferencesDialog.cs:1357
+msgid "Version:"
+msgstr "Versión:"
+
+#: ../Tomboy/PreferencesDialog.cs:1364
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../Tomboy/PreferencesDialog.cs:1371
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: ../Tomboy/PreferencesDialog.cs:1377
+msgid "Add-in Dependencies:"
+msgstr "Dependencias de los complementos:"
+
+#: ../Tomboy/RecentChanges.cs:100
+msgid "_Search:"
+msgstr "_Buscar:"
+
+#: ../Tomboy/RecentChanges.cs:350
+msgid "Note"
+msgstr "Nota"
+
+#: ../Tomboy/RecentChanges.cs:373
+msgid "Last Changed"
+msgstr "Último cambio"
+
+#: ../Tomboy/RecentChanges.cs:512
+msgid "Matches"
+msgstr "Coincidencias"
+
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Coincidir con el título"
+
+#: ../Tomboy/RecentChanges.cs:566
+#, csharp-format
+msgid "{0} match"
+msgid_plural "{0} matches"
+msgstr[0] "{0} coincidencia"
+msgstr[1] "{0} coincidencias"
+
+#: ../Tomboy/RecentChanges.cs:580
+#, csharp-format
+msgid "Total: {0} note"
+msgid_plural "Total: {0} notes"
+msgstr[0] "Total: {0} nota"
+msgstr[1] "Total: {0} notas"
+
+#: ../Tomboy/RecentChanges.cs:591
+#, csharp-format
+msgid "Matches: {0} note"
+msgid_plural "Matches: {0} notes"
+msgstr[0] "Coincide con: {0} nota"
+msgstr[1] "Coincide con: {0} notas"
+
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"No se han encontrado resultados en el cuaderno de notas seleccionado.\n"
+"Pulse aquí para buscar en todas las notas."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Pulse aquí para buscar en todos los cuadernos de notas"
+
+#: ../Tomboy/RecentChanges.cs:775
+msgid "Notes"
+msgstr "Notas"
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Su equipo no soporta este complemento de sincronización. Asegúrese de que "
+"tiene FUSE instalado y {0} correctamente instalado y configurado."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "No se pudo leer el archivo de prueba."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Falló la prueba de escritura."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Expiró el tiempo de conexión con el servidor."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Error al conectar con el servidor."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "No se pudo activar FUSE."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Ocurrió un error al conectar con el servidor especificado:"
+
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Detalles"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
+msgid "Status"
+msgstr "Estado"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
+msgid "Acquiring sync lock..."
+msgstr "Adquiriendo bloqueo de sincronización…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
+msgid "Committing changes..."
+msgstr "Efectuando los cambios…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
+msgid "Synchronizing Notes"
+msgstr "Sincronizar las notas"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
+msgid "Synchronizing your notes..."
+msgstr "Sincronizando sus notas…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
+msgid "This may take a while, kick back and enjoy!"
+msgstr ""
+"Esto puede llevar un rato así que puede hacer otras cosas mientras tanto."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
+msgid "Connecting to the server..."
+msgstr "Conectando al servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
+msgid "Deleting notes off of the server..."
+msgstr "Borrando notas del servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
+msgid "Downloading new/updated notes..."
+msgstr "Descargando notas nuevas/actualizadas…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
+msgid "Server Locked"
+msgstr "Servidor bloqueado"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
+msgid "Server is locked"
+msgstr "El servidor está bloqueado"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:270
+msgid ""
+"One of your other computers is currently synchronizing.  Please wait 2 "
+"minutes and try again."
+msgstr ""
+"Uno de sus equipos está actualmente sincronizando. Espere 2 minutos e "
+"inténtelo de nuevo."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
+msgid "Preparing to download updates from server..."
+msgstr "Preparándose para descargar las actualizaciones del servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
+msgid "Preparing to upload updates to server..."
+msgstr "Preparándose para subir las actualizaciones al servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
+msgid "Uploading notes to server..."
+msgstr "Subiendo notas al servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
+msgid "Synchronization Failed"
+msgstr "Falló la sincronización"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
+msgid "Failed to synchronize"
+msgstr "Falló al sincronizar"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
+msgid "Could not synchronize notes.  Check the details below and try again."
+msgstr ""
+"No se pudieron sincronizar las notas. Compruebe los detalles de abajo e "
+"inténtelo de nuevo."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
+msgid "Synchronization Complete"
+msgstr "Sincronización completada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
+msgid "Synchronization is complete"
+msgstr "Sincronización completada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
+#, csharp-format
+msgid "{0} note updated."
+msgid_plural "{0} notes updated."
+msgstr[0] "{0} nota actualizada."
+msgstr[1] "{0} notas actualizadas."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
+msgid "Your notes are now up to date."
+msgstr "Ahora sus notas están actualizadas."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
+msgid "Synchronization Canceled"
+msgstr "Se canceló la sincronización"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
+msgid "Synchronization was canceled"
+msgstr "Se canceló la sincronización"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
+msgid "You canceled the synchronization.  You may close the window now."
+msgstr "Canceló la sincronización. Debería cerrar la ventana ahora."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
+msgid "Synchronization Not Configured"
+msgstr "La sincronización no está configurada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
+msgid "Synchronization is not configured"
+msgstr "La sincronización no está configurada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
+msgid "Please configure synchronization in the preferences dialog."
+msgstr "Configure la sincronización en el diálogo de preferencias."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
+msgid "Synchronization Service Error"
+msgstr "Error de sincronización en el servicio"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
+msgid "Service error"
+msgstr "Error del servicio"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
+msgid "Error connecting to the synchronization service.  Please try again."
+msgstr ""
+"Error al conectar con el servicio de sincronización. Inténtelo de nuevo."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
+msgid "Deleted locally"
+msgstr "Se borró la copia local"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
+msgid "Deleted from server"
+msgstr "Borradas del servidor"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
+msgid "Updated"
+msgstr "Actualizada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
+msgid "Added"
+msgstr "Añadida"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
+msgid "Uploaded changes to server"
+msgstr "Se subieron al servidor los cambios"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
+msgid "Uploaded new note to server"
+msgstr "Se subió la nota nueva al servidor"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
+msgid "Note Conflict"
+msgstr "Conflicto entre notas"
+
+#. Suggest renaming note by appending " (old)" to the existing title
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
+msgid " (old)"
+msgstr "(vieja)"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
+msgid "Rename local note:"
+msgstr "Renombrar la nota local:"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
+msgid "Update links in referencing notes"
+msgstr "Actualizar los enlaces en las notas referenciadas"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
+msgid "Overwrite local note"
+msgstr "Sobreescribir la nota local"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
+msgid "Always perform this action"
+msgstr "Siempre realizar esta acción"
+
+#. Set initial dialog text
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
+msgid "Note conflict detected"
+msgstr "Se detectó un conflicto en las notas"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:565
+#, csharp-format
+msgid ""
+"The server version of \"{0}\" conflicts with your local note.  What do you "
+"want to do with your local note?"
+msgstr ""
+"La versión del servidor «{0}» está en conflicto con su nota local. ¿Qué "
+"quiere hacer con su nota local?"
+
+#: ../Tomboy/Synchronization/SyncUtils.cs:119
+#: ../Tomboy/Synchronization/SyncUtils.cs:163
+msgid "Could not enable FUSE"
+msgstr "No se pudo activar FUSE"
+
+#: ../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."
+msgstr ""
+"No se pudo cargar el módulo FUSE. Compruebe que está instalado correctamete "
+"e inténtelo de nuevo."
+
+#: ../Tomboy/Synchronization/SyncUtils.cs:135
+msgid "Enable FUSE?"
+msgstr "¿Activar FUSE?"
+
+#. TODO: This message isn't entirely accurate.
+#. We should fix it.
+#: ../Tomboy/Synchronization/SyncUtils.cs:139
+msgid ""
+"The synchronization you've chosen requires the FUSE module to be loaded.\n"
+"\n"
+"To avoid getting this prompt in the future, you should load FUSE at "
+"startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
+"etc/modules."
+msgstr ""
+"La sincronización que ha elegido requiere cargar el módulo FUSE.\n"
+"\n"
+"Para evitar que se le muestre este mensaje en el futuro, debería cargar FUSE "
+"al inicio. Añada \"modprobe fuse\" a /etc/init.d/boot.local o \"fuse\" a /"
+"etc/modules."
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "No se puede crear una nota nueva"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Desarrollo inicial:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Colaboradores:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Daniel Mustieles <daniel.mustieles at gmail.com>, 2009\n"
+"Jorge González <jorgegonz at svn.gnome.org>, 2004-2009"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Otros\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr ""
+"Una aplicación simple y fácil de usar para tomar notas en el escritorio."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Página web"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Una aplicación simple y fácil de usar para tomar notas en el "
+"escritorio.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Otros\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Uso:\n"
+"  --version\t\t\tMuestra información de la versión.\n"
+"  --help\t\t\tMuestra este mensaje de uso.\n"
+"  --note-path [ruta]\t\tCargar/almacenar los datos de las notas en esta "
+"carpeta.\n"
+"  --search [texto]\t\tAbre la ventana de búsqueda de todas las notas con el "
+"texto buscado.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tCrea y muestra una nota\n"
+"  --new-note [título]\t\tCrea y muestra una nota, con un título\n"
+"  --open-note [título/url]\tMuestra la nota existente que coincida con el "
+"título\n"
+"  --start-here\t\t\tMuestra la nota «Comenzar aquí»\n"
+"  --highlight-search [texto]\tBuscar y resaltar texto coincidente en la nota "
+"abierta\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versión {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nueva)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "Acerca _de Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"No se pudo encontrar el «Manual de Tomboy Notas». Compruebe que su "
+"instalación terminó con éxito."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "No se encontró la ayuda"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "No se puede abrir la dirección"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Hoy, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Hoy"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Ayer, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Ayer"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Hace {0} día, {1}"
+msgstr[1] "Hace {0} días, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Hace {0} día"
+msgstr[1] "Hace {0} días"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Mañana, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Mañana"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Dentro de {0} día, {1}"
+msgstr[1] "Dentro de {0} días, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Dentro de {0} día"
+msgstr[1] "Dentro de {0} días"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, HH:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Sin fecha"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, HH:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Sin título {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Ya existe una nota con el título <b>{0}</b>. Por favor, escoja otro nombre "
+"para esta nota antes de continuar."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "El título de la nota ya existe"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copiar la dirección del enlace"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Abrir enlace"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "¿Desea eliminar esta nota?"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Exportar al último directorio usado en formato HTML"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Buscar en sus notas (Ctrl-Mayús-F)"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Está conectado."
+
+#~ msgid "_Browse..."
+#~ msgstr "_Examinar…"
+
+#~ msgid "D-BUS remote control disabled.\n"
+#~ msgstr "Control remoto de D-BUS desactivado.\n"
+
+#~ msgid ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+#~ msgstr ""
+#~ "Tomboy: opción no válida «{0}»\n"
+#~ "Pruebe 'tomboy --help' para más información.\n"
+#~ "Control remoto de D-BUS desactivado."
+
+#~ msgid "Click Here After Authorizing"
+#~ msgstr "Pulse aquí después de autorizar"
+
+#~ msgid "Processing..."
+#~ msgstr "Procesando…"
+
+#~ msgid "_Connect to Server"
+#~ msgstr "_Conectar con el servidor"
+
+#~ msgid "C_ase Sensitive"
+#~ msgstr "Sensible a _mayúsculas"
+
+#~ msgid "Really delete these notes?"
+#~ msgstr "¿Desea borrar estas notas?"
+
+#~ msgid "Preparing pages..."
+#~ msgstr "Preparando las páginas…"
+
+#~ msgid "Rendering page %d of %d..."
+#~ msgstr "Renderizando página %d de %d…"
+
+#~ msgid "Printing page %d of %d..."
+#~ msgstr "Imprimiendo página %d de %d…"
+
+#~ msgid "Print preview"
+#~ msgstr "Vista previa de impresión"
+
+#~ msgid "%A %x, %X"
+#~ msgstr "%A %x, %X"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Configuration options for the print job"
+#~ msgstr "Opciones de configuración para el trabajo de impresión"
+
+#~ msgid "Source Buffer"
+#~ msgstr "Búfer del fuente"
+
+#~ msgid "GtkTextBuffer object to print"
+#~ msgstr "Objeto GtkTextBuffer que imprimir"
+
+#~ msgid "Tabs Width"
+#~ msgstr "Ancho de tabulación"
+
+#~ msgid "Width in equivalent space characters of tabs"
+#~ msgstr "Anchura en espacios equivalentes para los tabuladores"
+
+#~ msgid "Wrap Mode"
+#~ msgstr "Modo de ajuste"
+
+#~ msgid "Word wrapping mode"
+#~ msgstr "Modo de ajuste de palabras"
+
+#~ msgid "Highlight"
+#~ msgstr "Resaltado"
+
+#~ msgid "Whether to print the document with highlighted syntax"
+#~ msgstr "Indica si se imprime el documento con resaltado de sintaxis"
+
+#~ msgid "Font"
+#~ msgstr "Tipografía"
+
+#~ msgid "GnomeFont name to use for the document text (deprecated)"
+#~ msgstr "Nombre GnomeFont para usar en el texto del documento (obsoleto)"
+
+#~ msgid "Font Description"
+#~ msgstr "Descripción de la tipografía"
+
+#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
+#~ msgstr ""
+#~ "Tipografía que se va a usar en el texto del documento (Ej: «Monospace 10»)"
+
+#~ msgid "Numbers Font"
+#~ msgstr "Tipografía para los números"
+
+#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
+#~ msgstr "Nombre GnomeFont para usar en los números de línea (obsoleto)"
+
+#~ msgid "Font description to use for the line numbers"
+#~ msgstr "Descripción de la tipografía a usar en los números de línea"
+
+#~ msgid "Print Line Numbers"
+#~ msgstr "Imprimir números de línea"
+
+#~ msgid "Interval of printed line numbers (0 means no numbers)"
+#~ msgstr ""
+#~ "Intervalo de impresión de números de líneas (0 significa sin números)"
+
+#~ msgid "Print Header"
+#~ msgstr "Imprimir cabecera"
+
+#~ msgid "Whether to print a header in each page"
+#~ msgstr "Indica si se imprimirá una cabecera en cada página"
+
+#~ msgid "Print Footer"
+#~ msgstr "Imprimir pie de página"
+
+#~ msgid "Whether to print a footer in each page"
+#~ msgstr "Indica si se imprimirá un pie de página en cada página"
+
+#~ msgid "Header and Footer Font"
+#~ msgstr "Tipografía de cabecera y pie de página"
+
+#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
+#~ msgstr ""
+#~ "Nombre GnomeFont a usar para la cabecera y el pie de página (obsoleto)"
+
+#~ msgid "Header and Footer Font Description"
+#~ msgstr "Descripción de la tipografía de cabecera y pie de página"
+
+#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
+#~ msgstr ""
+#~ "Tipografía que se va a usar para las cabeceras y el pie de página (Ej: "
+#~ "«Monospace 10»)"
+
+#~ msgid "Add-in"
+#~ msgstr "Complemento"
+
+#~ msgid "Version"
+#~ msgstr "Versión"
+
+#~ msgid "Other"
+#~ msgstr "Otro"
diff --git a/po/eu.po b/po/eu.po
index 9a92453..9250bfa 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,16 +9,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-18 17:21+0000\n"
-"PO-Revision-Date: 2011-04-04 12:19+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>\n"
-"Language-Team: Basque <itzulpena at euskalgnu.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-25 16:53+0200\n"
+"PO-Revision-Date: 2011-09-25 16:52+0200\n"
+"Last-Translator: \n"
+"Language-Team: American English <kde-i18n-doc at kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\n"
 "\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
@@ -82,42 +84,52 @@ msgid "Custom Font Face"
 msgstr "Letra-tipo pertsonalizatua"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "Bilaketa leihoaren X koordenatua zehazten du; Tomboy-tik irtetzean gordeta."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"'Bilatu ohar guztiak' leihoaren X koordenatua zehazten du; Tomboy-tik "
+"irtetzean gordeta."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "Bilaketa leihoaren Y koordenatua zehazten du; Tomboy-tik irtetzean gordeta."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"'Bilatu ohar guztiak' leihoaren Y koordenatua zehazten du; Tomboy-tik "
+"irtetzean gordeta."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Bilaketa leihoaren altuera (pixeletan) zehazten du; Tomboy-tik irtetzean "
-"gordeta."
+"'Bilatu ohar guztiak' leihoaren altuera (pixeletan) zehazten du; Tomboy-tik "
+"irtetzean gordeta."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Bilaketa leihoaren zabalera (pixeletan) zehazten du; Tomboy-tik irtetzean "
-"gordeta."
+"'Bilatu ohar guztiak' leihoaren zabalera (pixeletan) zehazten du; Tomboy-tik "
+"irtetzean gordeta."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Gaitu bulet-zerrenda automatikoak."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Gaitu erdiko botoiarekin klik eginez ikonoan itsastea."
 
-#: ../data/tomboy.schemas.in.h:11
-#| msgid "TrayIcon"
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Gaitu erretiluaren ikonoa"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Gaitu WikiWord nabarmentzea"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Gaitu bulet automatikodun zerrendak."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Gaitu oharrak Ihes teklarekin ixtea."
@@ -175,18 +187,17 @@ msgid "HTML Export All Linked Notes"
 msgstr "HTML esportatu estekatutako ohar guztiak"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "HTML esportatu azken direktorioa"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "HTML esportatu estekatutako oharrak"
 
-#: ../data/tomboy.schemas.in.h:26
-msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
-msgstr "Desgaitzen bada, \"Ezabatu oharra\" berrezpenaren elkarrizketa-koadroa kenduko da."
+#: ../data/tomboy.schemas.in.h:25
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr ""
+"Desgaitzen bada, \"Ezabatu oharra\" berrezpenaren elkarrizketa-koadroa "
+"kenduko da."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -194,7 +205,7 @@ msgstr ""
 "'enable_custom_font' gaituta badago, hemen ezarritako letra-tipoa erabiliko "
 "da oharrak bistaratzeko."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -202,21 +213,21 @@ msgstr ""
 "Gaitzen bada, Tomboy aplikaziotik irtetzean irekita zeuden ohar guztiak "
 "berriro irekiko dira abioan."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "Gaitzen bada, irekita dagoen ohar bat Ihes tekla sakatuz itxi daiteke."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
 "functionality of the tray icon."
 msgstr ""
 "TRUE (egia) bada, erretiluko ikonoa bistaratuko da jakinarazpen-arean. "
-"Desgaitzea erabilgarria gerta daiteke beste aplikazio batek "
-"erretiluko ikonoaren funtzionalitatea eskaintzen badu."
+"Desgaitzea erabilgarria gerta daiteke beste aplikazio batek erretiluko "
+"ikonoaren funtzionalitatea eskaintzen badu."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -224,7 +235,7 @@ msgstr ""
 "Egia bada, gaizki idatzitako hitzak gorriz azpimarratuko dira, eta eskuineko "
 "menuan gomendatutako zuzenak zerrendatuko dira."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -234,7 +245,7 @@ msgstr ""
 "tekla orokorrak gaituko dira, edozein aplikaziok Tomboy-ko ekintzak "
 "erabiltzeko aukera eskainiz."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -242,7 +253,7 @@ msgstr ""
 "Egia bada, 'custom_font_face'-en ezarritako letra-tipoa erabiliko da oharrak "
 "bistarateko. Bestela, mahaigaineko letra-tipo lehenetsia erabiliko da."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -250,7 +261,7 @@ msgstr ""
 "Ohar itsaskorrak inportatzeko plugina ez dela exekutatu adierazten du, "
 "hurrengoan Tomboy abiatzen denean automatikoki exekutatu beharko luke."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -258,7 +269,7 @@ msgstr ""
 "Gutxiengo ohar-kopurua zehazten duen osokoa, Tomboy-eko oharren menuan "
 "bistaratzeko."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -270,7 +281,7 @@ msgstr ""
 "baliok sink. automatikoa desgaituta dagoela adierazten du. Onartzen den "
 "balio positiborik baxuena 5 da. Balioak minutuak adierazten ditu."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -284,7 +295,7 @@ msgstr ""
 "galdetzea adierazten du, horrela erabiltzailea arduratuko da gatazka "
 "bakoitzaren aurrean landu beharrekoarekin."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -303,6 +314,10 @@ msgstr ""
 "berrira eguneratuko dela adierazten du, horrela izenez aldatutako oharrera "
 "estekatzen jarraituko baitu."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "HTML esportatzean erabilitako azken direktorioa"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Esteken eguneraketen portaera oharra izenez aldatzean"
@@ -374,20 +389,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS sinkronizazio-zerbitzuaren URLa"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Bilaketa leihoaren altuera gordeta"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "'Bilatu ohar guztiak' leihoaren altuera gordeta"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Bilaketa leihoaren posizio horizontala gordeta"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "'Bilatu ohar guztiak' leihoaren posizio horizontala gordeta"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Bilaketa leihoaren posizio bertikala gordeta"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "'Bilatu ohar guztiak' leihoaren posizio bertikala gordeta"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Bilaketa leihoaren zabalera gordeta"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "'Bilatu ohar guztiak' leihoaren zabalera gordeta"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -506,7 +521,8 @@ msgid "The handler for \"note://\" URLs"
 msgstr "\"note://\" URLen kudeatzailea"
 
 #: ../data/tomboy.schemas.in.h:72
-msgid "The last directory a note was exported to using the Export To HTML plugin."
+msgid ""
+"The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
 "Ohar bat esportatu zen azken direktorioa 'Esportatu HTMLra' plugina "
 "erabiltzen."
@@ -631,7 +647,7 @@ msgstr "_Ezabatu"
 msgid "Delete the selected note"
 msgstr "Ezabatu hautatutako oharra"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Itxi"
 
@@ -675,7 +691,7 @@ msgstr "Erretiluaren ikonoa"
 msgid "Create _New Note"
 msgstr "_Sortu ohar berria"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Bilatu ohar guztiak"
 
@@ -687,11 +703,22 @@ msgstr "Ireki 'Bilatu ohar guztiak' leihoa"
 msgid "Start synchronizing notes"
 msgstr "Hasi oharrak sinkronizatzen"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Aurreratua"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Gutxieneko ohar-kopurua Azkenekoak menuan erakusteko (gehienez 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Zer estekatzen du ohar honek?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(bat ere ez)"
 
@@ -744,6 +771,26 @@ msgstr "Ziur zaude ikono hau ezabatzea nahi duzula?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Ikono bat ezabatzen baduzu betirako galduko da."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Ezin da posta ireki"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "HTMLra esportatzeko helbidea"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Esportatu estekatutako oharrak"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Sartu estekatutako beste ohar guztiak"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Esportatu HTMLra"
@@ -758,10 +805,14 @@ msgid "Note exported successfully"
 msgstr "Oharra ongi esportatu da"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Sarbidea ukatuta."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Karpeta ez da existitzen."
 
@@ -770,22 +821,6 @@ msgstr "Karpeta ez da existitzen."
 msgid "Could not save the file \"{0}\""
 msgstr "Ezin izan da \"{0}\" fitxategia gorde"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "HTMLra esportatzeko helbidea"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Esportatu estekatutako oharrak"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Sartu estekatutako beste ohar guztiak"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Ezin da posta ireki"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Karpetaren bide-izena:"
@@ -794,17 +829,18 @@ msgstr "_Karpetaren bide-izena:"
 msgid "Select Synchronization Folder..."
 msgstr "Hautatu sinkronizazio-karpeta..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Karpetaren bide-izena hutsik dago."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
-msgid "Specified folder path does not exist, and Tomboy was unable to create it."
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
+msgid ""
+"Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr ""
 "Zehaztutako karpetaren bide-izena ez da existitzen, eta Tomboy-k ezin du "
 "sortu."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Karpeta lokala"
 
@@ -834,7 +870,8 @@ msgstr "dddd, MMMM d, h:mm tt"
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
 msgid "Choose one of the predefined formats or use your own."
-msgstr "Aukeratu aurredefinitutako formatu bat edo erabili zure formatu propioa."
+msgstr ""
+"Aukeratu aurredefinitutako formatu bat edo erabili zure formatu propioa."
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
 msgid "Use _Selected Format"
@@ -867,11 +904,11 @@ msgstr "Hitzorduak"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Aldatu <span weight=\"bold\">Gaur: txantiloia</span> oharra gaurko ohar "
-"berriek duten testua pertsonalizatzeko."
+"Aldatu <b>Gaur: txantiloia</b> oharra gaurko ohar berriek duten testua "
+"pertsonalizatzeko."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -896,26 +933,31 @@ msgstr "{0} / {1} orrialdea"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd, yyyy/MM/dd, hh:mm:ss tt"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Kendu hautsitako estekak"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Gehitu marrazki bat"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "_Zerbitzaria:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Karpetaren bide-izena (aukerakoa):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -923,15 +965,15 @@ msgstr ""
 "SSH sinkronizazioak zerbitzari eta erabiltzaile honen SSH gakoa existitzea "
 "eskatzen du, exekutatzen ari den SSH daemon-ari gehituta."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Zerbitzariaren edo erabiltzaile-izenaren eremua hutsik dago."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -958,14 +1000,17 @@ msgstr "Ohar itsaskorretik inportatzea burutu da"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "Ohar itsaskorretik ongi inportatuta: <b>{0}</b> / <b>{1}</b>."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "Ohar itsaskorra ongi inportatuta: <b>{0}</b> / <b>{1}</b>"
+msgstr[1] "Ohar itsaskorrak ongi inportatuta: <b>{0}</b> / <b>{1}</b>"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Titulu gabea"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Ohar itsaskorra: "
 
@@ -989,23 +1034,23 @@ msgstr "--- Tasque ez da exekutatzen ari ---"
 msgid "_Underline"
 msgstr "_Azpimarra"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URLa:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "URL, erabiltzaile-izen edo pasahitzaren eremua hutsik dago."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1018,18 +1063,15 @@ 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:254
-msgid "Saving configuration to the GNOME keyring failed with the following message:"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
+msgid ""
+"Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Huts egin du konfigurazioa GNOMEren gako-sortan gordetzean: Hutsegitearen "
 "mezua:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy-ren webgunea"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Konektatu zerbitzarira"
 
@@ -1038,23 +1080,23 @@ msgid "Connected"
 msgstr "Konektatuta"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Zerbitzariak ez du erantzuten. Saiatu beranduago."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Autorizazioak huts egin du. Saiatu berriro"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy-ren webaren autorizazioa lortu da"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1062,22 +1104,120 @@ msgstr ""
 "Itzul zaitez Tomboy-ren hobespenen leihora eta egin klik 'Gorde' botoian "
 "sinkronizazioa hasteko."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Konektatuta. Egin klik 'Gorde' botoian sinkronizazioa hasteko"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Autorizazioa web arakatzailean (sakatu konexioa berrezarteko)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Ezarri arakatzaile lehenetsia eta saiatu berriro"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy-ren webgunea"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Esportatu ohar guztiak {0}(e)ra"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Hasi oharrak {0}(e)ra esportatzen"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Esportatu hautatutako koadernoa {0}(e)ra"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Hasi koadernoa {0}(e)ra esportatzen"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Tresnak"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Esportatu"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Esportatu zure oharrak."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Esportatu ohar guztiak {0}(e)ra"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Esportatu hautatutako koadernoa {0}(e)ra"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Esportatu {0} ohar guztiak"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Ezin izan da esportatu, sarbidetza ukatuta."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Ezin izan da esportatu, karpeta ez da existitzen."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Ezin izan da esportatu: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Errore ezezaguna."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Artxibatu gabeko oharrak"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Zure oharrak '{0}'(e)ra esportatu dira."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Oharrak ongi esportatu dira"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Ezin izan dira fitxategiak '{0}'(e)n gorde"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Sortu helburuko karpeta {0} esportatzean"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Bilatu ohar guztiak"
 
@@ -1104,7 +1244,6 @@ msgid "_Window"
 msgstr "_Leihoa"
 
 #: ../Tomboy/MacApplication.cs:234
-#| msgid "_Preferences"
 msgid "Preferences..."
 msgstr "Hobespenak..."
 
@@ -1131,26 +1270,6 @@ msgstr "Izen hori jadanik erabilita dago"
 msgid "C_reate"
 msgstr "_Sortu"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} koadernoen txantiloia"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Ohar guztiak"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Artxibatu gabeko oharrak"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "_Koadernoak"
@@ -1190,15 +1309,35 @@ msgid "Delete the selected notebook"
 msgstr "Ezabatu hautatutako koadernoa"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Koadernoak"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} koadernoen txantiloia"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Ohar berria"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Ohar guztiak"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Ziur zaude koaderno hau ezabatzea nahi duzula?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1219,34 +1358,40 @@ msgstr "Koadernorik ez"
 msgid "New \"{0}\" Note"
 msgstr "\"{0}\" ohar berria"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Jarri ohar hau koadernoan"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Koadernoa"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Koaderno berria..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Ziur zaude ohar hau ezabatzea nahi duzula?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "{0}. mezu berria"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "'{0}' benetan ezabatu?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Ziur zaude ohar {0} ezabatzea nahi duzula?"
 msgstr[1] "Ziur zaude {0} ohar ezabatzea nahi dituzula?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Ohar bat ezabatzen baduzu betirako galduko da."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1257,13 +1402,13 @@ msgstr ""
 "libre dagoela, eta {0} direktoriorako baimen egokiak dituzula. Errorearen "
 "xehetasunak {1} fitxategian aurki dezakezu."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Errorea oharraren datuak gordetzean."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Oharren txantiloi berria"
 
@@ -1388,7 +1533,7 @@ msgstr ""
 "estekatuko du.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Hasi hemen"
 
@@ -1396,14 +1541,9 @@ msgstr "Hasi hemen"
 msgid "Using Links in Tomboy"
 msgstr "Tomboy-ko estekak erabiltzea"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "{0}. mezu berria"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Azaldu ohar berria hemen."
 
@@ -1467,139 +1607,164 @@ msgstr "Inoiz ere ez aldatu _estekak izenez"
 msgid "Alwa_ys rename links"
 msgstr "_Beti aldatu esteken izenak"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Bilatu ohar honetan"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Estekatu ohar berrira"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_stua"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "Bilatu ohar _honetan"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "It_xi ohar guztiak"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Bilatu zure oharrak (Ktrl+Maius+F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Bilatu zure oharrak"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Esteka"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Estekatu hautatutako testua ohar berri batera (Ktrl+L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Estekatu hautatutako testua ohar berri batera"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Testua"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Ezarri testuaren propietateak"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Tresnak"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Erabili tresnak ohar honetan"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Ezabatu ohar hau"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Sinkronizatu oharrak"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Ohar hau txantiloi ohar bat da. Ohar arrunten eduki lehenetsia zehazten du, "
+"eta ez da oharren menuan edo bilaketako leihoan erakutsiko."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Bihurtu ohar arruntean"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Gorde _tamaina"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Gorde _hautapena"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Gorde t_itulua"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Bilatu..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Bilatu _hurrengoa"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Bilatu _aurrekoa"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Ezin da oharra sortu"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Bilatu:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Aurrekoa"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Hurrengoa"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Lodia"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Etzana"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Marratua"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Nabarmendua"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Letra-tamaina"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Arrunta"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "_Oso handia"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Handia"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "T_xikia"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Handiagotu letra-tamaina"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Txikiagotu letra-tamaina"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Buletak"
 
@@ -1619,11 +1784,11 @@ msgstr "Sinkronizazioa"
 msgid "Add-ins"
 msgstr "Gehigarriak"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "Egiaztatu _ortografia idatzi bitartean"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1632,11 +1797,11 @@ msgstr ""
 "testuinguruko menuan erakutsiz."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Nabarmendu _WikiWords-ak"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1645,31 +1810,31 @@ msgstr ""
 "kllik eginez ohar berri bat sortuko da izen horrekin."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Gaitu _bulet-zerrenda automatikoak"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Erabili _letra-tipo pertsonalizatua"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Estekatutako ohar bat izenez aldatzean: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Galdetu beti zer egin"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Inoiz ere ez aldatu estekak izenez"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Beti aldatu esteken izenak"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1677,16 +1842,16 @@ msgstr ""
 "Oharren txantiloi berria erabili ohar berri bat sortzean erabiliko den "
 "testua zehazteko."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Ireki oharren txantiloi berria"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Entzun laster-teklak"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1697,82 +1862,82 @@ msgstr ""
 "N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Erakutsi oharren _menua"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Ireki \"_Hasi hemen\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Sortu _ohar berria"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Ireki \"_Bilatu ohar guztiak\""
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "_Zerbitzua:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Ez da konfiguragarria"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Sinkronizatu automatikoki atz. planoan"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "minuturo"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Aurreratua..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Honako gehigarriak daude instalatuta"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Lortu gehigarri gehiago..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Gaitu"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Desgaitu"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Inplementatu gabe"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0}(r)en hobespenak"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Aukeratu oharraren letra-tipoa"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Bestelako sinkronizazioko aukerak"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1780,23 +1945,23 @@ msgstr ""
 "Lokaleko eta konfiguratutako sinkronizazioko zerbitzariko oharren artean "
 "gatazkak detektatzen direnean:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Galdetu beti zer egin."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Aldatu lokaleko oharraren izena."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Ordeztu lokaleko oharra zerbitzariko eguneraketarekin."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "ABISUA: ziur zaude?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Ziur zaude?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1804,25 +1969,25 @@ msgstr ""
 "Ez da aholkatzen sinkronizazioaren ezarpenak garbitzea. Zure ohar guztiak "
 "berriro sinkronizatu beharko dituzu ezarpen berriak gordetzean."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Sinkronizazio-ezarpenak berrezartzen"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Konfiguratutako sinkronizazio-zerbitzua desgaitu duzu. Sinkronizazioko "
 "konfigurazioak garbitu egingo dira. Zure ohar guztiak berriro sinkronizatu "
-"beharko dituzu ezarpen berriak gordetzean."
+"beharko dituzu ezarpen berriak gordetzean.."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Ongi! Konektatuta zaude."
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Ongi konektatu da"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1830,322 +1995,129 @@ msgstr ""
 "Tomboy prest dago zure oharrak sinkronizatzeko. Nahi dituzu oharrak orain "
 "sinkronizatzea?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Zerbait oker joan da. Egiaztatu informazioa eta saiatu berriro. {0} "
-"egunkaria laguntzakoa gerta dakizuke."
+"Egiaztatu zure informazioa eta saiatu berriro. {0} egunkariak erroreari "
+"buruzko informazio gehiago eduki dezake."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Errorea konektatzean :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Errorea konektatzean"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Bertsioa:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Egilea:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright-a:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Gehigarriaren mendekotasunak:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Bilatu:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Oharra"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Azken aldatutakoa"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Bat datozenak:"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Titulua bat dator"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} bat dator"
 msgstr[1] "{0} bat datoz"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Guztira: ohar {0}"
 msgstr[1] "Guztira: {0} ohar"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Bat datoztenak: ohar {0}"
 msgstr[1] "Bat datoztenak: {0} ohar"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Ez da emaitzarik aurkitu hautatutako koadernoan.\n"
+"Egin klik hemen bilaketa ohar guztietan zehar egiteko."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Egin klik hemen bilaketa ohar guztietan zehar egiteko."
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Oharrak"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Ezin da ohar berria sortu"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Sinkronizazioaren gehigarriak ez daude onartuta ordenagailuan. Ziurtatu FUSE "
+"eta {0} ongi instalatuta eta konfiguratuta daudela."
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Garapen nagusia:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Ezin izan da probako fitxategia irakurri."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Laguntzaileak:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Idazketaren probak huts egin du."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"Mikel Olasagasti <hey_neken at mundurat.net>\n"
-"Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Denbora-muga iraungituta zerbitzariarekin konektatzean."
 
-#: ../Tomboy/Tomboy.cs:410
-#| msgid ""
-#| "Copyright © 2004-2007 Alex Graveley\n"
-#| "Copyright © 2004-2009 Others\n"
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 beste batzuk\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Errorea zerbitzariarekin konektatzean."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Oharrak hartzeko mahaigaineko aplikazio sinple eta erraza."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "Ezin izan da FUSE gaitu."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Gune nagusia"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Errorea gertatu da zehaztutako zerbitzariarekin konektatzean:"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: oharrak hartzeko mahaigaineko aplikazio sinplea eta erraza.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Erabilera:\n"
-"  --version\t\t\tBertsioa bistaratzen du.\n"
-"  --help\t\t\tMezu hau bistaratzen du.\n"
-"  --note-path [bide-izena]\t\tOharraren datuak kargatu/gorde egiten ditu "
-"direktorioan.\n"
-"  --search [testua]\t\t'Bilatu ohar guztietan' leihoa irekitzen du bilatzeko "
-"testuarekin.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tOhar berria sortu eta bistaratu.\n"
-"  --new-note [titulua]\t\tOhar berria sortu eta bistaratu, esandako "
-"tituluarekin.\n"
-"  --open-note [titulua/url-a]\tTitulu berdina duen oharra erakutsi.\n"
-"  --start-here\t\t\t'Hemen hasi' oharra erakutsi.\n"
-"  --highlight-search [testua]\tBilatu eta nabarmendu testua irekitako "
-"oharrean.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "{0} bertsioa"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (berria)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_Tomboy-ri buruz"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"Ezin izan da \"Tomboy oharren eskuliburua\" aurkitu. Egiaztatu instalazioa "
-"ongi burutu dela."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Ez da laguntzarik aurkitu"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Ezin da helbidea ireki"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Gaur, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Gaur"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Atzo, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Atzo"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "orain dela egun {0}, {1}"
-msgstr[1] "orain dela {0} egun, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "orain dela egun {0}"
-msgstr[1] "orain dela {0} egun"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Bihar, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Bihar"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Egun {0}era, {1}"
-msgstr[1] "{0} egunetara, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Egun {0}era"
-msgstr[1] "{0} egunetara"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "MMMMren da"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Datarik ez"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "yyyy MMMM d, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "yyyy.eko MMMMren d"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Titulu gabea {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"<b>{0}</b> tituludun ohar bat existitzen da dagoeneko. Aukeratu beste izen "
-"bat jarraitu aurretik."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Oharraren titulua hartuta"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Kopiatu estekaren helbidea"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Ireki esteka"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Sinkronizazioaren gehigarriak ez daude onartuta ordenagailuan. Ziurtatu FUSE "
-"eta {0} ongi instalatuta eta konfiguratuta daudela."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Ezin izan da probako fitxategia irakurri."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Idazketaren probak huts egin du."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Denbora-muga iraungituta zerbitzariarekin konektatzean."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Errorea zerbitzariarekin konektatzean."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "Ezin izan da FUSE gaitu."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Errorea gertatu da zehaztutako zerbitzariarekin konektatzean:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Xehetasunak"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Xehetasunak"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2254,7 +2226,8 @@ msgstr "Sinkronizazioa bertan behera utzi da"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
-msgstr "Sinkronizazioa bertan behera utzi duzu. Orain leihoa itxi beharko zenuke."
+msgstr ""
+"Sinkronizazioa bertan behera utzi duzu. Orain leihoa itxi beharko zenuke."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
@@ -2343,10 +2316,6 @@ msgstr ""
 "Zerbitzariko \"{0}\" bertsioa lokaleko oharrarekin gatazkan dago. Zer egitea "
 "nahi duzu lokaleko oharrarekin?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Tresnak"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2381,3 +2350,229 @@ msgstr ""
 "abioan. Gehitu \"modprobe fuse\" lerroa /etc/init.d/boot.local fitxategian "
 "edo \"fuse\" lerroa /etc/modules fitxategian"
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Ezin da ohar berria sortu"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Garapen nagusia:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Laguntzaileak:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Mikel Olasagasti <hey_neken at mundurat.net>\n"
+"Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 beste batzuk\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Oharrak hartzeko mahaigaineko aplikazio sinple eta erraza."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Gune nagusia"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: oharrak hartzeko mahaigaineko aplikazio sinplea eta erraza.\n"
+"Copyright (C) 2004-2007 Alex Graveley <alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 beste batzuk\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Erabilera:\n"
+"  --version\t\t\tBertsioa bistaratzen du.\n"
+"  --help\t\t\tMezu hau bistaratzen du.\n"
+"  --note-path [bide-izena]\t\tOharraren datuak kargatu/gorde egiten ditu "
+"direktorioan.\n"
+"  --search [testua]\t\t'Bilatu ohar guztietan' leihoa irekitzen du bilatzeko "
+"testuarekin.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tOhar berria sortu eta bistaratu.\n"
+"  --new-note [titulua]\t\tOhar berria sortu eta bistaratu, esandako "
+"tituluarekin.\n"
+"  --open-note [titulua/url-a]\tTitulu berdina duen oharra erakutsi.\n"
+"  --start-here\t\t\t'Hemen hasi' oharra erakutsi.\n"
+"  --highlight-search [testua]\tBilatu eta nabarmendu testua irekitako "
+"oharrean.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "{0} bertsioa"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (berria)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Tomboy-ri buruz"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"Ezin izan da \"Tomboy oharren eskuliburua\" aurkitu. Egiaztatu instalazioa "
+"ongi burutu dela."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Ez da laguntzarik aurkitu"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Ezin da helbidea ireki"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Gaur, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Gaur"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Atzo, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Atzo"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "orain dela egun {0}, {1}"
+msgstr[1] "orain dela {0} egun, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "orain dela egun {0}"
+msgstr[1] "orain dela {0} egun"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Bihar, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Bihar"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Egun {0}era, {1}"
+msgstr[1] "{0} egunetara, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Egun {0}era"
+msgstr[1] "{0} egunetara"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "MMMMren da"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Datarik ez"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "yyyy MMMM d, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "yyyy.eko MMMMren d"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Titulu gabea {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"<b>{0}</b> tituludun ohar bat existitzen da dagoeneko. Aukeratu beste izen "
+"bat jarraitu aurretik."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Oharraren titulua hartuta"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Kopiatu estekaren helbidea"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Ireki esteka"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "HTML esportatu azken direktorioa"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Ziur zaude ohar hau ezabatzea nahi duzula?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Bilatu zure oharrak (Ktrl+Maius+F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Ongi! Konektatuta zaude."
diff --git a/po/fr.po b/po/fr.po
index 80348d1..3f84ff9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 # French translation of tomboy.
-# Copyright (C) 2004-2010 Free Software Foundation, Inc.
+# Copyright (C) 2004-2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the tomboy package.
 #
 # Benoît Dejean <tazforever at dlfp.org>, 2004.
@@ -9,17 +9,17 @@
 # Jonathan Ernst <jonathan at ernstfamily.ch>, 2007.
 # Yann Simon <yann.simon.fr at gmail.com>, 2007.
 # Gérald Ouvradou <gerald.ouvradou at no-log.fr>, 2008.
-# Bruno Brouard <annoa.b at gmail.com>, 2009.
+# Bruno Brouard <annoa.b at gmail.com>, 2009,2011.
 # Laurent Coudeur <laurentc at iol.ie>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=tomboy&component=general\n"
-"POT-Creation-Date: 2010-10-25 14:02+0000\n"
-"PO-Revision-Date: 2010-08-07 11:52+0100\n"
-"Last-Translator: Laurent Coudeur <laurentc at iol.ie>\n"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-15 07:18+0000\n"
+"PO-Revision-Date: 2011-09-24 22:28+0200\n"
+"Last-Translator: Bruno Brouard <annoa.b at gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,45 +87,52 @@ msgid "Custom Font Face"
 msgstr "Type de caractères personnalisé"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Définit la coordonnée X de la fenêtre de recherche ; enregistré lorsque "
-"Tomboy est quitté."
+"Définit la coordonnée X de la fenêtre « Rechercher dans toutes les notes » ; "
+"enregistré lorsque Tomboy est quitté."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Définit la coordonnée Y de la fenêtre de recherche ; enregistré lorsque "
-"Tomboy est quitté."
+"Définit la coordonnée Y de la fenêtre « Rechercher dans toutes les notes » ; "
+"enregistré lorsque Tomboy est quitté."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Définit la hauteur en pixels de la fenêtre de recherche ; enregistré lorsque "
-"Tomboy est quitté."
+"Définit la hauteur en pixels de la fenêtre « Rechercher dans toutes les "
+"notes » ; enregistré lorsque Tomboy est quitté."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Définit la largeur en pixels de la fenêtre de recherche ; enregistré lorsque "
-"Tomboy est quitté."
+"Définit la largeur en pixels de la fenêtre « Rechercher dans toutes les "
+"notes » ; enregistré lorsque Tomboy est quitté."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Activer les listes à puces automatiques."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Activer le collage du presse-papiers par clic-milieu sur l'icône."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Activer l'icône de notification"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Activer le surlignage des mots Wiki"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Activer les listes à puces automatiques."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Activer la fermeture des notes avec la touche Échap."
@@ -184,21 +191,17 @@ msgid "HTML Export All Linked Notes"
 msgstr "Exporter en HTML toutes les notes liées"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Dernier répertoire d'export HTML"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Exporter en HTML les notes liées"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Si désactivé, la boîte de dialogue de confirmation « Supprimer la note » ne "
 "s'affiche pas."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -206,7 +209,7 @@ msgstr ""
 "Si enable_custom_font est VRAI, la police définie ici sera utilisée pour "
 "l'affichage des notes."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -214,12 +217,12 @@ msgstr ""
 "Si activé, toutes les notes ouvertes à la fermeture de Tomboy seront "
 "automatiquement réouvertes au démarrage."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
 "Si activé, une note ouverte peut être fermée en appuyant sur la touche Échap."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -229,7 +232,7 @@ msgstr ""
 "Désactiver cette option peut être utile lorsqu'une autre application fournit "
 "aussi la fonctionnalité de l'icône de notification."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -238,7 +241,7 @@ msgstr ""
 "suggestions d'orthographes correctes seront affichées dans le menu "
 "contextuel."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -248,7 +251,7 @@ msgstr ""
 "tomboy/global_keybindings seront activés, permettant aux actions utiles de "
 "Tomboy d'être disponibles depuis n'importe quelle application."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -257,7 +260,7 @@ msgstr ""
 "police d'affichage pour les notes. Sinon la police par défaut du bureau sera "
 "utilisée."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -265,7 +268,7 @@ msgstr ""
 "Indique que le greffon Sticky Note Importer n'a pas été lancé, il devrait "
 "être lancé automatiquement au prochain démarrage de Tomboy."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -273,7 +276,7 @@ msgstr ""
 "Nombre entier indiquant le nombre minimum de notes à afficher dans le menu "
 "de Notes Tomboy."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -285,7 +288,7 @@ msgstr ""
 "à 1 indique que la synchronisation automatique est désactivée. La valeur "
 "positive la plus petite acceptable est 5. La valeur est en minutes."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -299,7 +302,7 @@ msgstr ""
 "souhaite être averti lors d'un conflit, afin qu'il puisse gérer chaque "
 "situation au cas par cas."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -319,6 +322,10 @@ msgstr ""
 "jour vers le nouveau nom de la note afin qu'il continue à être un lien vers "
 "la note renommée."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Dernier répertoire utilisé pour l'exportation HTML"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr ""
@@ -395,20 +402,24 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "URL du serveur de synchronisation SSHFS"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Hauteur enregistrée de la fenêtre de recherche"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Hauteur enregistrée de la fenêtre « Rechercher dans toutes les notes »"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Position horizontale enregistrée de la fenêtre de recherche"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr ""
+"Position horizontale enregistrée de la fenêtre « Rechercher dans toutes les "
+"notes »"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Position verticale enregistrée de la fenêtre de recherche"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr ""
+"Position verticale enregistrée de la fenêtre « Rechercher dans toutes les "
+"notes »"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Largeur enregistrée de la fenêtre de recherche"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Largeur enregistrée de la fenêtre « Rechercher dans toutes les notes »"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -424,7 +435,7 @@ msgstr "Afficher le menu de l'applet"
 
 #: ../data/tomboy.schemas.in.h:61
 msgid "Start Here Note"
-msgstr "Note Démarrer ici"
+msgstr "Note « Démarrer ici »"
 
 #: ../data/tomboy.schemas.in.h:62
 msgid "Sticky Note Importer First Run"
@@ -452,9 +463,9 @@ msgid ""
 "for this action."
 msgstr ""
 "Les raccourcis généraux pour la création et l'affichage d'une nouvelle note. "
-"Le format ressemble à « <Control>a » ou à « <Shift><Alt>F1 "
-"». L'analyseur est assez tolérant et autorise majuscules et minuscules ainsi "
-"que les abréviations comme « <Ctl> » et « <Ctrl> ». Si vous "
+"Le format ressemble à « <Control>a » ou à « <Shift><Alt>"
+"F1 ». L'analyseur est assez tolérant et autorise majuscules et minuscules "
+"ainsi que les abréviations comme « <Ctl> » et « <Ctrl> ». Si vous "
 "renseignez l'option avec la chaîne « disabled » (désactivé), il n'y aura pas "
 "de raccourci clavier pour cette action."
 
@@ -656,7 +667,7 @@ msgstr "_Supprimer"
 msgid "Delete the selected note"
 msgstr "Supprime la note sélectionnée"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -700,7 +711,7 @@ msgstr "Icône de notification"
 msgid "Create _New Note"
 msgstr "Créer une _nouvelle note"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Rechercher dans toutes les notes"
 
@@ -712,11 +723,24 @@ msgstr "Ouvre la fenêtre de recherche dans toutes les notes"
 msgid "Start synchronizing notes"
 msgstr "Démarrer la synchronisation des notes"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avancé"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr ""
+"Nombre minimum de notes à afficher dans la liste des notes récentes (maximum "
+"18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Quels liens sur cette note ?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(aucun)"
 
@@ -771,6 +795,26 @@ msgstr "Voulez-vous vraiment supprimer cette icône ?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Si vous supprimez une icône, elle sera définitivement perdue."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Impossible d'ouvrir le courriel"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destination pour l'exportation en HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Exporter les notes liées"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Inclure toutes les autres notes liées"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Exporter en HTML"
@@ -785,10 +829,14 @@ msgid "Note exported successfully"
 msgstr "Note exportée avec succès"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Accès refusé."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Le dossier n'existe pas."
 
@@ -797,22 +845,6 @@ msgstr "Le dossier n'existe pas."
 msgid "Could not save the file \"{0}\""
 msgstr "Impossible d'enregistrer le fichier vers « {0} »"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destination pour l'exportation en HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Exporter les notes liées"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Inclure toutes les autres notes liées"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Impossible d'ouvrir le courriel"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "Chemin du _dossier :"
@@ -821,17 +853,17 @@ msgstr "Chemin du _dossier :"
 msgid "Select Synchronization Folder..."
 msgstr "Sélectionner un dossier de synchronisation..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Le champ du chemin de dossier est vide."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr ""
 "Le chemin de dossier renseigné n'existe pas et Tomboy n'a pas pu le créer."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Dossier local"
 
@@ -877,7 +909,7 @@ msgstr "Aujourd'hui : modèle"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:12
 msgid "Today: "
-msgstr "Aujourd'hui :"
+msgstr "Aujourd'hui : "
 
 #. Format: "Today: Friday, July 01 2005"
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
@@ -894,11 +926,11 @@ msgstr "Rendez-vous"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Modifier la note <span weight=\"bold\">Aujourd'hui : modèle</span> pour "
-"personnaliser le texte que les nouvelles notes vont utiliser."
+"Modifier la note <b>Aujourd'hui : modèle</b> pour personnaliser le texte que "
+"les nouvelles notes vont utiliser."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -921,28 +953,33 @@ msgstr "Page {0} sur {1}"
 #. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
 #: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:242
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
-msgstr "dddd dd/MM/yyyy, hh:mm:ss tt"
+msgstr "dddd dd/MM/yyyy, H:mm:ss"
+
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Supprimer les liens brisés"
 
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Ajouter un croquis"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rveur :"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "Chemin du _dossier (optionnel) :"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -950,15 +987,15 @@ msgstr ""
 "La synchronisation SSH nécessite une clé SSH existante pour ce serveur et "
 "cet utilisateur, ainsi qu'un démon SSH lancé."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Serveur ou nom d'utilisateur vide."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (FUSE sshfs)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -985,15 +1022,19 @@ msgstr "Importation de notes du Pense-bêtes terminé"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr ""
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] ""
+"<b>{0}</b> sur <b>{1}</b> note du Pense-bêtes a été importée avec succès."
+msgstr[1] ""
 "<b>{0}</b> sur <b>{1}</b> notes du Pense-bêtes ont été importées avec succès."
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Pense-bêtes : "
 
@@ -1017,23 +1058,23 @@ msgstr "--- Tasque n'est pas lancé ---"
 msgid "_Underline"
 msgstr "_Souligné"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL :"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "L'URL, le nom d'utilisateur ou le mot de passe sont vides."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (FUSE wdfs)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1046,44 +1087,40 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "L'enregistrement de la configuration vers le trousseau de clés GNOME a "
 "échoué avec le message suivant :"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Site Web de Tomboy"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
-msgstr "Connexion au serveur..."
+msgstr "Connexion au serveur"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
 msgid "Connected"
 msgstr "Connecté"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Le serveur ne répond pas. Essayez plus tard."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "L'autorisation a échoué, essayez à nouveau"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "L'authentification Web de Tomboy a réussi"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1091,23 +1128,122 @@ msgstr ""
 "Retournez dans la fenêtre des préférences de Tomboy et cliquez sur "
 "Enregistrer pour démarrer la synchronisation."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Connecté. Cliquez sur Enregistrer pour démarrer la synchronisation"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr ""
 "Authentification dans le navigateur (cliquez pour réinitialiser la connexion)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Paramétrer le navigateur par défaut et essayer à nouveau"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+# luc: c'est le service web de Tomboy (appelé suivant les endroits Tomboy Online, Snowy, etc.)
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy Web"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Exporter toutes les notes vers {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Démarre l'exportation des notes vers {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Exporte le bloc-notes sélectionné vers {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Démarre l'exportation du bloc-notes vers {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Outils"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exporter"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Exporte vos notes."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Exporter toutes les notes vers {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Exporter le bloc-notes sélectionné vers {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Exporter toutes les notes {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Impossible d'exporter, accès non autorisé."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Impossible d'exporter, le dossier n'existe pas."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Impossible d'exporter : « {0} »"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Erreur inconnue."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Notes non classées"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Vos notes ont été exportées vers « {0} »."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Notes exportées avec succès"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Impossible d'enregistrer les fichiers dans « {0} »"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Créer le dossier de destination pour l'exportation {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Rechercher dans toutes les notes"
 
@@ -1119,10 +1255,11 @@ msgstr "Rechercher dans toutes les notes"
 msgid "Create New Note"
 msgstr "Créer une nouvelle note"
 
+# nouvelle (liste)
 #: ../Tomboy/JumpListManager.cs:136
 #, csharp-format
 msgid "{0} (new)"
-msgstr "{0} (nouveau)"
+msgstr "{0} (nouvelle)"
 
 #: ../Tomboy/JumpListManager.cs:158
 msgid "Recent Notes"
@@ -1160,26 +1297,6 @@ msgstr "Ce nom est déjà utilisé"
 msgid "C_reate"
 msgstr "C_réer"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Modèle de bloc-notes {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Toutes les notes"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Notes non classées"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "_Bloc-notes"
@@ -1219,15 +1336,35 @@ msgid "Delete the selected notebook"
 msgstr "Supprime le bloc-notes sélectionné"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Bloc-notes"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Bloc-notes {0} : modèle"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nouvelle note"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Toutes les notes"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Voulez-vous vraiment supprimer ce bloc-notes ?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1249,34 +1386,40 @@ msgstr "Aucun bloc-notes"
 msgid "New \"{0}\" Note"
 msgstr "Nouvelle note « {0} »"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Placer cette note dans un bloc-notes"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Bloc-notes"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "Nouveau _bloc-notes..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Voulez-vous vraiment supprimer cette note ?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nouvelle note {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Voulez-vous vraiment supprimer « {0} » ?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Voulez-vous vraiment supprimer cette note ?"
 msgstr[1] "Voulez-vous vraiment supprimer ces {0} notes ?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Si vous supprimez une note, elle sera définitivement perdue."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1288,13 +1431,13 @@ msgstr ""
 "que vous avez les permissions appropriées pour écrire dans {0}. Les détails "
 "sur l'erreur sont disponibles dans {1}."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Erreur lors de l'enregistrement des données de la note."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Modèle de nouvelle note"
 
@@ -1422,7 +1565,7 @@ msgstr ""
 "lien sera automatiquement créé vers cette note.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Démarrer ici"
 
@@ -1430,14 +1573,9 @@ msgstr "Démarrer ici"
 msgid "Using Links in Tomboy"
 msgstr "Utilisation des liens dans Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nouvelle note {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Décrivez votre nouvelle note ici."
 
@@ -1501,139 +1639,165 @@ msgstr "Ne jamais renommer les _liens"
 msgid "Alwa_ys rename links"
 msgstr "Tou_jours renommer les liens"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Chercher dans cette note"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Lier à une nouvelle note"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_xte"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Chercher dans cette note"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Fermer _toutes les notes"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Recherche dans vos notes (Ctrl+Maj+F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Rechercher dans vos notes"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Lier"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Lie le texte sélectionné à une nouvelle note (Ctrl+L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Lie le texte sélectionné à une nouvelle note"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Texte"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Définit les propriétés du texte"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Outils"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Utilise des outils sur cette note"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Supprime cette note"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Synchroniser les notes"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Cette note est un modèle de note. Elle détermine le contenu par défaut d'une "
+"note ordinaire et n'apparaîtra pas dans le menu des notes ou dans la fenêtre "
+"de recherche."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Convertir en note ordinaire"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Enregistrer les _dimensions"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Enregistrer la sé_lection"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Enregistrer le _titre"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Rechercher..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Rechercher le _suivant"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Rechercher le _précédent"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Impossible de créer la note"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Rechercher :"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Précédent"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Suivant"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "Gr_as"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Italique"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Barré"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Surligné"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Taille de la police"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normale"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "Énorm_e"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Grande"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Petite"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Augmenter la taille de la police"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Diminuer la taille de la police"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Puces"
 
@@ -1653,11 +1817,11 @@ msgstr "Synchronisation"
 msgid "Add-ins"
 msgstr "Greffons"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "Vérification _orthographique automatique"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1666,11 +1830,11 @@ msgstr ""
 "d'orthographes correctes seront affichées dans le menu contextuel."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Surligner les mots _Wiki"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1679,31 +1843,31 @@ msgstr ""
 "b>. Un clic sur ce mot créera une nouvelle note avec ce nom."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Activer les _listes à puces automatiques"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Utiliser une _police personnalisée"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Lors du renommage d'une note liée : "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Me demander quoi faire"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Ne jamais renommer les liens"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Toujours renommer les liens"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1711,16 +1875,16 @@ msgstr ""
 "Utiliser le modèle de nouvelle note pour définir le texte servant à la "
 "création d'une nouvelle note."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Ouvrir le modèle de nouvelle note"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Activer les ra_ccourcis"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1732,82 +1896,82 @@ msgstr ""
 "Alt>N</b>."
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Afficher le _menu des notes"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Ouvrir « _Démarrer ici »"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Créer une _nouvelle note"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Ouvrir « Rechercher dans _toutes les notes »"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Ser_vice :"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Non configurable"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "S_ynchroniser automatiquement en arrière-plan toutes les"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "minutes"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Avancé..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Les greffons suivants sont installés"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Obtenir des greffons supplémentaires..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Activer"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Désactiver"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Non implémenté"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Préférences de {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Choisir une police pour les notes"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Autres options de synchronisation"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1815,23 +1979,23 @@ msgstr ""
 "Lors d'un conflit entre une note locale et une note sur le serveur de "
 "synchronisation configuré :"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
-msgstr "Toujours me demander quoi faire"
+msgstr "Toujours me demander quoi faire."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
-msgstr "Renommer ma note locale"
+msgstr "Renommer ma note locale."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
-msgstr "Remplacer ma note locale avec celle du serveur"
+msgstr "Remplacer ma note locale avec celle du serveur."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "AVERTISSEMENT : êtes-vous certain ?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Êtes-vous certain ?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1840,26 +2004,26 @@ msgstr ""
 "pourrez être forcé de synchroniser à nouveau toutes vos notes lors de la "
 "sauvegarde de vos nouvelles préférences."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Réinitialisation des préférences de synchronisation"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Vous avez désactivé le service configuré pour la synchronisation. Vos "
 "préférences de synchronisation vont maintenant être effacées. Vous serez "
 "obligé de synchroniser à nouveau toutes vos notes quand vous sauvegarderez "
 "vos nouvelles préférences."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Succès ! Vous êtes connecté."
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Connexion réussie"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1867,326 +2031,130 @@ msgstr ""
 "Tomboy est prêt à synchroniser vos notes. Voulez-vous les synchroniser "
 "maintenant ?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Désole mais une erreur est survenue. Vérifiez vos informations et essayez à "
-"nouveau. Le journal {0} peut aussi vous être utile."
+"Vérifiez vos informations et essayez à nouveau. Le fichier journal {0} peut "
+"contenir plus d'informations à propos de l'erreur."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Erreur lors de la connexion :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Erreur lors de la connexion"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Version :"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Auteur :"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright :"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Dépendances des greffons :"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Rechercher :"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Note"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Dernière modification"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Occurrences"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Occurrence du titre"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} occurrence"
 msgstr[1] "{0} occurrences"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Total : {0} note"
 msgstr[1] "Total : {0} notes"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "{0} note correspondante"
 msgstr[1] "{0} notes correspondantes"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Aucun résultat trouvé dans le bloc-notes sélectionné.\n"
+"Cliquer ici pour rechercher dans toutes les notes."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Cliquer ici pour rechercher dans tous les bloc-notes"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Notes"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Impossible de créer une nouvelle note"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Ce greffon de synchronisation n'est pas pris en charge par votre ordinateur. "
+"Assurez-vous que vous disposez de FUSE and que {0} est correctement installé "
+"et configuré"
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Développement initial :"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Impossible de lire le fichier test."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Contributeurs :"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Le test d'écriture a échoué."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"Benoît Dejean <benoit at placenet.org>\n"
-"Stéphane Raimbault <stephane.raimbault at gmail.com>\n"
-"Cyprien Le Pannérer <cyplp at free.fr>\n"
-"Robert-André Mauchin <zebob.m at pengzone.org>\n"
-"Jonathan Ernst <jonathan at ernstfamily.ch>\n"
-"Bruno Brouard <annoa.b at gmail.com>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Dépassement du délai de connexion au serveur."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Erreur de connexion au serveur."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr ""
-"Une application de prise de notes de bureau simple et facile à utiliser."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "FUSE n'a pas pu être activé."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Page d'accueil"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Une erreur est survenu lors de la connexion au serveur indiqué :"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy : une application de prise de notes simple et facile à utiliser.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Utilisation :\n"
-"  --version\t\t\tAffiche l'information de version.\n"
-"  --help\t\t\tAffiche ce message d'aide.\n"
-"  --note-path [chemin]\t\tCharge/stocke des données de notes dans ce "
-"répertoire.\n"
-"  --search [texte]\t\tOuvre la fenêtre de recherche dans toutes les notes "
-"avec le texte recherché.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tCrée et affiche une nouvelle note.\n"
-"  --new-note [titre]\t\tCrée et affiche une nouvelle note, avec un titre.\n"
-"  --open-note [titre/url]\tAffiche une note existante correspondant au "
-"titre.\n"
-"  --start-here\t\t\tAffiche la note « Démarrer ici ».\n"
-"  --highlight-search [texte]\tRecherche et surligne le texte dans la note "
-"ouverte.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Version {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nouveau)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "À _propos de Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"Le « manuel de notes Tomboy » ne peut être trouvé. Vérifiez que votre "
-"installation a été effectuée correctement."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "L'aide n'a pas été trouvée"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Impossible d'ouvrir l'emplacement"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Aujourd'hui, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Aujourd'hui"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Hier, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Hier"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Il y a {0} jour, {1}"
-msgstr[1] "Il y a {0} jours, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Il y a {0} jour"
-msgstr[1] "Il y a {0} jours"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Aujourd'hui, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Demain"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Dans {0} jour, {1}"
-msgstr[1] "Dans {0} jours, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Dans {0} jour"
-msgstr[1] "Dans {0} jours"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, H:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Sans date"
-
-# Le tt est là pour AM/PM
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, H:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(sans titre {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Une note avec le titre <b>{0}</b> existe déjà. Choisissez un autre nom pour "
-"cette note avant de continuer."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Ce titre de note est déjà utilisé"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Copier l'adresse du lien"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Ouvrir le lien"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Ce greffon de synchronisation n'est pas pris en charge par votre ordinateur. "
-"Assurez-vous que vous disposez de FUSE and que {0} est correctement installé "
-"et configuré."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Impossible de lire le fichier test."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Le test d'écriture a échoué."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Dépassement du délai de connexion au serveur..."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Erreur de connexion au serveur."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "FUSE n'a pas pu être activé."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Une erreur est survenu lors de la connexion au serveur indiqué :"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Détails"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Détails"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2390,10 +2358,6 @@ msgstr ""
 "La version serveur de « {0} » présente des conflits avec votre note locale. "
 "Que voulez-vous faire avec votre note locale ?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Outils"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2427,3 +2391,219 @@ msgstr ""
 "Afin d'éviter ce message dans le futur, vous devriez charger FUSE au "
 "démarrage. Ajoutez « modprobe fuse » dans /etc/init.d/boot.local ou « fuse » "
 "dans /etc/modules."
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Impossible de créer une nouvelle note"
+
+# luc: inclus l'auteur original, des gros contributeurs et les mainteneurs actuels
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Équipe de développement :"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Contributeurs :"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Benoît Dejean <benoit at placenet.org>\n"
+"Stéphane Raimbault <stephane.raimbault at gmail.com>\n"
+"Cyprien Le Pannérer <cyplp at free.fr>\n"
+"Robert-André Mauchin <zebob.m at pengzone.org>\n"
+"Jonathan Ernst <jonathan at ernstfamily.ch>\n"
+"Bruno Brouard <annoa.b at gmail.com>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Autres personnes\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Une application de prise de notes simple et facile à utiliser."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Site Web"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy : une application de prise de notes simple et facile à utiliser.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Autres personnes\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Utilisation :\n"
+"  --version\t\t\tAffiche l'information de version.\n"
+"  --help\t\t\tAffiche ce message d'aide.\n"
+"  --note-path [chemin]\t\tCharge/stocke les données de notes dans ce "
+"répertoire.\n"
+"  --search [texte]\t\tOuvre la fenêtre de recherche dans toutes les notes "
+"avec le texte recherché.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tCrée et affiche une nouvelle note.\n"
+"  --new-note [titre]\t\tCrée et affiche une nouvelle note, avec un titre.\n"
+"  --open-note [titre/url]\tAffiche une note existante correspondant au "
+"titre.\n"
+"  --start-here\t\t\tAffiche la note « Démarrer ici ».\n"
+"  --highlight-search [texte]\tRecherche et surligne le texte dans la note "
+"ouverte.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Version {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nouveau)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "À _propos de Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"Le « manuel de Notes Tomboy » ne peut être trouvé. Vérifiez que votre "
+"installation a été effectuée correctement."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "L'aide n'a pas été trouvée"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Impossible d'ouvrir l'emplacement"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Aujourd'hui, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Aujourd'hui"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Hier, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Hier"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Il y a {0} jour, {1}"
+msgstr[1] "Il y a {0} jours, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Il y a {0} jour"
+msgstr[1] "Il y a {0} jours"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Demain, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Demain"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Dans {0} jour, {1}"
+msgstr[1] "Dans {0} jours, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Dans {0} jour"
+msgstr[1] "Dans {0} jours"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, H:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Sans date"
+
+# Le tt est là pour AM/PM
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, H:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(sans titre {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Une note avec le titre <b>{0}</b> existe déjà. Choisissez un autre nom pour "
+"cette note avant de continuer."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Ce titre de note est déjà utilisé"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copier l'adresse du lien"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Ouvrir le lien"
diff --git a/po/he.po b/po/he.po
index d1fd5fd..5044b22 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-24 12:13+0300\n"
-"PO-Revision-Date: 2011-08-24 12:15+0200\n"
+"POT-Creation-Date: 2011-09-09 12:58+0300\n"
+"PO-Revision-Date: 2011-09-09 12:59+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
 "Language-Team: Hebrew (he at li.org)\n"
 "Language: he\n"
@@ -1101,20 +1101,24 @@ msgid "Tomboy Web"
 msgstr "האתר של Tomboy"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "יצוא כל הפתקיות אל"
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "יצוא כל הפתקיות אל{0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "התחלת יצוא הפתקיות אל"
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "התחלת יצוא הפתקיות אל {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "יצוא הפנקס הנבחר אל"
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "יצוא הפנקס הנבחר אל {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "התחלת יצוא הפנקס אל"
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "התחלת יצוא הפנקס אל {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:65
 #: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1130,12 +1134,19 @@ msgid "Export your notes."
 msgstr "יצוא הפתקיות שלך."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "יצוא כל הפתקיות אל"
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "יצוא כל הפתקיות אל {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "יצוא הפנקס הנבחר אל"
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "יצוא הפנקס הנבחר אל {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "יצוא {0} של כל הפתקיות"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:193
 #: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -1177,7 +1188,8 @@ msgstr "הפתקיות יוצאו בהצלחה"
 msgid "Could not save the files in \"{0}\""
 msgstr "לא ניתן לשמור את הקבצים תחת \"{0}\""
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
 #, csharp-format
 msgid "Create destination folder for {0} export"
 msgstr "יצירת תיקיית יעד לצורך יצוא {0}"
diff --git a/po/hu.po b/po/hu.po
index cac97d2..45923b3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tomboy master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 15:31+0100\n"
-"PO-Revision-Date: 2011-03-15 15:31+0100\n"
+"POT-Creation-Date: 2011-09-20 15:17+0200\n"
+"PO-Revision-Date: 2011-09-20 15:18+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome at fsf dot hu>\n"
+"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,41 +82,51 @@ msgid "Custom Font Face"
 msgstr "Egyéni jegyzet-betűkészlet"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "Meghatározza a Keresés ablak X koordinátáját, a Tomboy kilépésekor tárolódik."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Meghatározza a „Keresés minden jegyzetben” ablak X koordinátáját, a Tomboy "
+"kilépésekor tárolódik."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "Meghatározza a Keresés ablak Y koordinátáját, a Tomboy kilépésekor tárolódik."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Meghatározza a „Keresés minden jegyzetben” ablak Y koordinátáját, a Tomboy "
+"kilépésekor tárolódik."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Meghatározza a Keresés ablak magasságát képpontban, a Tomboy kilépésekor "
-"tárolódik."
+"Meghatározza a „Keresés minden jegyzetben” ablak magasságát képpontban, a "
+"Tomboy kilépésekor tárolódik."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Meghatározza a Keresés ablak szélességét képpontban, a Tomboy kilépésekor "
-"tárolódik."
+"Meghatározza a „Keresés minden jegyzetben” ablak szélességét képpontban, a "
+"Tomboy kilépésekor tárolódik."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Automatikusan felsorolásjelezett listák engedélyezése."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Középső gombos beillesztés engedélyezése az ikonon."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Tálcaikon engedélyezése"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Wiki-szavak kiemelésének engedélyezése"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Automatikusan felsorolásjelezett listák engedélyezése."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "A jegyzetek bezárásának engedélyezése az Esc billentyűvel."
@@ -175,20 +185,16 @@ msgid "HTML Export All Linked Notes"
 msgstr "Hivatkozott jegyzetek exportálása HTML-be"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Utolsó HTML-be exportálás könyvtára"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Hivatkozott jegyzetek exportálása HTML-be"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Ha le van tiltva, akkor a „Jegyzet törlése” megerősítési ablak nem jelenik "
 "meg."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -196,7 +202,7 @@ msgstr ""
 "Ha az enable_custom_font engedélyezve van, a jegyzetek az itt megadott nevű "
 "betűkészlettel jelennek meg."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -204,13 +210,13 @@ msgstr ""
 "Ha engedélyezve van, akkor a Tomboy kilépésekor megnyitott jegyzetek "
 "automatikusan újra meg lesznek nyitva indításkor."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
 "Ha engedélyezett, egy megnyitott jegyzet bezárható az ESC billentyű "
 "lenyomásával"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -220,7 +226,7 @@ msgstr ""
 "területen. Ennek letiltása akkor lehet hasznos, ha másik alkalmazás "
 "biztosítja a tálcaikon funkcióit."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -228,7 +234,7 @@ msgstr ""
 "Ha be van állítva, az elgépelések vörössel alá lesznek húzva és a javítási "
 "javaslatok a felbukkanó menüben jelennek meg."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -238,7 +244,7 @@ msgstr ""
 "globális billentyű-hozzárendelések engedélyezve lesznek, így a hasznos "
 "Tomboy műveletek bármely alkalmazásból elérhetőek lesznek."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -247,7 +253,7 @@ msgstr ""
 "betűkészlettel jelennek meg, egyébként a rendszer alapértelmezett "
 "betűkészlete lesz használva."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -255,7 +261,7 @@ msgstr ""
 "Azt jelzi, hogy a Ragadós cetlik importáló bővítmény még nem futott, így a "
 "Tomboy következő indításakor le kell futnia."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -263,7 +269,7 @@ msgstr ""
 "A Tomboy jegyzetmenüben megjelenő jegyzetek legkisebb számát meghatározó "
 "egész."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -275,7 +281,7 @@ msgstr ""
 "szinkronizálás kikapcsolt állapotát jelzi. A legkisebb elfogadható érték az "
 "5. Az érték percekben értendő."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -288,7 +294,7 @@ msgstr ""
 "felsorolásra kerülnek leképezésre. A 0 esetén a felhasználó ütközések esetén "
 "értesítést kér, így azokat külön-külön kezelheti."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -308,6 +314,10 @@ msgstr ""
 "frissíteni kell az új jegyzetnévre, hogy az továbbra is ugyanarra a "
 "jegyzetre hivatkozzon."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "HTML exportálásban utoljára használt könyvtár"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Hivatkozásfrissítés viselkedése jegyzetek átnevezésekor"
@@ -377,20 +387,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS szinkronizálási kiszolgáló URL címe"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Keresés ablak mentett magassága"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "„Keresés minden jegyzetben” ablak mentett magassága"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Keresés ablak mentett vízszintes pozíciója"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "„Keresés minden jegyzetben” ablak mentett vízszintes pozíciója"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Keresés ablak mentett függőleges pozíciója"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "„Keresés minden jegyzetben” ablak mentett függőleges pozíciója"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Keresés ablak mentett szélessége"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "„Keresés minden jegyzetben” ablak mentett szélessége"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -634,7 +644,7 @@ msgstr "_Törlés"
 msgid "Delete the selected note"
 msgstr "A kijelölt jegyzet törlése"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Bezárás"
 
@@ -678,7 +688,7 @@ msgstr "Tálcaikon"
 msgid "Create _New Note"
 msgstr "Ú_j jegyzet"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "Keresés _minden jegyzetben"
 
@@ -690,11 +700,22 @@ msgstr "A Keresés minden jegyzetben ablak megnyitása"
 msgid "Start synchronizing notes"
 msgstr "Jegyzetek szinkronizálásának megkezdése"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Speciális"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "A Legutóbbi listában megjelenő jegyzetek legkisebb száma (legfeljebb 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Mi hivatkozik erre?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(semmi)"
 
@@ -747,6 +768,26 @@ msgstr "Biztosan törli ezt az ikont?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Ha töröl egy ikont, akkor az véglegesen elvész."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Nem lehet megnyitni az e-mailt"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "A HTML-be exportálás célja"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Hivatkozott jegyzetek exportálása"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Minden más hivatkozott jegyzet felvétele"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Exportálás HTML-be"
@@ -761,10 +802,14 @@ msgid "Note exported successfully"
 msgstr "A jegyzet sikeresen exportálva"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Hozzáférés megtagadva."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "A mappa nem létezik."
 
@@ -773,22 +818,6 @@ msgstr "A mappa nem létezik."
 msgid "Could not save the file \"{0}\""
 msgstr "A(z) „{0}” fájl mentése meghiúsult"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "A HTML-be exportálás célja"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Hivatkozott jegyzetek exportálása"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Minden más hivatkozott jegyzet felvétele"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Nem lehet megnyitni az e-mailt"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "Ma_ppaútvonal:"
@@ -797,15 +826,15 @@ msgstr "Ma_ppaútvonal:"
 msgid "Select Synchronization Folder..."
 msgstr "Válassza ki a szinkronizálási mappát…"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "A mappaútvonal mező üres."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "A megadott mappaútvonal nem létezik és a Tomboy nem volt képes létrehozni."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Helyi mappa"
 
@@ -868,11 +897,11 @@ msgstr "Találkozók"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"A <span weight=\"bold\">Ma: sablon</span> jegyzet módosításával személyre "
-"szabhatja az új Ma jegyzetek szövegét."
+"A <b>Ma: sablon</b> jegyzet módosításával személyre szabhatja az új Ma "
+"jegyzetek szövegét."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -897,26 +926,31 @@ msgstr "{0}/{1} oldal"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd, yyyy. MM. dd, h.mm.ss tt"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Törött hivatkozások eltávolítása"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Vázlat hozzáadása"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "_Kiszolgáló:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Felhasználónév:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "M_appaútvonal (elhagyható):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -924,15 +958,15 @@ msgstr ""
 "Az SSH szinkronizálás megköveteli, hogy a kiszolgáló és felhasználó meglévő "
 "kulcspárja egy futó SSH démonhoz legyen adva."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "A kiszolgáló vagy felhasználónév mező üres."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -959,14 +993,16 @@ msgstr "A Ragadós cetlik importálása befejeződött."
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> / <b>{1}</b> ragadós cetli sikeresen importálva."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> / <b>{1}</b> ragadós cetli sikeresen importálva."
+msgstr[1] "<b>{0}</b> / <b>{1}</b> ragadós cetli sikeresen importálva."
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Ragadós cetli: "
 
@@ -990,23 +1026,23 @@ msgstr "--- A Tasque nem fut ---"
 msgid "_Underline"
 msgstr "_Aláhúzás"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Jelszó:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "Az URL, felhasználónév vagy jelszó mező üres."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1019,16 +1055,12 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "A beállítások GNOME kulcstartóra mentése meghiúsult a következő üzenettel:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy web"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Kapcsolódás kiszolgálóhoz"
 
@@ -1037,23 +1069,23 @@ msgid "Connected"
 msgstr "Kapcsolódva"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "A kiszolgáló nem válaszol. Próbálja újra később."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "A bejelentkezés meghiúsult, próbálja újra"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "A Tomboy webes bejelentkezés sikeres"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1061,22 +1093,120 @@ msgstr ""
 "Térjen vissza a Tomboy Beállítások ablakába és nyomja meg a Start gombot a "
 "szinkronizálás megkezdéséhez."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Kapcsolódva. Nyomja meg a Mentés gombot a szinkronizálás megkezdéséhez"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Bejelentkezés böngészőben (nyomja meg a kapcsolat visszaállításához)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Állítsa be az alapértelmezett böngészőt, és próbálja újra"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy web"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Minden jegyzet exportálása ebbe: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Jegyzetek exportálásának megkezdése ebbe: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "A kijelölt jegyzettömb exportálása ebbe: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Jegyzettömb exportálásának megkezdése ebbe: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Eszközök"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exportálás"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Jegyzetek exportálása."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Minden jegyzet exportálása ebbe: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "A kijelölt jegyzettömb exportálása ebbe: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Minden jegyzet {0} exportálása"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Nem sikerült az exportálás, hozzáférés megtagadva."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Nem sikerült az exportálás, a mappa nem létezik."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Nem sikerült az exportálás: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Ismeretlen hiba."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Osztályozatlan jegyzetek"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Jegyzetei exportálva lettek a következőbe: „{0}”."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "A jegyzetek sikeresen exportálva"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "A fájlok mentése meghiúsult ide: „{0}”"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Célmappa létrehozása a(z) {0} exportáláshoz"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Keresés minden jegyzetben"
 
@@ -1129,26 +1259,6 @@ msgstr "A név már foglalt"
 msgid "C_reate"
 msgstr "_Létrehozás"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} jegyzettömb-sablon"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Minden jegyzet"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Osztályozatlan jegyzetek"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "_Jegyzettömbök"
@@ -1188,15 +1298,35 @@ msgid "Delete the selected notebook"
 msgstr "A kijelölt jegyzettömb törlése"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Jegyzettömbök"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} jegyzettömb-sablon"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Új jegyzet"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Minden jegyzet"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Biztosan törli ezt a jegyzettömböt?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1218,34 +1348,40 @@ msgstr "Nincs jegyzettömb"
 msgid "New \"{0}\" Note"
 msgstr "Új „{0}” jegyzet"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Jegyzet elhelyezése jegyzettömbbe"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Jegyzettömb"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "Új jeg_yzettömb…"
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Biztosan törli ezt a jegyzetet?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "{0}. új jegyzet"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Biztosan törli a következőt: „{0}”?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Biztosan törli ezt a(z) {0} jegyzetet?"
 msgstr[1] "Biztosan törli ezt a(z) {0} jegyzetet?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Ha töröl egy jegyzetet, akkor az véglegesen elvész."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1256,13 +1392,13 @@ msgstr ""
 "lemezterület és rendelkezik jogosultságokkal a(z) {0} írásához. A hiba "
 "részletei a(z) {1} alatt találhatók."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Hiba a jegyzet adatainak mentésekor."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Új jegyzet sablonja"
 
@@ -1390,7 +1526,7 @@ msgstr ""
 "automatikusan hivatkozássá alakul.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Kezdje itt!"
 
@@ -1398,14 +1534,9 @@ msgstr "Kezdje itt!"
 msgid "Using Links in Tomboy"
 msgstr "Hivatkozások használata a Tomboyban"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "{0}. új jegyzet"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Ide írhatja a jegyzet tartalmát."
 
@@ -1470,139 +1601,164 @@ msgstr "S_oha nem nevezem át"
 msgid "Alwa_ys rename links"
 msgstr "_Mindig átnevezem"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Keresés a jegyzetben"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Hivatkozás egy új jegyzetre"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "_Szöveg"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "Keresés a _jegyzetben"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Minden _jegyzet bezárása"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Keresés"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Keresés a jegyzetei között (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Keresés a jegyzetekben"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Hivatkozás"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "A kijelölt szöveg hivatkozzon egy új jegyzetre (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "A kijelölt szöveg hivatkozzon egy új jegyzetre"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Szöveg"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Szöveg beállításai"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Eszközök"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Eszközök használata ezen a jegyzeten"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Jegyzet törlése"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Jegyzetek szinkronizálása"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Ez a jegyzet egy sablon jegyzet. A normál jegyzetek alap tartalmát határozza "
+"meg, és nem jelenik meg a jegyzet menüben vagy a keresés ablakban."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Átalakítás normál jegyzetté"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "_Méret mentése"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "_Kijelölés mentése"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "_Cím mentése"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Keresés…"
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "_Következő találat"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "_Előző találat"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Nem hozható létre jegyzet"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "Ke_resés:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Előző"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Tovább"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Félkövér"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Dőlt"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "Á_thúzott"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Kiemelés"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Betűméret"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "N_ormál"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "Óriá_si"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Nagy"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "Ki_csi"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Betűméret növelése"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Betűméret csökkentése"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Felsorolás"
 
@@ -1622,11 +1778,11 @@ msgstr "Szinkronizálás"
 msgid "Add-ins"
 msgstr "Bővítmények"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "_Helyesírás-ellenőrzés gépelés közben"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1635,11 +1791,11 @@ msgstr ""
 "felbukkanó menüben jelennek meg."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "_Wiki-szavak kiemelése"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1648,31 +1804,31 @@ msgstr ""
 "kattintás a szóra új jegyzetet hoz létre, ezzel a névvel."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "A_utomatikusan felsorolásjelezett listák engedélyezése"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "_Egyéni betűkészlet használata"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Hivatkozott jegyzet átnevezésekor: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Mindig kérdezzen"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Soha ne nevezze át a hivatkozásokat"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Mindig nevezze át a hivatkozásokat"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1680,16 +1836,16 @@ msgstr ""
 "Az új jegyzetek sablonjának segítségével megadható az új jegyzet "
 "létrehozásakor használandó szöveg."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Új jegyzetek sablonjának megnyitása"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "_Gyorsbillentyűk figyelése"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1700,82 +1856,82 @@ msgstr ""
 "b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Jegyzetek menü _megjelenítése"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "„_Kezdje itt!” megnyitása"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Ú_j jegyzet létrehozása"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "A „Keresés _minden jegyzetben” megnyitása"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "S_zolgáltatás:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Nem konfigurálható"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "A_utomatikus szinkronizálás a háttérben minden"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "percben"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "Spe_ciális…"
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "A következő bővítmények vannak telepítve"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "További bővítmények letöltése"
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Engedélyezés"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Tiltás"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Nincs megvalósítva"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} beállításai"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Jegyzet betűkészletének kiválasztása"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "A szinkronizálás további beállításai"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1783,23 +1939,23 @@ msgstr ""
 "Ha helyi és a beállított szinkronizálási kiszolgálón található jegyzet "
 "között ütközés van:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Mindig kérdezzen"
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Nevezze át a helyi jegyzetet"
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Cserélje a helyi jegyzetet a kiszolgálón találhatóra"
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "FIGYELMEZTETÉS: Biztosan ezt akarja tenni?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Biztos benne?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1807,25 +1963,25 @@ msgstr ""
 "A szinkronizálás beállításainak törlése nem ajánlott. Új beállítások "
 "mentésekor szükség lehet a jegyzetek újraszinkronizálására."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Szinkronizálás beállításainak visszaállítása"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Letiltotta a beállított szinkronizációs szolgáltatást. A szinkronizációs "
 "beállításai törlésre kerülnek. Új beállítások mentésekor szükség lehet a "
 "jegyzetek újraszinkronizálására."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Sikeresen csatlakozott"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "A kapcsolódás sikeres"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1833,318 +1989,129 @@ msgstr ""
 "A Tomboy készen áll a jegyzetei szinkronizálására. Kívánja azokat most "
 "szinkronizálni?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Elnézést, hiba történt. Ellenőrizze az információkat, és próbálkozzon újra. A"
-"(z) {0} fájl tartalma is hasznos lehet."
+"Ellenőrizze az információkat, és próbálkozzon újra. A(z) {0} naplófájl "
+"további információkat tartalmazhat a hibáról."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Hiba a csatlakozás közben"
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Hiba a csatlakozáskor"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Verzió:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Szerző:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Bővítmény függőségei:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Keresés:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Jegyzet"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Legutóbb módosítva"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Találat"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Cím illeszkedik"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} találat"
 msgstr[1] "{0} találat"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Összesen {0} jegyzet"
 msgstr[1] "Összesen {0} jegyzet"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Találat: {0} jegyzet"
 msgstr[1] "Találat: {0} jegyzet"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Nincsenek találatok a kijelölt jegyzettömbben.\n"
+"Kattintson ide az összes jegyzetben való kereséshez."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Kattintson ide az összes jegyzettömbben való kereséshez"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Jegyzetek"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Nem hozható létre új jegyzet"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"A szinkronizációs bővítmény nem támogatott ezen a számítógépen. Győződjön "
+"meg róla, hogy a FUSE és a(z) {0} megfelelően van telepítve és beállítva."
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Elsődleges fejlesztő:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Nem sikerült olvasni a tesztfájlt."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Közreműködők:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Az írási teszt meghiúsult."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"Kelemen Gábor <kelemeng at gnome dot hu>\n"
-"Kéménczy Kálmán <kkemenczy at novell dot com>\n"
-"Török Gábor <gabo at linuxportal dot hu>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Időtúllépés a kiszolgálóhoz kapcsolódás közben."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 mások\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Hiba a kiszolgálóhoz kapcsolódás közben."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Egyszerű és könnyen használható asztali jegyzetkezelő alkalmazás."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "A FUSE nem engedélyezhető."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Honlap"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Hiba történt a megadott kiszolgálóhoz kapcsolódás közben:"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: Egyszerű, könnyen használható asztali jegyzetkezelő alkalmazás.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware dot com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Használat:\n"
-"  --version\t\t\tVerzióinformációk megjelenítése\n"
-"  --help\t\t\tEzen súgóüzenet megjelenítése.\n"
-"  --note-path [útvonal]\t\tJegyzetadatok betöltése a könyvtárból, vagy\n"
-"\t\t\t\ttárolása a könyvtárban.\n"
-"  --search [szöveg]\t\tA Keresés minden jegyzetben ablak megnyitása az\n"
-"\t\t\t\tadott keresőszöveggel.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tÚj jegyzet létrehozása és megnyitása.\n"
-"  --new-note [cím]\t\tÚj jegyzet létrehozása és megnyitása, a megadott\n"
-"                  \t\tcímmel.\n"
-"  --open-note [cím/url]\t\tAdott nevű jegyzet megjelenítése.\n"
-"  --start-here\t\t\tA „Kezdje itt!” jegyzet megjelenítése.\n"
-"  --highlight-search [szöveg]\tAz adott szöveg keresése és kiemelése a\n"
-"                             \tmegnyitott jegyzetben.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "{0} verzió"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (új)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "A Tomboy _névjegye"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"A „Tomboy jegyzetkezelő kézikönyve” nem található. Ellenőrizze, hogy a "
-"telepítés sikeresen fejeződött-e be."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Nem található súgó"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Nem lehet megnyitni a helyet"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Ma, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Ma"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Tegnap, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Tegnap"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} napja, {1}"
-msgstr[1] "{0} napja, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} napja"
-msgstr[1] "{0} napja"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Holnap, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Holnap"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "{0} napon belül, {1}"
-msgstr[1] "{0} napon belül, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "{0} napon belül"
-msgstr[1] "{0} napon belül"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d., h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "MMMM d"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Nincs dátum"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "yyyy. MMMM d. h.mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "yyyy. MMMM d"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Névtelen {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr "Már létezik <b>{0}</b> nevű jegyzet. A folytatáshoz válasszon másik nevet."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "A jegyzet neve foglalt"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "Hivatkozás cí_mének másolása"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Hivatkozás megnyitása"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"A szinkronizációs bővítmény nem támogatott ezen a számítógépen. Győződjön "
-"meg róla, hogy a FUSE és a(z) {0} megfelelően van telepítve és beállítva."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Nem sikerült olvasni a tesztfájlt."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Az írási teszt meghiúsult."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Időtúllépés a kiszolgálóhoz kapcsolódás közben."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Hiba a kiszolgálóhoz kapcsolódás közben."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "A FUSE nem engedélyezhető."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Hiba történt a megadott kiszolgálóhoz kapcsolódás közben:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Részletek"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Részletek"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2342,10 +2309,6 @@ msgstr ""
 "A(z) „{0}” kiszolgálón található verziója ütközik a helyi jegyzettel. Mit "
 "kíván tenni a helyi jegyzettel?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Eszközök"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2380,3 +2343,212 @@ msgstr ""
 "modult. Vegye fel a „modprobe fuse” sort az /etc/init.d/boot.local vagy a "
 "„fuse” sort az /etc/modules fájlba."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Nem hozható létre új jegyzet"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Elsődleges fejlesztő:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Közreműködők:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Kelemen Gábor <kelemeng at gnome dot hu>\n"
+"Kéménczy Kálmán <kkemenczy at novell dot com>\n"
+"Török Gábor <gabo at linuxportal dot hu>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 mások\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Egyszerű és könnyen használható asztali jegyzetkezelő alkalmazás."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Honlap"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Egyszerű, könnyen használható asztali jegyzetkezelő alkalmazás.\n"
+"Copyright © 2004-2006 Alex Graveley\n"
+"<alex at beatniksoftware dot com>\n"
+"\n"
+"Copyright © 2004-2011 mások\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Használat:\n"
+"  --version\t\t\tVerzióinformációk megjelenítése\n"
+"  --help\t\t\tEzen súgóüzenet megjelenítése.\n"
+"  --note-path [útvonal]\t\tJegyzetadatok betöltése a könyvtárból, vagy\n"
+"\t\t\t\ttárolása a könyvtárban.\n"
+"  --search [szöveg]\t\tA Keresés minden jegyzetben ablak megnyitása az\n"
+"\t\t\t\tadott keresőszöveggel.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tÚj jegyzet létrehozása és megnyitása.\n"
+"  --new-note [cím]\t\tÚj jegyzet létrehozása és megnyitása, a megadott\n"
+"                  \t\tcímmel.\n"
+"  --open-note [cím/url]\t\tAdott nevű jegyzet megjelenítése.\n"
+"  --start-here\t\t\tA „Kezdje itt!” jegyzet megjelenítése.\n"
+"  --highlight-search [szöveg]\tAz adott szöveg keresése és kiemelése a\n"
+"                             \tmegnyitott jegyzetben.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "{0} verzió"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (új)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "A Tomboy _névjegye"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"A „Tomboy jegyzetkezelő kézikönyve” nem található. Ellenőrizze, hogy a "
+"telepítés sikeresen fejeződött-e be."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Nem található súgó"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Nem lehet megnyitni a helyet"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Ma, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Ma"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Tegnap, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Tegnap"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} napja, {1}"
+msgstr[1] "{0} napja, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} napja"
+msgstr[1] "{0} napja"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Holnap, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Holnap"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "{0} napon belül, {1}"
+msgstr[1] "{0} napon belül, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "{0} napon belül"
+msgstr[1] "{0} napon belül"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d., h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "MMMM d"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Nincs dátum"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "yyyy. MMMM d. h.mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "yyyy. MMMM d"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Névtelen {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr "Már létezik <b>{0}</b> nevű jegyzet. A folytatáshoz válasszon másik nevet."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "A jegyzet neve foglalt"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "Hivatkozás cí_mének másolása"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Hivatkozás megnyitása"
+
diff --git a/po/id.po b/po/id.po
index cae1f65..5637cf0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2004, 2005 Alex Graveley <alex at beatniksoftware.com>
 # This file is distributed under the same license as the tomboy package.
 #
-# Andika Triwidada <andika at gmail.com>, 2009, 2011.
+# Andika Triwidada <andika at gmail.com>, 2009, 2010, 2011.
 # Dirgita <dirgitadevina at yahoo.co.id>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-07-19 07:37+0000\n"
-"PO-Revision-Date: 2011-08-18 16:21+0700\n"
+"POT-Creation-Date: 2011-09-05 17:55+0000\n"
+"PO-Revision-Date: 2011-09-06 13:29+0700\n"
 "Last-Translator: Andika Triwidada <andika at gmail.com>\n"
 "Language-Team: GNOME Indonesian Translation Team <gnome at i15n.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
-msgstr "Aksesoris"
+msgstr "Aksesori"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:2
 msgid "Simple and easy to use note-taking"
@@ -30,31 +30,26 @@ msgstr "Pembuat catatan yang sederhana dan mudah dipakai"
 msgid "Tomboy Applet Factory"
 msgstr "Pabrik Aplet Tomboy"
 
-#: ../data/GNOME_TomboyApplet.server.in.in.h:4
-#: ../data/tomboy.desktop.in.h:3
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
 #: ../Tomboy/Tray.cs:579
 msgid "Tomboy Notes"
 msgstr "Tomboy Catatan"
 
-#: ../data/GNOME_TomboyApplet.xml.h:1
-#: ../Tomboy/ActionManager.cs:179
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
 #: ../Tomboy/Tray.cs:274
 msgid "S_ynchronize Notes"
 msgstr "_Selaraskan Catatan"
 
-#: ../data/GNOME_TomboyApplet.xml.h:2
-#: ../Tomboy/ActionManager.cs:164
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../data/GNOME_TomboyApplet.xml.h:3
-#: ../Tomboy/ActionManager.cs:157
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
 #: ../Tomboy/Tray.cs:288
 msgid "_Help"
 msgstr "Ba_ntuan"
 
-#: ../data/GNOME_TomboyApplet.xml.h:4
-#: ../Tomboy/ActionManager.cs:153
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
 #: ../Tomboy/Tray.cs:283
 msgid "_Preferences"
 msgstr "_Preferensi"
@@ -112,7 +107,6 @@ msgid "Enable WikiWord highlighting"
 msgstr "Aktifkan penandaan KataWiki"
 
 #: ../data/tomboy.schemas.in.h:12
-#| msgid "Enable Auto bulleted lists."
 msgid "Enable automatic bulleted lists."
 msgstr "Aktifkan daftar dibulet otomatis."
 
@@ -412,8 +406,7 @@ msgstr "_Berkas"
 msgid "_New"
 msgstr "_Baru"
 
-#: ../Tomboy/ActionManager.cs:131
-#: ../Tomboy/ActionManager.cs:172
+#: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
 msgid "Create a new note"
 msgstr "Membuat catatan baru"
 
@@ -433,8 +426,7 @@ msgstr "_Hapus"
 msgid "Delete the selected note"
 msgstr "Menghapus catatan yang dipilih"
 
-#: ../Tomboy/ActionManager.cs:142
-#: ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Tutup"
 
@@ -442,8 +434,7 @@ msgstr "_Tutup"
 msgid "Close this window"
 msgstr "Menutup jendela ini"
 
-#: ../Tomboy/ActionManager.cs:146
-#: ../Tomboy/Tray.cs:300
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
 msgid "_Quit"
 msgstr "_Keluar"
 
@@ -455,8 +446,7 @@ msgstr "Keluar dari Tomboy"
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../Tomboy/ActionManager.cs:154
-#: ../Tomboy/PreferencesDialog.cs:65
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "Preferensi Tomboy"
 
@@ -468,8 +458,7 @@ msgstr "_Isi"
 msgid "Tomboy Help"
 msgstr "Bantuan Tomboy"
 
-#: ../Tomboy/ActionManager.cs:165
-#: ../Tomboy/MacApplication.cs:233
+#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
 msgid "About Tomboy"
 msgstr "Tentang Tomboy"
 
@@ -481,8 +470,7 @@ msgstr "IkonBaki"
 msgid "Create _New Note"
 msgstr "Buat Catata_n Baru"
 
-#: ../Tomboy/ActionManager.cs:175
-#: ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Cari di Semua Catatan"
 
@@ -496,13 +484,11 @@ msgstr "Memulai penyelarasan catatan"
 
 #. Addin's tab caption
 #: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
-#| msgid "Ad_vanced"
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
 #. Menu Note Count option
 #: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
-#| msgid "Minimum number of notes to show in menu"
 msgid "Minimum number of notes to show in Recent list (maximum 18)"
 msgstr "Cacah minimal catatan yang ditampilkan di daftar Baru-baru ini (maksimal 18)"
 
@@ -618,15 +604,15 @@ msgstr "Lokasi _Folder:"
 msgid "Select Synchronization Folder..."
 msgstr "Pilih Folder Penyelarasan..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Ruas lokasi folder kosong."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "Lokasi folder yang dinyatakan tak ada, dan Tomboy tak bisa membuatnya."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Folder Lokal"
 
@@ -650,8 +636,7 @@ msgstr "Sisipkan Tanda Waktu"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223
-#: ../Tomboy/Preferences.cs:154
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd, MMMM d, h:mm tt"
 
@@ -689,9 +674,6 @@ msgid "Appointments"
 msgstr "Janji"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-#| msgid ""
-#| "Change the <span weight=\"bold\">Today: Template</span> note to customize "
-#| "the text that new Today notes have."
 msgid "Change the <b>Today: Template</b> note to customize the text that new Today notes have."
 msgstr "Ubah catatan <b>Hari Ini: Templat</b> untuk menggubah teks yang dipunyai oleh catatan Hari Ini yang baru."
 
@@ -720,7 +702,6 @@ msgstr "dddd dd/MM/yyyy, HH:mm:ss"
 
 #. Adding menu item when note is opened and window created
 #: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
-#| msgid "Never rename links"
 msgid "Remove broken links"
 msgstr "Buang taut yang rusak"
 
@@ -728,34 +709,34 @@ msgstr "Buang taut yang rusak"
 msgid "Add a sketch"
 msgstr "Tambah suatu sketsa"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rver:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "Nama pe_ngguna:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "Lokasi _Folder (tidak wajib):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid "SSH synchronization requires an existing SSH key for this server and user, added to a running SSH daemon."
 msgstr "Penyelarasan SSH memerlukan kunci SSH yang telah ada bagi user dan server ini, ditambahkan ke daemon SSH yang sedang berjalan."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Ruas server atau nama pengguna kosong."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
 msgid "SSH"
 msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid "Timeout connecting to server. Please ensure that your SSH key has been added to a running SSH daemon."
 msgstr "Waktu tunggu habis saat menyambung ke server. Silakan pastikan bahwa kunci SSH Anda telah ditambahkan ke suatu daemon SSH yang sedang berjalan."
 
@@ -778,7 +759,6 @@ msgstr "Impor Catatan Lengket telah lengkap"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-#| msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
 msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
 msgid_plural "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
 msgstr[0] "<b>{0}</b> dari <b>{1}</b> Catatan Lengket telah sukses diimpor."
@@ -811,23 +791,23 @@ msgstr "--- Tasque tidak sedang jalan ---"
 msgid "_Underline"
 msgstr "_Garis bawah"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Sandi:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "URL, nama pengguna, atau sandi kosong."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid "There was an error connecting to the server.  This may be caused by using an incorrect user name and/or password."
 msgstr "Ada galat menyambung ke server. Ini mungkin disebabkan oleh nama pengguna dan/atau sandi salah."
 
@@ -836,12 +816,12 @@ msgstr "Ada galat menyambung ke server. Ini mungkin disebabkan oleh nama penggun
 #. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "Menyimpan konfigurasi ke gantungan kunci GNOME gagal dengan pesan berikut:"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Terhubung ke Server"
 
@@ -850,38 +830,38 @@ msgid "Connected"
 msgstr "Terhubung"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Server tak menjawab. Coba lagi nanti."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Otorisasi gagal, Coba Lagi"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Otorisasi Web Tomboy Sukses"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid "Please return to the Tomboy Preferences window and press Save to start synchronizing."
 msgstr "Silakan kembali ke jendela Preferensi Tomboy dan tekan Simpan untuk mulai menyelaraskan."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Tersambung. Tekan Simpan untuk mulai penyelarasan"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Otorisasi di peramban (Tekan untuk mereset sambungan)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Tata peramban baku dan coba lagi"
 
@@ -890,23 +870,28 @@ msgid "Tomboy Web"
 msgstr "Web Tomboy"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:53
-#| msgid "HTML Export All Linked Notes"
-msgid "Export All Notes to "
-msgstr "Ekspor Semua Catatan ke"
+#, csharp-format
+#| msgid "Export All Notes to "
+msgid "Export All Notes to {0}"
+msgstr "Ekspor Semua Catatan ke {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:54
-#| msgid "Start synchronizing notes"
-msgid "Start exporting notes to "
-msgstr "Memulai mengekspor catatan ke"
+#, csharp-format
+#| msgid "Start exporting notes to "
+msgid "Start exporting notes to {0}"
+msgstr "Memulai mengekspor catatan ke {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:58
-#| msgid "Delete the selected notebook"
-msgid "Export selected notebook to "
-msgstr "Ekspor buku catatan yang dipilih ke"
+#, csharp-format
+#| msgid "Export selected notebook to "
+msgid "Export selected notebook to {0}"
+msgstr "Ekspor buku catatan yang dipilih ke {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Mulai mengekspor buku catatan ke"
+#, csharp-format
+#| msgid "Start exporting notebook to "
+msgid "Start exporting notebook to {0}"
+msgstr "Mulai mengekspor buku catatan ke {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:65
 #: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -914,41 +899,44 @@ msgid "_Tools"
 msgstr "_Perkakas"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:68
-#| msgid "Export to HTML"
 msgid "Export"
 msgstr "Ekspor"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:69
-#| msgid "Export linked notes"
 msgid "Export your notes."
 msgstr "Ekspor catatan Anda."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:72
-#| msgid "HTML Export All Linked Notes"
-msgid "Export All Notes To "
-msgstr "Ekspor Semua Catatan Ke"
+#, csharp-format
+#| msgid "Export All Notes To "
+msgid "Export All Notes To {0}"
+msgstr "Ekspor Semua Catatan ke {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:77
-#| msgid "Delete Note_book"
-msgid "Export Selected Notebook To "
-msgstr "Ekspor Buku Catatan Yang Dipilih Ke"
+#, csharp-format
+#| msgid "Export Selected Notebook To "
+msgid "Export Selected Notebook To {0}"
+msgstr "Ekspor Buku Catatan Yang Dipilih ke {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+#| msgid "All Notes"
+msgid "All Notes {0} Export"
+msgstr "Ekspor {0} Semua Catatan"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:193
 #: ../Tomboy/ExportAllApplicationAddin.cs:271
-#| msgid "Could not read testfile."
 msgid "Could not export, access denied."
 msgstr "Tak bisa mengekspor, akses ditolak."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:198
 #: ../Tomboy/ExportAllApplicationAddin.cs:276
-#| msgid "Folder does not exist."
 msgid "Could not export, folder does not exist."
 msgstr "Tak bisa mengekspor, folder tidak ada."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:203
 #: ../Tomboy/ExportAllApplicationAddin.cs:281
 #, csharp-format
-#| msgid "Your note was exported to \"{0}\"."
 msgid "Could not export: {0}"
 msgstr "Tak bisa mengekspor: {0}"
 
@@ -958,33 +946,32 @@ msgid "Unknown error."
 msgstr "Galat tak dikenal."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
 msgid "Unfiled Notes"
 msgstr "Catatan Belum Diberkaskan"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:389
 #, csharp-format
-#| msgid "Your note was exported to \"{0}\"."
 msgid "Your notes were exported to \"{0}\"."
 msgstr "Catatan Anda diekspor ke \"{0}\"."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:398
-#| msgid "Note exported successfully"
 msgid "Notes exported successfully"
 msgstr "Catatan sukses diekspor"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:421
 #, csharp-format
-#| msgid "Could not save the file \"{0}\""
 msgid "Could not save the files in \"{0}\""
 msgstr "Tak dapat menyimpan berkas di \"{0}\""
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Buat folder tujuan bagi"
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+#| msgid "Create destination folder for "
+msgid "Create destination folder for {0} export"
+msgstr "Buat folder tujuan bagi ekspor {0}"
 
-#: ../Tomboy/JumpListManager.cs:96
-#: ../Tomboy/RecentChanges.cs:85
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Cari Semua Catatan"
 
@@ -1092,15 +1079,20 @@ msgstr "Notebook"
 msgid "{0} Notebook Template"
 msgstr "Templat Notebook {0}"
 
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+#| msgid "_New Note"
+msgid "New Note"
+msgstr "Catatan Baru"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
 msgid "All Notes"
 msgstr "Semua Catatan"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Yakin menghapus notebook ini?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid "The notes that belong to this notebook will not be deleted, but they will no longer be associated with this notebook.  This action cannot be undone."
 msgstr "Catatan yang menjadi milik notebook ini tidak akan dihapus, tapi mereka tidak akan dihubungkan lagi dengan notebook ini. Aksi ini tidak dapat dibatalkan."
 
@@ -1117,51 +1109,52 @@ msgstr "Tak ada notebook"
 msgid "New \"{0}\" Note"
 msgstr "\"{0}\" Catatan Baru"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Tempatkan catatan ini ke dalam suatu notebook"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Notebook"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Notebook Baru..."
 
-#: ../Tomboy/Note.cs:497
-#: ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Catatan Baru {0}"
 
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Yakin hapus catatan ini?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+#| msgid "Really delete this {0} note?"
+#| msgid_plural "Really delete these {0} notes?"
+msgid "Really delete \"{0}\"?"
+msgstr "Yakin hapus {0}?"
 
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Yakin hapus {0} catatan ini?"
 
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Jika Anda menghapus catatan, isinya akan hilang."
 
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
 #, 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 {1}."
 msgstr "Galat terjadi saat menyimpan catatan Anda. Silakan periksa bahwa Anda memiliki ruang cakram yang cukup, dan Anda memiliki hak yang sesuai pada {0}. Rincian galat dapat ditemukan di {1}."
 
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Galat menyimpan data catatan."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21
-#: ../Tomboy/PreferencesDialog.cs:257
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Templat Catatan Baru"
 
@@ -1244,8 +1237,7 @@ msgstr ""
 "Bila Anda mengetikkan nama dari catatan lain pada catatan kini, dia juga akan ditautkan secara otomatis untuk Anda.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299
-#: ../Tomboy/NoteManager.cs:395
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Mulai Di Sini"
 
@@ -1255,8 +1247,7 @@ msgstr "Memakai Tautan di Tomboy"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548
-#: ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Uraikan catatan baru Anda di sini."
 
@@ -1318,143 +1309,163 @@ msgstr "Jangan pernah ubah _nama tautan"
 msgid "Alwa_ys rename links"
 msgstr "Selalu _ubah nama tautan"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Cari di Catatan Ini"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Tautkan pada Catatan Baru"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_ks"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Cari di Catatan Ini"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Tutup Semua Catatan"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Cari"
 
 #. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
-#| msgid "Search All Notes"
+#: ../Tomboy/NoteWindow.cs:445
 msgid "Search your notes"
 msgstr "Cari catatan Anda"
 
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Taut"
 
-#: ../Tomboy/NoteWindow.cs:459
-#| msgid "Link selected text to a new note (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
 msgid "Link selected text to a new note"
 msgstr "Tautkan teks terpilih ke sebuah catatan baru"
 
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Teks"
 
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Tata properti teks"
 
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Perkakas"
 
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Gunakan alat pada catatan ini"
 
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Menghapus catatan ini"
 
-#: ../Tomboy/NoteWindow.cs:502
-#: ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Menyelaraskan Catatan"
 
-#: ../Tomboy/NoteWindow.cs:564
+#: ../Tomboy/NoteWindow.cs:565
+msgid "This note is a template note. It determines the default content of regular notes, and will not show up in the note menu or search window."
+msgstr "Catatan ini adalah catatan templat. Ini menentukan isi baku dari catatan biasa, dan tak akan muncul di menu catatan atau jendela pencarian."
+
+#: ../Tomboy/NoteWindow.cs:571
+#| msgid "Connect to Server"
+msgid "Convert to regular note"
+msgstr "Ubah ke catatan biasa"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "_Simpan Ukuran"
+
+#: ../Tomboy/NoteWindow.cs:585
+#| msgid "Select None"
+msgid "Save Se_lection"
+msgstr "Simpan Pi_lihan"
+
+#: ../Tomboy/NoteWindow.cs:594
+#| msgid "Note Title"
+msgid "Save _Title"
+msgstr "Simpan _Judul"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Cari..."
 
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Cari _Berikutnya"
 
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Cari _Sebelumnya"
 
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Tidak dapat membuat catatan"
 
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Temukan: "
 
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "M_undur"
 
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "Sela_njutnya"
 
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "Te_bal"
 
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "M_iring"
 
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Coret"
 
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Penandaan"
 
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Ukuran Fonta"
 
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "Raksasa"
 
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Besar"
 
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Kecil"
 
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Besarkan Ukuran Fonta"
 
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Kecilkan Ukuran Fonta"
 
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Bulet"
 
@@ -1557,8 +1568,7 @@ msgstr "Membuka \"C_ari Semua Catatan\""
 msgid "Ser_vice:"
 msgstr "_Pelayan:"
 
-#: ../Tomboy/PreferencesDialog.cs:487
-#: ../Tomboy/PreferencesDialog.cs:1106
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Tidak dapat dikonfigurasi"
 
@@ -1639,10 +1649,6 @@ msgid "Resetting Synchronization Settings"
 msgstr "Menata Ulang Pengaturan Penyelarasan"
 
 #: ../Tomboy/PreferencesDialog.cs:1159
-#| msgid ""
-#| "You have disabled the configured synchronization service.  Your "
-#| "synchronization settings will now be cleared.  You may be forced to "
-#| "synchronize all of your notes again when you save new settings"
 msgid "You have disabled the configured synchronization service.  Your synchronization settings will now be cleared.  You may be forced to synchronize all of your notes again when you save new settings."
 msgstr "Anda telah mematikan layanan penyelarasan yang dikonfigurasi. Penataan penyelarasan Anda kini akan dibersihkan. Anda mungkin dipaksa untuk menyelaraskan semua catatan Anda lagi ketika Anda menyimpan tatanan baru."
 
@@ -1663,19 +1669,19 @@ msgstr "Silakan periksa informasi Anda dan coba lagi. Berkas log {0} mungkin mem
 msgid "Error connecting"
 msgstr "Galat menyambung"
 
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Versi:"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Pembuat:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Hak Cipta:"
 
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Ketergantungan Add-in"
 
@@ -1993,13 +1999,10 @@ msgstr "Penyumbang:"
 #: ../Tomboy/Tomboy.cs:415
 msgid "translator-credits"
 msgstr ""
-"Andika Triwidada <andika at gmail.com>, 2009, 2010.\n"
+"Andika Triwidada <andika at gmail.com>, 2009, 2010, 2011.\n"
 "Dirgita <dirgitadevina at yahoo.co.id>, 2010."
 
 #: ../Tomboy/Tomboy.cs:424
-#| msgid ""
-#| "Copyright © 2004-2007 Alex Graveley\n"
-#| "Copyright © 2004-2010 Others\n"
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2011 Others\n"
@@ -2016,10 +2019,6 @@ msgid "Homepage"
 msgstr "Laman Web"
 
 #: ../Tomboy/Tomboy.cs:554
-#| msgid ""
-#| "Tomboy: A simple, easy to use desktop note-taking application.\n"
-#| "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-#| "\n"
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright © 2004-2007 Alex Graveley\n"
@@ -2178,4 +2177,3 @@ msgstr "_Salin Alamat Taut"
 #: ../Tomboy/Watchers.cs:592
 msgid "_Open Link"
 msgstr "_Buka Taut"
-
diff --git a/po/it.po b/po/it.po
index cd754d6..06e8495 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,14 +4,14 @@
 # Amos Brocco <amos.brocco at mriyasoftware.com>, 2005.
 # Daniele Cocca <daniele.cocca at gmail.com>, 2005.
 # Gruppo traduzione Italiano di Ubuntu <gruppo-traduzione at ubuntu-it.org>, 2008
-# Milo Casagrande <milo at ubuntu.com>, 200-2010, 2011.
+# Milo Casagrande <milo at ubuntu.com>, 2008-2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 22:32+0100\n"
-"PO-Revision-Date: 2011-02-17 22:33+0100\n"
+"POT-Creation-Date: 2011-09-14 22:26+0200\n"
+"PO-Revision-Date: 2011-09-14 22:24+0200\n"
 "Last-Translator: Milo Casagrande <milo at ubuntu.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: it\n"
@@ -82,46 +82,53 @@ msgid "Custom Font Face"
 msgstr "Carattere personalizzato"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
 "Determina la coordinata X della finestra di ricerca. Salvata all'uscita del "
 "programma."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
 "Determina la coordinata Y della finestra di ricerca. Salvata all'uscita del "
 "programma."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
 "Determina l'altezza in pixel della finestra di ricerca. Salvata all'uscita "
 "del programma."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
 "Determina la larghezza in pixel della finestra di ricerca. Salvata "
 "all'uscita del programma."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Abilita gli elenchi puntati automatici."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Abilita incolla con il tasto centrale sull'icona."
 
 # (ndt) dovrebbe essere roba di windows
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Abilita l'icona sulla barra delle applicazioni"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Abilita l'evidenziazione di ParoleWiki"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Abilita gli elenchi puntati automatici."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Abilita la chiusura delle note con il tasto Esc."
@@ -180,21 +187,17 @@ msgid "HTML Export All Linked Notes"
 msgstr "Esporta in HTML tutte le note collegate"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Ultima directory usata per l'esportazione in HTML"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Esporta in HTML le note collegate"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Se disabilitato, il dialogo di conferma per l'eliminazione delle note non "
 "verrà mostrato."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -202,7 +205,7 @@ msgstr ""
 "Se enable_custom_font è impostato a VERO, il carattere qui specificato sarà "
 "utilizzato nel visualizzare le note."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -210,11 +213,11 @@ msgstr ""
 "Se abilitato, tutte le note aperte all'uscita di Tomboy saranno riaperte "
 "automaticamente all'avvio."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "Se abilitato, una nota aperta può essere chiusa premendo il tasto Esc."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -225,7 +228,7 @@ msgstr ""
 "quest'opzione quando un'altra applicazione fornisce le funzionalità della "
 "barra delle applicazioni."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -234,7 +237,7 @@ msgstr ""
 "e dei suggerimenti per la corretta ortografia saranno mostrati nel menù "
 "accessibile con un clic del tasto destro."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -244,7 +247,7 @@ msgstr ""
 "tomboy/global_keybindings saranno abilitate, consentendo a utili "
 "funzionalità di Tomboy di essere disponibili da ogni applicazione."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -253,7 +256,7 @@ msgstr ""
 "utilizzato nel visualizzare le note. Altrimenti verrà utilizzato il "
 "carattere predefinito del desktop."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -261,7 +264,7 @@ msgstr ""
 "Indica che il plugin per l'importazione delle note non è stato avviato, così "
 "da venir avviato automaticamente al prossimo avvio di Tomboy."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -269,7 +272,7 @@ msgstr ""
 "Intero per determinare il numero minimo di note da mostrare nel menù di "
 "Tomboy."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -281,7 +284,7 @@ msgstr ""
 "indica che la sincronizzazione è disabilitata. Il più piccolo valore "
 "accettabile è 5. I valori sono in minuti."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -295,7 +298,7 @@ msgstr ""
 "la richiesta all'utente quando si verifica un conflitto, così da gestirli "
 "caso per caso."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -313,6 +316,10 @@ msgstr ""
 "rimossi automaticamente. \"2\" indica che i collegamenti possono essere "
 "aggiornati con il nuovo nome della nota."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "L'ultima directory usata nell'esportazione HTML"
+
 # (ndt) sarebbe da accorciare...
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
@@ -389,19 +396,19 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "URL del server SSHFS di sincronizzazione"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
+msgid "Saved height of \"Search All Notes\" window"
 msgstr "Altezza salvata della finestra di ricerca"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
+msgid "Saved horizontal position of \"Search All Notes\" window"
 msgstr "Posizione orizzontale salvata della finestra di ricerca"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
+msgid "Saved vertical position of \"Search All Notes\" window"
 msgstr "Posizione verticale salvata della finestra di ricerca"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
+msgid "Saved width of \"Search All Notes\" window"
 msgstr "Larghezza salvata della finestra di ricerca"
 
 #: ../data/tomboy.schemas.in.h:58
@@ -650,7 +657,7 @@ msgstr "Eli_mina"
 msgid "Delete the selected note"
 msgstr "Elimina la nota selezionata"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Chiudi"
 
@@ -695,7 +702,7 @@ msgstr "TrayIcon"
 msgid "Create _New Note"
 msgstr "Crea _nuova nota"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "Cerca in _tutte le note"
 
@@ -707,11 +714,22 @@ msgstr "Apre la finestra «Cerca in tutte le note»"
 msgid "Start synchronizing notes"
 msgstr "Avvia la sincronizzazione delle note"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avanzate"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Numero minimo di note da mostrare nel menù «Note recenti» (massimo 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Puntano qui"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(niente)"
 
@@ -767,6 +785,28 @@ msgstr "Eliminare veramente questa icona?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Se si elimina un'icona, questa sarà persa in modo definitivo."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Impossibile aprire l'email"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destinazione per l'esportazione in HTML"
+
+# (ndt) opzione
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Esportare note collegate"
+
+# (ndt) opzione
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Includere tutte le note collegate"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Esporta in HTML"
@@ -781,10 +821,14 @@ msgid "Note exported successfully"
 msgstr "Nota esportata con successo"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Accesso negato."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "La cartella non esiste."
 
@@ -793,24 +837,6 @@ msgstr "La cartella non esiste."
 msgid "Could not save the file \"{0}\""
 msgstr "Impossibile salvare il file «{0}»."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destinazione per l'esportazione in HTML"
-
-# (ndt) opzione
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Esportare note collegate"
-
-# (ndt) opzione
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Includere tutte le note collegate"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Impossibile aprire l'email"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Percorso cartella:"
@@ -821,18 +847,18 @@ msgid "Select Synchronization Folder..."
 msgstr "Seleziona cartella di sincronizzazione..."
 
 # (ndt) magari rendere un po' più semplice
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Il campo del percorso della cartella è vuoto."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr ""
 "Il percorso della cartella specificata non esiste e non è stato possibile "
 "crearla."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Cartella locale"
 
@@ -895,11 +921,11 @@ msgstr "Appuntamenti"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Modificare la nota <span weight=\"bold\">Oggi: modello</span> per "
-"personalizzare il testo delle nuove note del tipo «Oggi»."
+"Modificare la nota <b>Oggi: modello</b> per personalizzare il testo delle "
+"nuove note del tipo «Oggi»."
 
 # (ndt) pulsante
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
@@ -926,26 +952,31 @@ msgstr "Pagina {0} di {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd dd/MM/yyyy, H.mm.ss"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Rimuovi collegamenti interrotti"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Aggiungi una bozza"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rver:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Nome utente:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Percorso cartella (opzionale):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -953,15 +984,15 @@ msgstr ""
 "La sincronizzazione con SSH richiede l'aggiunta di una chiave SSH esistente "
 "al demone SSH in esecuzione per questo server e per questo utente."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Il campo del server o del nome utente è vuoto."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -988,14 +1019,17 @@ msgstr "Importazione delle note completata"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> di <b>{1}</b> note importate con successo."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> di <b>{1}</b> note importata con successo."
+msgstr[1] "<b>{0}</b> di <b>{1}</b> note importate con successo."
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Nota: "
 
@@ -1020,23 +1054,23 @@ msgstr "--- Tasque non è in esecuzione ---"
 msgid "_Underline"
 msgstr "_Sottolineato"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "Campo URL, nome utente o password vuoto."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1049,21 +1083,16 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Salvataggio della configurazione all'interno del portachiavi di GNOME non "
 "riuscito con il seguente messaggio:"
 
-# (ndt) lasciata volutamente in maiuscolo, non credo che la cambierò.
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy Web"
-
 # (ndt) pare un pulsante
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Connetti al server"
 
@@ -1072,24 +1101,24 @@ msgid "Connected"
 msgstr "Connesso"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Il server non risponde. Provare più tardi."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Autorizzazione non riuscita. Provare ancora."
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Autorizzazione Tomboy Web eseguita con successo"
 
 # (ndt) rimosso Tomboy volutamente
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1097,22 +1126,123 @@ msgstr ""
 "Ritornare alla finestra delle preferenze e fare clic su «Salva» per iniziare "
 "la sincronizzazione."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Connesso. Fare clic su «Salva» per iniziare la sincronizzazione"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Autorizzazione browser (fare clic per reimpostare la connessione)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Impostare il browser predefinito e provare ancora"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+# (ndt) lasciata volutamente in maiuscolo, non credo che la cambierò.
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy Web"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Esporta tutte le note in {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Avvio esportazione note in {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Esportazione blocco note in {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Inizio esportazione blocco note in {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Strumenti"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Esporta"
+
+# (ndt) suggerimento, punto finale volutamente tolto
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Esporta le proprie note"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Esporta tutte le note in {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Esporta blocco note in {0}"
+
+# (ndt) questa cosa qui dovrebbe essere un titolo di un dialogo e in teoria è per l'esportazione di tutte le note in un determinato formato
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Esportazione {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Impossibile esportare, accesso non consentito."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Impossibile esportare, la cartella non esiste."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Impossibile esportare: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Errore sconosciuto."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Note non archiviate"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Le note sono state esportate in «{0}»."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Note esportate con successo"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Impossibile salvare i file in «{0}»"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Creazione cartella di destinazione per l'esportazione in {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Cerca in tutte le note"
 
@@ -1165,26 +1295,6 @@ msgstr "Nome già in uso"
 msgid "C_reate"
 msgstr "C_rea"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Modello blocco note {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Tutte le note"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Note non archiviate"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "Blocchi note"
@@ -1224,15 +1334,35 @@ msgid "Delete the selected notebook"
 msgstr "Elimina il blocco note selezionato"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Blocchi note"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Modello blocco note {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nuova nota"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Tutte le note"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Eliminare veramente questo blocco note?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1254,34 +1384,40 @@ msgstr "Nessun blocco note"
 msgid "New \"{0}\" Note"
 msgstr "Nuova nota «{0}»"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Inserisce questa nota in un blocco note"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Blocco note"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "Nuovo _blocco note..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Eliminare veramente questa nota?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nuova nota {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Eliminare veramente «{0}»?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Eliminare veramente {0} nota?"
 msgstr[1] "Eliminare veramente {0} note?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Se si elimina una nota, questa sarà persa in modo definitivo."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1292,13 +1428,13 @@ msgstr ""
 "sufficiente sul disco e di avere i permessi adeguati su «{0}». Maggiori "
 "informazioni sull'errore possono essere trovate in «{1}»."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Errore nel salvare i dati della nota."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Nuovo modello nota"
 
@@ -1427,7 +1563,7 @@ msgstr ""
 "content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Inizia qui"
 
@@ -1435,14 +1571,9 @@ msgstr "Inizia qui"
 msgid "Using Links in Tomboy"
 msgstr "Usare i collegamenti con Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nuova nota {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Scrivere qui la nuova nota."
 
@@ -1507,143 +1638,171 @@ msgstr "Non rinominare mai i co_llegamenti"
 msgid "Alwa_ys rename links"
 msgstr "_Rinominare sempre i collegamenti"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Cerca in questa nota"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "Co_llega a nuova nota"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_sto"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "Ce_rca in questa nota"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Chiud_i tutte le note"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Cerca"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Cerca nelle note (Ctrl-Maiusc-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Cerca tra le note"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Collega"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Collega il testo selezionato a una nuova nota (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Collega il testo selezionato a una nuova nota"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Testo"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Imposta le proprietà del testo"
 
 # (ndt) menù della barra dei menù
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Strumenti"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Usa gli strumenti su questa nota"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Elimina questa nota"
 
 # (ndt) voce di menù
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Sincronizza note"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Questa nota è un semplice modello. Determina il contenuto predefinito delle "
+"note regolari e non verrà visualizzata nel menù delle note o nella finestra "
+"di ricerca."
+
+# (ndt) pare un pulsante
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Converti in nota regolare"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Salva _dimensione"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Salva se_lezione"
+
+# (ndt) intestazione colonna tabella
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Salva _titolo"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Trova..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Trova s_uccessiva"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Trova _precedente"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Impossibile creare la nota"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Trova:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "Pr_ecedente"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "S_uccessivo"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Grassetto"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Corsivo"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Barrato"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Evidenziato"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Dimensione del carattere"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normale"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "_Enorme"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Grande"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Piccolo"
 
 # (ndt) vode di menù
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Aumenta dimensione carattere"
 
 # (ndt) voce di meù
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Diminuisci dimensione carattere"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Elenco puntato"
 
@@ -1664,11 +1823,11 @@ msgid "Add-ins"
 msgstr "Add-in"
 
 # (ndt) opzione
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "Controllo _ortografico durante la digitazione"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1678,11 +1837,11 @@ msgstr ""
 
 # (ndt) opzione
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Evidenziare ParoleTipo_Wiki"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1691,32 +1850,32 @@ msgstr ""
 "Facendo clic sulla parola si creerà una nota con quel nome."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "A_bilitare elenco puntato automatico"
 
 # (ndt) opzione
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Utilizzare carattere _personalizzato"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
-msgstr "Quando viene rinominata una nota collegata:"
+msgstr "Quando viene rinominata una nota collegata: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Chiedere sempre cosa fare"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Mai rinominare i collegamenti"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Rinominare sempre i collegamenti"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1724,16 +1883,16 @@ msgstr ""
 "Usare il modello nuova nota per specificare il testo da utilizzare quando si "
 "crea una nuova nota."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Apri modello nuova nota"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Abilitare i _tasti rapidi"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1744,90 +1903,90 @@ msgstr ""
 "<Maiusc>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Mostra il _menù note"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Apri «_Inizia qui»"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Crea _nuova nota"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Apri «Cerca _in tutte le note»"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Ser_vizio:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Non configurabile"
 
 # (ndt) ho eliminato volutamente background, credo che all'utente non interessi sapre dove o come avviene, ma che avvenga automaticamente sì
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Sincroni_zzare automaticamente ogni"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "minuti"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Avanzate..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "I seguenti add-in sono installati"
 
 # (ndt) pare una specie di pulsante
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Ulteriori add-in..."
 
 # (ndt) pulsante
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Abilita"
 
 # (ndt) pulsante
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Disabilita"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Non implementato"
 
 # (ndT) dovrebbe essere tipo Preferenze di {nome-add-in}
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Preferenze di {0}"
 
 # (ndt) titolo finestra di dialogo
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Scegli carattere per le note"
 
 # (ndt) titolo finestra di dialogo
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Altre opzioni di sincronizzazione"
 
 # (ndT) le metto al plurale... mi suonano meglio
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1836,25 +1995,25 @@ msgstr ""
 "la sincronizzazione sul server:"
 
 # (ndt) volutamente eliminato il punto, è un'opzione
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Chiedere sempre cosa fare"
 
 # (ndt) volutamente eliminato il punto, è un'opzione
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Rinominare le note locali"
 
 # (ndt) volutamente eliminato il punto, è un'opzione
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Sostituire le note locali con gli aggiornamenti del server"
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "Attenzione: procedere veramente?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Procedere veramente?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1863,344 +2022,155 @@ msgstr ""
 "essere necessario sincronizzare nuovamente tutte le note al prossimo "
 "salvataggio delle nuove impostazioni."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Ripristino impostazioni di sincronizzazione"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Il servizio di sincronizzazione configurato è stato disabilitato. Le "
 "impostazioni di sincronizzazione saranno cancellate. Potrebbe essere "
 "necessario sincronizzare nuovamente tutte le note quando vengono salvate "
 "delle nuove impostazioni"
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Connessione stabilita con successo."
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Connessione avvenuta con successo"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr ""
-"Il programma è pronto alla sincronizzazione delle note. Sincronizzarle ora?"
+"Il programma è pronto per la sincronizzazione delle note. Sincronizzarle ora?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Qualcosa è andato storto. Controllare le informazioni e riprovare. Il file "
-"«{0}» potrebbe essere d'aiuto."
+"Controllare le informazioni e riprovare. Il file «{0}» potrebbe contenere "
+"maggiori informazioni riguardo l'errore."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
 msgstr "Errore nella connessione"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Versione:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Autore:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Dipendenze add-in:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "Ce_rca:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Nota"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Ultima modifica"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Corrispondenze"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Corrispondenza titolo"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} occorrenza"
 msgstr[1] "{0} occorrenze"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Totale: {0} nota"
 msgstr[1] "Totale: {0} note"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Corrispondenze: {0} nota"
 msgstr[1] "Corrispondenze: {0} note"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Non è stato trovato alcun risultato nel blocco note selezionato.\n"
+"Fare clic qui per cercare in tutte le note."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Fare clic qui per cercare in tutti i blocchi note"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Note"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Impossibile creare una nuova nota"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Questo add-in di sincronizzazione non è supportato dal computer. Assicurarsi "
+"di avere FUSE e {0} correttamente installati e configurati"
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Sviluppo principale:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Impossibile leggere il file di test."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Collaboratori:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Scrittura del test non riuscita."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"Milo Casagrande <milo at ubuntu.com>\n"
-"Gruppo traduzione Italiano di Ubuntu <gruppo-traduzione at ubuntu-it.org>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Tempo scaduto durante la connessione al server."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Altri\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Errore nella connessione al server."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Un programma per prendere note semplice e facile da usare."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "Impossibile abilitare FUSE."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Sito web"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Si è verificato un errore nella connessione al server specificato:"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: un programma per prendere note semplice e facile da usare.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Uso:\n"
-"  --version\t\t\tStampa la versione.\n"
-"  --help\t\t\tStampa questo messaggio.\n"
-"  --note-path [percorso]\t\tCarica/Salva le note in questa directory.\n"
-"  --search [testo]\t\tApre la finestra per cercare in tutte le note con il "
-"testo inserito.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tCrea e visualizza una nuova nota\n"
-"  --new-note [nome]\t\tCrea e visualizza una nuova nota, con un nome\n"
-"  --open-note [nome/url]\tVisualizza una nota esistente e corrispondente a "
-"\"nome\"\n"
-"  --start-here\t\t\tVisualizza la nota \"Inizia qui\"\n"
-"  --highlight-search [testo]\tCerca ed evidenzia \"testo\" nella nota "
-"aperta\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versione {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nuovo)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "I_nformazioni"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"Impossibile trovare il manuale di Tomboy. Verificare che l'installazione sia "
-"stata completata con successo."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Manuale non trovato"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Impossibile aprire la posizione"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Oggi, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Oggi"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Ieri, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Ieri"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} giorno fa, {1}"
-msgstr[1] "{0} giorni fa, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} giorno fa"
-msgstr[1] "{0} giorni fa"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Domani, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Domani"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "In {0} giorno, {1}"
-msgstr[1] "In {0} giorni, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "In {0} giorno"
-msgstr[1] "In {0} giorni"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, H.mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Nessuna data"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, H.mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Senza nome {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Una nota dal nome <b>{0}</b> esiste già. Sceglierne un altro prima di "
-"continuare."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Nome già in uso"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Copia indirizzo collegamento"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Apri collegamento"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Questo add-in di sincronizzazione non è supportato dal computer. Assicurarsi "
-"di avere FUSE e {0} correttamente installati e configurati"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Impossibile leggere il file di test."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Scrittura del test non riuscita."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Tempo scaduto durante la connessione al server."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Errore nella connessione al server."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "Impossibile abilitare FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Si è verificato un errore nella connessione al server specificato:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Dettagli"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Dettagli"
 
 # (ndt) intestazione colonna tabella
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
@@ -2356,7 +2326,7 @@ msgstr "Aggiunta"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
-msgstr "Cambiamenti caricati sul server"
+msgstr "Modifiche caricate sul server"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
@@ -2401,10 +2371,6 @@ msgstr ""
 "La versione del server di «{0}» va in conflitto con la nota locale. Cosa "
 "fare con la nota locale?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Strumenti"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2439,3 +2405,212 @@ msgstr ""
 "Per evitare il ripetersi di questo messaggio, caricare FUSE all'avvio. "
 "Aggiungere «modprobe fuse» al file «/etc/init.d/boot.local» oppure «fuse» al "
 "file «/etc/modules»."
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Impossibile creare una nuova nota"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Sviluppo principale:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Collaboratori:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Milo Casagrande <milo at ubuntu.com>\n"
+"Gruppo traduzione Italiano di Ubuntu <gruppo-traduzione at ubuntu-it.org>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Altri\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Un programma per prendere note semplice e facile da usare."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Sito web"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: un programma per prendere note semplice e facile da usare.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Altri\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Uso:\n"
+"  --version\t\t\tStampa la versione.\n"
+"  --help\t\t\tStampa questo messaggio.\n"
+"  --note-path [percorso]\t\tCarica/Salva le note in questa directory.\n"
+"  --search [testo]\t\tApre la finestra per cercare in tutte le note il testo "
+"inserito.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tCrea e visualizza una nuova nota\n"
+"  --new-note [nome]\t\tCrea e visualizza una nuova nota, con un nome\n"
+"  --open-note [nome/url]\tVisualizza una nota esistente e corrispondente a "
+"\"nome\"\n"
+"  --start-here\t\t\tVisualizza la nota \"Inizia qui\"\n"
+"  --highlight-search [testo]\tCerca ed evidenzia \"testo\" nella nota "
+"aperta\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versione {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nuovo)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "I_nformazioni"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"Impossibile trovare il manuale di Tomboy. Verificare che l'installazione sia "
+"stata completata con successo."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Manuale non trovato"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Impossibile aprire la posizione"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Oggi, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Oggi"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Ieri, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Ieri"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} giorno fa, {1}"
+msgstr[1] "{0} giorni fa, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} giorno fa"
+msgstr[1] "{0} giorni fa"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Domani, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Domani"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "In {0} giorno, {1}"
+msgstr[1] "In {0} giorni, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "In {0} giorno"
+msgstr[1] "In {0} giorni"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, H.mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Nessuna data"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, H.mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Senza nome {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Una nota dal nome <b>{0}</b> esiste già. Sceglierne un altro prima di "
+"continuare."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Nome già in uso"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copia indirizzo collegamento"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Apri collegamento"
diff --git a/po/ja.po b/po/ja.po
index e8615d8..8ce3b64 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: tomboy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-20 16:16+0000\n"
-"PO-Revision-Date: 2011-03-24 22:18+0900\n"
-"Last-Translator: Jiro Matsuzawa <matsuzawa.jr at gmail.com>\n"
+"POT-Creation-Date: 2011-09-24 20:32+0000\n"
+"PO-Revision-Date: 2011-09-25 12:52+0900\n"
+"Last-Translator: Kentaro KAZUHAMA <kazken3 at gmail.com>\n"
 "Language-Team: Japanese <gnome-translation at gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgstr ""
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
-msgstr "アクセサリ"
+msgstr "アクセサリー"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:2
 msgid "Simple and easy to use note-taking"
@@ -33,7 +33,7 @@ msgstr "シンプルで使いやすいメモ用アプリケーションです"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:3
 msgid "Tomboy Applet Factory"
-msgstr "Tomboy アプレットのファクトリ"
+msgstr "Tomboy アプレットのファクトリー"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
 #: ../Tomboy/Tray.cs:579
@@ -84,42 +84,55 @@ msgid "Custom Font Face"
 msgstr "独自のフォント名"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "検索ウィンドウのX座標で、Tomboy を終了する際に格納されます。"
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+" \"すべてのメモを検索\"ウィンドウのX座標で、Tomboy を終了する際に格納されま"
+"す。"
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "検索ウィンドウのY座標で、Tomboy を終了する際に格納されます。"
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+" \"すべてのメモを検索\"ウィンドウのY座標で、Tomboy を終了する際に格納されま"
+"す。"
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"検索ウィンドウの高さ (ピクセル単位) で、Tomboy を終了する際に格納されます。"
+" \"すべてのメモを検索\"ウィンドウの高さ (ピクセル単位) で、Tomboy を終了する"
+"際に格納されます。"
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"検索ウィンドウの幅 (ピクセル単位) で、Tomboy を終了する際に格納されます。"
+" \"すべてのメモを検索\"ウィンドウの幅 (ピクセル単位) で、Tomboy を終了する際"
+"に格納されます。"
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "自動的な箇条書きを有効にするかどうか"
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
-msgstr "中ボタンのクリックで貼り付けるかどうか"
+msgstr "中ボタンのクリックで貼り付けるかどうか。"
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "トレイアイコンを有効化"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "WikiWord の強調表示を有効にするかどうか"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "自動的な箇条書きを有効にするかどうか。"
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
-msgstr "Esc キーでメモを閉じるかどうか"
+msgstr "Escキーでメモを閉じるかどうか。"
 
 #: ../data/tomboy.schemas.in.h:14
 msgid "Enable custom font"
@@ -146,47 +159,44 @@ msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
 msgstr ""
-"TRUE の場合、行頭に '-' や '*' という文字を入力したら自動的に箇条書きモードに"
-"なります。"
+"行頭に '-' や '*' という文字を入力したら自動的に箇条書きモードにしたい場合、"
+"このオプションを有効にします。"
 
 #: ../data/tomboy.schemas.in.h:20
 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 ""
-"TRUE の場合、Tomboy のアイコンをマウスの中ボタンでクリックすると「ここから開"
-"始」のメモにタイムスタンプの付いた内容を貼り付けられるようになります。"
+"Tomboy のアイコンをマウスの中ボタンでクリックすると「ここから開始」のメモにタ"
+"イムスタンプの付いた内容を貼り付けられるようにしたい場合、このオプションを有"
+"効にします。"
 
 #: ../data/tomboy.schemas.in.h:21
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
 msgstr ""
-"TRUE の場合、ThatLookLikeThis のような単語を強調表示します。その単語をクリッ"
-"クすると、単語の名前をタイトルにした新しいメモを作成します。"
+"ThatLookLikeThis のような単語を強調表示するにはこのオプションを有効にします。"
+"その単語をクリックすると、単語の名前をタイトルにした新しいメモを作成します。"
 
 #: ../data/tomboy.schemas.in.h:22
 msgid "FUSE Mounting Timeout (ms)"
-msgstr "FUSE によるマウント時間"
+msgstr "FUSE によるマウント時間 (ms)"
 
 #: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export All Linked Notes"
 msgstr "リンク先のすべてのメモを HTML にエクスポートするかどうか"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "最後に HTML をエクスポートしたフォルダ"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "リンク先のメモを HTML にエクスポートするかどうか"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr "無効化されると、「メモの削除」の確認ダイアログは表示されません。"
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -194,19 +204,20 @@ msgstr ""
 "enable_custom_font が TRUE の場合、メモを表示する際に、ここで指定したフォント"
 "を使用します。"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
 msgstr ""
-"TRUE の場合、Tomboy を終了した時にオープンされていたすべてのメモを起動時にも"
-"う一度、自動的にオープンします。"
+"有効にした場合、Tomboy を終了した時にオープンされていたすべてのメモを起動時に"
+"もう一度、自動的にオープンします。"
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr "TRUE の場合、Esc キーの押下で開いているメモを閉じれるようになります。"
+msgstr ""
+"有効にした場合、Esc キーの押下で開いているメモを閉じれるようになります。"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -216,15 +227,15 @@ msgstr ""
 "るのは、他のアプリケーションがトレイアイコンの機能を提供をしている場合に役に"
 "立ちます。"
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
 msgstr ""
-"TRUE の場合、スペル違いは赤色の下線がつき、右クリック・メニューに妥当なスペル"
-"を提示します。"
+"TRUE の場合、スペル違いは赤色の下線がつき、右クリックメニューに妥当なスペルを"
+"提示します。"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -233,15 +244,15 @@ msgstr ""
 "TRUE の場合、/apps/tomboy/global_keybindings の desktop-global キーバインドが"
 "有効になり、別のアプリケーションから Tomboy の操作が可能になります。"
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
 msgstr ""
 "TRUE の場合、メモを表示するときに custom_font_face にセットしたフォント名を使"
-"用します。それ以外は、デスクトップのデフォルト・フォントを使用します。"
+"用します。それ以外は、デスクトップのデフォルトフォントを使用します。"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -249,13 +260,13 @@ msgstr ""
 "付箋紙アプレットのインポートを行っていないことを表しています。そのため、次回 "
 "Tomboy を起動したら自動的にインポートを行うことになります。"
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr "Tomboy のメニューの中に表示するメモの個数 (最小値) を表す整数値です。"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -266,7 +277,7 @@ msgstr ""
 "設定されている場合)。1 より小さい値の場合は自動同期が無効化されていることを示"
 "します。設定可能な正の値の最小値は 5 です。値は分単位です。"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -275,9 +286,9 @@ msgid ""
 "conflict situation on a case-by-case basis."
 msgstr ""
 "メモの内容に矛盾が発生した際に実施する対応法を表した整数値です。0 は矛盾が発"
-"生した時にユーザに問い合わせを行います。"
+"生した時にユーザーに問い合わせを行います。"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -287,20 +298,24 @@ msgid ""
 "indicates that link text should be updated to the new note name so that it "
 "will continue linking to the renamed note."
 msgstr ""
-"メモの名前が変更された場合、ユーザに確認をするかわりにリンクの更新を必ずどう"
-"するのか、を示す整数値です。値は内部的な列挙値にマッピングされます。0 なら"
+"メモの名前が変更された場合、ユーザーに確認をするかわりにリンクの更新を必ずど"
+"うするのか、を示す整数値です。値は内部的な列挙値にマッピングされます。0 なら"
 "ば、メモの名前を変更した時、他のメモに存在するリンクに影響を与えるようであれ"
 "ばユーザに確認をとることを示します。1 ならば、リンクが自動的に削除されること"
 "を示します。2 ならば、名前の変更されたメモへリンクし続けるようにリンクの文字"
 "列が更新されることを示します。"
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "HTML エクスポートで使用した最後のディレクトリー"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "メモの名前の変更の時のリンクの更新の挙動"
 
 #: ../data/tomboy.schemas.in.h:40
 msgid "List of pinned notes."
-msgstr "画鋲付きのメモの一覧"
+msgstr "ピン付きのメモの一覧。"
 
 #: ../data/tomboy.schemas.in.h:41
 msgid ""
@@ -336,45 +351,45 @@ msgstr "\"ここから開始\" のメモを開くキー"
 
 #: ../data/tomboy.schemas.in.h:48
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr "リモートにある Tomboy の同期フォルダのパス名です (オプション)。"
+msgstr "リモートにある Tomboy の同期フォルダーのパス名です (オプション)。"
 
 #: ../data/tomboy.schemas.in.h:49
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
-msgstr "ファイルシステムの同期サービスで使用するサーバのパスです。"
+msgstr "ファイルシステムの同期サービスで使用するサーバーのパスです。"
 
 #: ../data/tomboy.schemas.in.h:50
 msgid "SSHFS Remote Synchronization Folder"
-msgstr "SSHFS で使うリモートの同期フォルダ"
+msgstr "SSHFS で使うリモートの同期フォルダー"
 
 #: ../data/tomboy.schemas.in.h:51
 msgid "SSHFS Remote Synchronization User Name"
-msgstr "SSHFS で使うユーザ名"
+msgstr "SSHFS で使うユーザー名"
 
 #: ../data/tomboy.schemas.in.h:52
 msgid "SSHFS Synchronization Server Port"
-msgstr "SSHFS で使う SSH サーバのポート番号"
+msgstr "SSHFS で使う SSH サーバーのポート番号"
 
 #: ../data/tomboy.schemas.in.h:53
 msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS で使う同期先の URL"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "検索ウィンドウの高さ"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr " \"すべてのメモを検索\" ウィンドウの高さ"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "検索ウィンドウの位置 (X座標)"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr " \"すべてのメモを検索\" ウィンドウの水平位置"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "検索ウィンドウの位置 (Y座標)"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr " \"すべてのメモを検索\" ウィンドウの垂直位置"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "検索ウィンドウの幅"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "\"すべてのメモを検索\" ウィンドウの幅"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -386,7 +401,7 @@ msgstr "有効にする場合は TRUE にする"
 
 #: ../data/tomboy.schemas.in.h:60
 msgid "Show applet menu"
-msgstr "アプレット・メニューを表示するキー"
+msgstr "アプレットメニューを表示するキー"
 
 #: ../data/tomboy.schemas.in.h:61
 msgid "Start Here Note"
@@ -402,7 +417,7 @@ msgstr "同期クライアントの ID"
 
 #: ../data/tomboy.schemas.in.h:64
 msgid "Synchronization Local Server Path"
-msgstr "同期するローカルのサーバへのパス"
+msgstr "同期するローカルのサーバーへのパス"
 
 #: ../data/tomboy.schemas.in.h:65
 msgid "The date format that is used for the timestamp."
@@ -417,9 +432,9 @@ msgid ""
 "option to the special string \"disabled\", then there will be no keybinding "
 "for this action."
 msgstr ""
-"新しいメモを作成して表示するためのグローバルなホットキー (キーボード・ショー"
-"トカット) です。書式は \"<Control>a\" または \"<Shift><Alt>"
-"F1\" です。パーサはかなり自由度が高く、大文字/小文字を利用できます。さらに、"
+"新しいメモを作成して表示するためのグローバルなホットキー (キーボードショート"
+"カット) です。書式は \"<Control>a\" または \"<Shift><Alt>F1"
+"\" です。パーサはかなり自由度が高く、大文字/小文字を利用できます。さらに、"
 "\"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとし"
 "て特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当"
 "ては行われません。"
@@ -433,7 +448,7 @@ msgid ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 msgstr ""
-"\"ここから開始\" メモを開くためのグローバルなホットキー (キーボード・ショート"
+"\"ここから開始\" メモを開くためのグローバルなホットキー (キーボードショート"
 "カット) です。書式は \"<Control>a\" または \"<Shift><Alt>F1"
 "\" です。パーサはかなり自由度が高く、大文字/小文字を利用できます。さらに "
 "\"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとし"
@@ -449,12 +464,12 @@ msgid ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 msgstr ""
-"\"メモの検索\" ダイアログを開くためのグローバルなホットキー (キーボード・"
-"ショートカット) です。書式は \"<Control>a\" または \"<Shift><"
-"Alt>F1\" です。パーサはかなり自由度が高く、大文字/小文字を利用できます。さ"
-"らに \"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプション"
-"として特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割"
-"り当ては行われません。"
+"\"メモの検索\" ダイアログを開くためのグローバルなホットキー (キーボードショー"
+"トカット) です。書式は \"<Control>a\" または \"<Shift><Alt>"
+"F1\" です。パーサはかなり自由度が高く、大文字/小文字を利用できます。さらに "
+"\"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとし"
+"て特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当"
+"ては行われません。"
 
 #: ../data/tomboy.schemas.in.h:69
 msgid ""
@@ -465,12 +480,12 @@ msgid ""
 "option to the special string \"disabled\", then there will be no keybinding "
 "for this action."
 msgstr ""
-"\"最近の変更\" ダイアログを開くためのグローバルなホットキー (キーボード・"
-"ショートカット) です。書式は \"<Control>a\" または \"<Shift><"
-"Alt>F1\" です。パーサはかなり自由度が高く、大文字/小文字を利用できます。さ"
-"らに \"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプション"
-"として特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割"
-"り当ては行われません"
+"\"最近の変更\" ダイアログを開くためのグローバルなホットキー (キーボードショー"
+"トカット) です。書式は \"<Control>a\" または \"<Shift><Alt>"
+"F1\" です。パーサはかなり自由度が高く、大文字/小文字を利用できます。さらに "
+"\"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとし"
+"て特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当"
+"ては行われません"
 
 #: ../data/tomboy.schemas.in.h:70
 msgid ""
@@ -482,7 +497,7 @@ msgid ""
 "action."
 msgstr ""
 "\"Tomboy アプレット\" メニューを表示するためのグローバルなホットキー (キー"
-"ボード・ショートカット) です。書式は \"<Control>a\" または \"<"
+"ボードショートカット) です。書式は \"<Control>a\" または \"<"
 "Shift><Alt>F1\" です。パーサはかなり自由度が高く、大文字/小文字を利"
 "用できます。さらに \"<Ctl>\" や \"<Ctrl>\" のような省略形も可能で"
 "す。オプションとして特殊な文字列 \"disabled\" を指定すると、このアクションに"
@@ -497,7 +512,7 @@ msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
 "\"Export To HTML\" アドインを使って、最後にエクスポートしたメモの HTML を格納"
-"したフォルダです。"
+"したフォルダーです。"
 
 #: ../data/tomboy.schemas.in.h:73
 msgid ""
@@ -534,8 +549,8 @@ msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
 msgstr ""
-"SSH 経由で同期サーバに接続する際に使うポート番号です。デフォルトの SSH ポート"
-"番号を使う場合は -1 かそれより小さい値を設定してください"
+"SSH 経由で同期サーバーに接続する際に使うポート番号です。デフォルトの SSH ポー"
+"ト番号を使う場合は -1 かそれより小さい値を設定してください。"
 
 #: ../data/tomboy.schemas.in.h:77
 msgid ""
@@ -551,34 +566,35 @@ msgstr "タイムスタンプの書式"
 
 #: ../data/tomboy.schemas.in.h:79
 msgid "URL of SSH server containing Tomboy synchronization directory."
-msgstr "Tomboy の同期フォルダを格納した SSH サーバの URL です。"
+msgstr "Tomboy の同期フォルダーを格納した SSH サーバーの URL です。"
 
 #: ../data/tomboy.schemas.in.h:80
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr ""
-"Synchronization サービス・アドインで現在設定している重複しない識別子です。"
+"Synchronization サービスアドインで現在設定している重複しない識別子です。"
 
 #: ../data/tomboy.schemas.in.h:81
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
 msgstr ""
-"Tomboy クライアントを識別する重複しない ID です (サーバと同期する際に使用しま"
-"す)。"
+"Tomboy クライアントを識別する重複しない ID です (サーバーと同期する際に使用し"
+"ます)。"
 
 #: ../data/tomboy.schemas.in.h:82
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr ""
-"ユーザに問い合わせを行うことなく SSL の証明書を受け入れる \"-ac\" オプション"
-"を使うかどうかです。"
+"ユーザーに問い合わせを行うことなく SSL の証明書を受け入れる \"-ac\" オプショ"
+"ンを使うかどうか。"
 
 #: ../data/tomboy.schemas.in.h:83
 msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr "Tomboy の同期フォルダを持つサーバに接続する際に使用するユーザ名です。"
+msgstr ""
+"Tomboy の同期フォルダーを持つサーバーに接続する際に使用するユーザー名です。"
 
 #: ../data/tomboy.schemas.in.h:84
 msgid ""
@@ -616,7 +632,7 @@ msgstr "削除(_D)"
 msgid "Delete the selected note"
 msgstr "選択したメモを削除します"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -660,7 +676,7 @@ msgstr "TrayIcon"
 msgid "Create _New Note"
 msgstr "新しいメモの作成(_N)"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "すべてのメモの検索(_S)"
 
@@ -672,11 +688,22 @@ msgstr "\"すべてのメモの検索\" ウィンドウを開きます"
 msgid "Start synchronizing notes"
 msgstr "メモの同期を開始します"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "拡張"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "最近の一覧に表示する最小のメモ数(最大18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "このメモのリンク元"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr " (なし)"
 
@@ -720,7 +747,7 @@ msgstr "アイコンの保存エラー"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
 msgid "Could not save the icon file."
-msgstr "アイコン・ファイルを保存できませんでした。"
+msgstr "アイコンファイルを保存できませんでした。"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
@@ -730,6 +757,26 @@ msgstr "このアイコンを削除しますか?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "アイコンを削除すると、設定情報を完全に失うことになります。"
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "E-メールを開けません"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "HTML のエクスポート先"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "メモをエクスポートする"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "その他のリンク付きメモをすべて含める"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "HTML へエクスポート"
@@ -744,55 +791,44 @@ msgid "Note exported successfully"
 msgstr "メモのエクスポートが完了しました"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "アクセスが拒否されました。"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
-msgstr "フォルダがありません。"
+msgstr "フォルダーがありません。"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "\"{0}\" というファイルを保存できませんでした"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "HTML のエクスポート先"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "メモをエクスポートする"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "その他のリンク付きメモをすべて含める"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "E-メールを開けません"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
-msgstr "フォルダのパス(_F): "
+msgstr "フォルダーのパス(_F): "
 
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
 msgid "Select Synchronization Folder..."
-msgstr "同期するフォルダの選択..."
+msgstr "同期するフォルダーの選択..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
-msgstr "フォルダのパス名が空です。"
+msgstr "フォルダーのパス名が空です。"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr ""
-"指定した名前のフォルダは存在しません (フォルダを生成できませんでした)。"
+"指定したフォルダーのパスが存在しないので、Tomboyはファイルを作成することが出"
+"来ませんでした。"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
-msgstr "ローカルのフォルダ"
+msgstr "ローカルのフォルダー"
 
 #: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
 msgid "Fixed Wid_th"
@@ -854,11 +890,11 @@ msgstr "予定"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"<span weight=\"bold\">今日: テンプレート</span>のメモを変更して、新しい今日の"
-"メモに表示する項目をカスタマイズしてみてください。"
+"新しい今日のメモに表示するテキストをカスタマイズするために<span weight=\"bold"
+"\">今日: テンプレート</span>のメモを変更します。"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -883,48 +919,53 @@ msgstr "{0}/{1} ページ"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "yyyy/MM/dd (dddd) tt hh:mm:ss"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "壊れたリンクを削除"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "スケッチの追加"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
-msgstr "サーバ(_R): "
+msgstr "サーバー(_R): "
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
-msgstr "ユーザ名(_N): "
+msgstr "ユーザー名(_N): "
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
-msgstr "フォルダ (オプション)(_F): "
+msgstr "フォルダー(オプション)(_F): "
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
 msgstr ""
-"SSH による同期を行うには、予め実行中の SSH デーモンに追加しておいたユーザ名と"
-"鍵が必要です。"
+"SSH による同期を行うには、予め実行中の SSH デーモンに追加しておいたユーザー名"
+"と鍵が必要です。"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
-msgstr "サーバ名またはユーザ名のエントリが空です。"
+msgstr "サーバー名またはユーザー名のエントリが空です。"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
 msgstr ""
-"サーバへ接続している最中にタイムアウトしました。SSH の鍵を起動中の SSH デーモ"
-"ンに追加したかどうかを確認してください。"
+"サーバーへ接続している最中にタイムアウトしました。SSH の鍵を起動中の SSH デー"
+"モンに追加したかどうかを確認してください。"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
 msgid "Import from Sticky Notes"
@@ -945,15 +986,16 @@ msgstr "付箋紙のインポートが完了しました"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr ""
-"<b>{0}</b>/<b>{1}</b> 個の付箋紙アプレットのファイルをインポートしました。"
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b>/<b>{1}</b> 個の付箋紙アプレットをインポートしました。"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "タイトルなし"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "付箋紙: "
 
@@ -977,71 +1019,67 @@ msgstr "--- Tasque が起動されていません ---"
 msgid "_Underline"
 msgstr "下線(_U)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "URL(_U): "
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "パスワード(_P): "
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
-msgstr "URL または ユーザ名、あるいはパスワードのエントリが空です。"
+msgstr "URL または ユーザー名、あるいはパスワードのエントリが空です。"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
 msgstr ""
-"サーバへ接続している最中にエラーが発生しました。これはユーザ名とパスワード、"
-"またはそのどちらかが間違っていることが原因かもしれません。"
+"サーバーへ接続している最中にエラーが発生しました。これはユーザー名とパスワー"
+"ド、またはそのどちらかが間違っていることが原因かもしれません。"
 
 #. TODO: If the above fails (no keyring daemon), save all but password
 #. to GConf, and notify user.
 #. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "GNOME キーリングの設定を保存できませんでした:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy のウェブサイト"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
-msgstr "サーバへ接続中です"
+msgstr "サーバーへ接続中です"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
 msgid "Connected"
 msgstr "接続しました"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
-msgstr "サーバが応答しません。後ほど再接続してみてください。"
+msgstr "サーバーが応答しません。後ほど再接続してみてください。"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "認証が失敗しました。再度アクセスしてみてください"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy のウェブ認証は成功しました"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1049,22 +1087,120 @@ msgstr ""
 "Tomboy の設定ウィンドウに戻り、\"保存\" をクリックして同期を開始してくださ"
 "い。"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "接続しました。\"保存\" をクリックすると同期を開始します"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
-msgstr "ブラウザで認証 (クリックすると接続をリセットします)"
+msgstr "ブラウザーで認証 (クリックすると接続をリセットします)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
-msgstr "デフォルトブラウザを設定して再度表示してください"
+msgstr "デフォルトブラウザーを設定して再度表示してください"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy のウェブサイト"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "すべてのメモを{0}にエクスポート"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "{0}へメモのエクスポートを開始"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "選択したノートを{0}にエクスポート"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "{0}へノートのエクスポートを開始"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "ツール(_T)"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "エクスポート"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "メモをエクスポートする。"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "すべてのメモを{0}へエクスポート"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "選択したノートを{0}へエクスポート"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "すべてのメモ{0}をエクスポート"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "アクセスが拒否されたので、エクスポートできませんでした。"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "フォルダーが無いため、エクスポートできませんでした。"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "エクスポートできませんでした: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "不明なエラー。"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "未ファイルのメモ"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "メモを \"{0}\" にエクスポートしました。"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "メモのエクスポートが完了しました"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "\"{0}\" にあるファイルを保存できませんでした"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "{0}エクスポート用のフォルダーを作成"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "すべてのメモの検索"
 
@@ -1117,26 +1253,6 @@ msgstr "既に同じ名前のノートがあります"
 msgid "C_reate"
 msgstr "作成する(_R)"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0}メモのテンプレート"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "すべてのメモ"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "未ファイルのメモ"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "ノート(_B)"
@@ -1176,15 +1292,35 @@ msgid "Delete the selected notebook"
 msgstr "選択したノートを削除します"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "ノート"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0}メモのテンプレート"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "新しいメモ"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "すべてのメモ"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "このノートを本当に削除してもよろしいですか?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1205,33 +1341,39 @@ msgstr "ノートなし"
 msgid "New \"{0}\" Note"
 msgstr "新しい \"{0}\" のメモ"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "このメモをノートに入れます"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "ノート"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "新しいノート(_N)..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "このメモを本当に削除してもよろしいですか?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "新しいメモ {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "本当に \"{0}\"を削除しますか?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
-msgstr[0] "この {0} を本当に削除してもよろしいですか?"
+msgstr[0] "本当にこの {0} を削除してもよろしいですか?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "メモを削除すると、メモの内容を完全に失うことになります。"
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1242,13 +1384,13 @@ msgstr ""
 "になっているかを確認してください。エラーの詳細については {1} を参照してくださ"
 "い。"
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
-msgstr "データの保存エラー"
+msgstr "メモデータの保存エラー。"
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "新しいメモのテンプレート"
 
@@ -1288,8 +1430,8 @@ msgstr ""
 "れているのかを気にしたことは全く無いでしょうし、今でも気にしていないのであれ"
 "ば、そのまま<bold>このメモを削除してください</bold> :-)\n"
 "\n"
-"古いメモのディレクトリはそのまま <link:url>{0}</link:url> に置かれています。"
-"Tomboy を古いバージョンに戻す場合は、メモはそこから探してください。\n"
+"古いメモのディレクトリーはそのまま <link:url>{0}</link:url> に置かれていま"
+"す。Tomboy を古いバージョンに戻す場合は、メモはそこから探してください。\n"
 "\n"
 "しかし、メモと設定情報は新しいディレクトリにコピーしてあり、これからは新しい"
 "のを使います:\n"
@@ -1369,7 +1511,7 @@ msgstr ""
 "す。</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "ここから開始"
 
@@ -1377,14 +1519,9 @@ msgstr "ここから開始"
 msgid "Using Links in Tomboy"
 msgstr "Tomboy でリンクを利用する"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "新しいメモ {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "新しいメモをここに記述してください。"
 
@@ -1408,10 +1545,10 @@ msgid ""
 "\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"
+"他のメモ中のリンクの名前を \"<span underline=\"single\">{0}</span>\" から "
+"\"<span underline=\"single\">{1}</span>\" に変更しますか?\n"
 "\n"
-"リンクの名前を変更しない場合、それらはどこも指さないリンクになります。"
+"リンクの名前を変更しない場合、無効なリンクになります。"
 
 #: ../Tomboy/NoteRenameDialog.cs:83
 msgid "Rename Links"
@@ -1434,7 +1571,7 @@ msgstr "何も選択しない"
 
 #: ../Tomboy/NoteRenameDialog.cs:144
 msgid "Ad_vanced"
-msgstr "高度(_V)"
+msgstr "拡張(_V)"
 
 #: ../Tomboy/NoteRenameDialog.cs:147
 msgid "Always show this _window"
@@ -1448,139 +1585,164 @@ msgstr "リンクの名前を変更しない(_L)"
 msgid "Alwa_ys rename links"
 msgstr "常にリンクの名前を変更する(_Y)"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "このメモの中を検索する"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "新しいメモへのリンク(_L)"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "テキスト(_X)"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "このメモの中を検索する(_F)"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "すべてのメモを閉じる(_E)"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "検索"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "メモを検索します (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "メモの検索"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "リンク"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "指定した部分を新しいメモへリンクします (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "選択したテキストを新しいノートのリンクにする"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "テキスト(_T)"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "文字のプロパティを変更します"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "ツール(_O)"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "いろいろなツールを利用します"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "このメモを削除します"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "メモの同期"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"このメモはテンプレートメモです。通常のメモの標準の内容を決定し、メモのメ"
+"ニューや検索ウィンドウに表示しません。"
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "通常のメモに変換"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "サイズを保存(_Z)"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "選択を保存(_L)"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "タイトルを保存(_T)"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "検索(_F)..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "前方検索(_N)"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "後方検索(_P)"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "メモを作成できません"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "検索(_F):"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
-msgstr "前の検索(_P)"
+msgstr "前へ(_P)"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "次へ(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "太字(_B)"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "イタリック(_I)"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "打ち消し線(_S)"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "強調(_H)"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "フォント"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "標準(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "巨大(_G)"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "大きい(_L)"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "小さい(_M)"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "フォントサイズを大きくする"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "フォントサイズを小さくする"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "箇条書き"
 
@@ -1600,24 +1762,24 @@ msgstr "同期"
 msgid "Add-ins"
 msgstr "アドイン"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "入力中にスペルをチェックする(_S)"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr ""
-"スペル違いの文字には赤色の下線がつき、コンテキスト・メニューの中に妥当なスペ"
-"ルを提示します。"
+"スペル違いの文字には赤色の下線がつき、コンテキストメニューの中に妥当なスペル"
+"を提示します。"
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "WikiWord を強調表示する(_W)"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1626,31 +1788,31 @@ msgstr ""
 "その単語をクリックすると、それをタイトルにした新しいメモを作成します。"
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "箇条書きに自動変換する(_B)"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "フォントを指定する(_F)"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "リンクされたメモの名前を変更した場合: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "どうするか尋ねる"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "リンクの名前を変更しない"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "常にリンクの名前を変更する"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1658,16 +1820,16 @@ msgstr ""
 "メモのテンプレートを利用して、新しく作成するメモに記録する情報をあらかじめ指"
 "定しておくことが可能です。"
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "新しいテンプレートを開く"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "ホットキーを監視する(_H)"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1677,104 +1839,105 @@ msgstr ""
 "ホットキーの例: <b><Control><Shift>F11</b>、<b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "メモのメニューを表示する(_M)"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "\"ここから開始\" を開く(_S)"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "新しいメモを作成する(_N)"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "\"すべてのメモの検索\" を開く(_A)"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "サービス(_V): "
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "設定できません"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "バックグランドで自動的に同期する間隔(_Y)"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "分"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "拡張(_A)..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "次のアドインが拡張機能としてインストールされています"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "さらにアドインを追加..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "有効にする(_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "無効にする(_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "実装されていません"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} の設定"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "メモで使用するフォントの選択"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "その他の同期オプション"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
-msgstr "ローカルのメモと同期先のサーバにあるメモとの間に矛盾が生じている場合:"
+msgstr ""
+"ローカルのメモと同期先のサーバーにあるメモとの間に矛盾が生じている場合:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
-msgstr "どう対処するか常に問い合わせる"
+msgstr "どうするか常に尋ねる。"
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
-msgstr "ローカルのメモの名前を変更する"
+msgstr "ローカルのメモの名前を変更する。"
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
-msgstr "サーバ側のメモでローカルのメモを置き換える"
+msgstr "サーバー側のメモでローカルのメモを置き換える。"
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "警告: 本当によろしいですか?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "本当によろしいですか?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1782,332 +1945,144 @@ msgstr ""
 "同期の設定をクリアするのはお奨めしません。新しい設定を保存する際に再びメモを"
 "強制的に同期できるからです。"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "同期の設定を再構成しました"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
-"同期サービスの設定を無効にしました。お使いの設定がクリアされます。新しい設定"
-"を保存すると再びメモを強制的に同期できるようになります。"
+"同期サービスの設定を無効にしました。同期の設定がクリアされます。新しい設定を"
+"保存すると再びノートを強制的に同期できるようになります。"
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "接続が完了しました!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "接続に成功"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "メモの同期を行う準備が整いました。今すぐ同期しますか?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"申し訳ありませんが、何かの問題が発生しています。表示されている情報を確認し"
-"て、もう一度実施してみてください。{0} も原因究明に役立つかもしれません。"
+"情報を確認して、もう一度実施してみてください。ログファイル{0}にこのエラーにつ"
+"いての情報が含まれているかもしれません。"
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "接続エラー :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "接続エラー"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "バージョン:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "作者:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "著作権:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "アドインの依存関係:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "検索(_S):"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "メモ"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "変更日時"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "検索結果"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "タイトルの一致"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "({0}個見つかりました)"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "メモの総数: {0}個"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "該当したメモ: {0}個"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"選択したノートには見つかりませんでした。\n"
+"すべてのノートを検索するにはここをクリックします。"
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "すべてのノートを検索するためここをクリック"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "メモ"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "新しいメモを作成できません"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "初期の開発:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"お使いのシステムでは Synchronization アドインがサポートされていません。FUSE "
+"と {0} が正しくインストールされ設定されているか確認してください"
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "貢献者一覧:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "読み込みのテストが失敗しました。"
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"相花 毅 <takeshi.aihana at gmail.com>\n"
-"佐藤 暁 <ss at gnome.gr.jp>\n"
-"やまねひでき <henrich at debian.or.jp>\n"
-"草野 貴之 <AE5T-KSN at asahi-net.or.jp>\n"
-"Hiroyuki Sekihara <hiroyuki.sekihara at gmail.com>\n"
-"日本GNOMEユーザー会 <http://www.gnome.gr.jp/>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "書き込みのテストが失敗しました。"
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "サーバーへの接続がタイムアウトしました。"
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "シンプルで使いやすいデスクトップ・メモです。"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "サーバーへ接続する際にエラーが発生しました。"
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "ホームページ"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "FUSE を有効にできませんでした。"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: シンプルで使いやすいデスクトップ用メモです。\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"用法:\n"
-"  --version\t\t\tバージョン情報を表示する\n"
-"  --help\t\t\tこのヘルプを表示する\n"
-"  --note-path [path]\t\tメモのデータを読み込む/保存する path を指定する\n"
-"  --search [text]\t\t検索ウィンドウを開いて指定した text をすべてのメモから検"
-"索する\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\t新しいメモを作成して表示する\n"
-"  --new-note [title]\t\t指定した title をタイトルとする新しいメモを作成し表示"
-"する\n"
-"  --open-note [title/url]\t指定した title/url に一致するメモを表示する\n"
-"  --start-here\t\t\t\"ここから開始\" メモを表示する\n"
-"  --highlight-search [text]\t開いたメモから text を検索して強調表示する\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "バージョン {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (新規)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "Tomboy について(_A)"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"\"Tomboy メモのマニュアル\" が見つかりませんでした。インストールが問題なく行"
-"われているかどうか確認してみてください。"
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "ヘルプが見つかりませんでした"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "指定した場所を開けません"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "今日の{0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "今日"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "昨日の{0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "昨日"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0}日前の{1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0}日前"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "明日の{0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "明日"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "{0}日内の{1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "{0}日内"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d日 tth:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "MMMM d日"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "日付なし"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "yyyy年 MMMM d日 tth:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "yyyy年 MMMM d日"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(タイトルなし {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"タイトル <b>{0}</b> が付いたメモが既に存在します。続行する前に別のタイトルを"
-"選択してください。"
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "メモのタイトル"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "リンク先のアドレスのコピー(_C)"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "リンクを開く(_O)"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"お使いのシステムでは Synchronization アドインがサポートされていません。FUSE "
-"と {0} が正しくインストールされ設定されているか確認してください。"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "読み込みのテストが失敗しました。"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "書き込みのテストが失敗しました。"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "サーバへの接続がタイムアウトしました。"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "サーバへ接続する際にエラーが発生しました。"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "FUSE を有効にできませんでした。"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "指定したサーバへ接続する際にエラーが発生しました:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "指定したサーバーへ接続する際にエラーが発生しました:"
 
 #. Expander containing TreeView
 #: ../Tomboy/Synchronization/SyncDialog.cs:89
@@ -2140,7 +2115,7 @@ msgstr "少々時間がかかると思われます。ゆっくりくつろいで
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
-msgstr "サーバへ接続中です..."
+msgstr "サーバーへ接続中です..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
@@ -2152,11 +2127,11 @@ msgstr "新規/更新されたメモをダウンロードしています..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
-msgstr "サーバがロックされています"
+msgstr "サーバーがロックされています"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
-msgstr "サーバがロックされています"
+msgstr "サーバーがロックされています"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:270
 msgid ""
@@ -2168,15 +2143,15 @@ msgstr ""
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
-msgstr "サーバから更新内容をダウンロードする準備をしています..."
+msgstr "サーバーから更新内容をダウンロードする準備をしています..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
-msgstr "サーバへ更新内容をアップロードする準備をしています..."
+msgstr "サーバーへ更新内容をアップロードする準備をしています..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
-msgstr "サーバへメモをアップロード中..."
+msgstr "サーバーへメモをアップロード中..."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
@@ -2207,7 +2182,7 @@ msgstr[0] "{0}個のメモを同期しました。"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
-msgstr "(メモが更新されました)。"
+msgstr "メモは現在最新です。"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
@@ -2252,7 +2227,7 @@ msgstr "ローカルのメモを削除しました"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
-msgstr "サーバ上のメモを削除しました"
+msgstr "サーバー上のメモを削除しました"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
@@ -2264,11 +2239,11 @@ msgstr "追加しました"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
-msgstr "変更点をサーバにアップロードしました"
+msgstr "変更点をサーバーにアップロードしました"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
-msgstr "新しいメモをサーバにアップロードしました"
+msgstr "新しいメモをサーバーにアップロードしました"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
@@ -2306,12 +2281,8 @@ msgid ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
 "want to do with your local note?"
 msgstr ""
-"サーバにある \"{0}\" のメモがローカルのメモと矛盾が生じました。どのように対処"
-"しますか?"
-
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "ツール(_T)"
+"サーバーにある \"{0}\" のメモがローカルのメモと矛盾が生じました。どのように対"
+"処しますか?"
 
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
@@ -2343,7 +2314,234 @@ msgid ""
 msgstr ""
 "指定した同期を行うには FUSE のモジュールが必要です。\n"
 "\n"
-"この問題を解決するには、システムの起動時に FUSE カーネル・モジュールをロード"
-"しておく必要があります。\"modprobe fuse\" という文を /etc/init.d/boot.local "
+"この問題を解決するには、システムの起動時に FUSE カーネルモジュールをロードし"
+"ておく必要があります。\"modprobe fuse\" という文を /etc/init.d/boot.local "
 "ファイルに追加するか、または \"fuse\" という文を /etc/modules ファイルに追加"
 "しておいてください。"
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "新しいメモを作成できません"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "初期の開発:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "貢献者一覧:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"相花 毅 <takeshi.aihana at gmail.com>\n"
+"佐藤 暁 <ss at gnome.gr.jp>\n"
+"やまねひでき <henrich at debian.or.jp>\n"
+"草野 貴之 <AE5T-KSN at asahi-net.or.jp>\n"
+"Hiroyuki Sekihara <hiroyuki.sekihara at gmail.com>\n"
+"Kentaro KAZUHAMA <kazken3 at gmail.com>\n"
+"日本GNOMEユーザー会 <http://www.gnome.gr.jp/>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "シンプルで使いやすいデスクトップメモです。"
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "ホームページ"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: シンプルで使いやすいデスクトップ用ノートアプリケーションです。\n"
+"Copyright (C) 2004-2007 Alex Graveley\n"
+" <alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"用法:\n"
+"  --version\t\t\tバージョン情報を表示する\n"
+"  --help\t\t\tこのヘルプを表示する\n"
+"  --note-path [path]\t\tメモのデータを読み込む/保存する path を指定する\n"
+"  --search [text]\t\t検索ウィンドウを開いて指定した text をすべてのメモから検"
+"索する\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\t新しいメモを作成して表示する\n"
+"  --new-note [title]\t\t指定した title をタイトルとする新しいメモを作成し表示"
+"する\n"
+"  --open-note [title/url]\t指定した title/url に一致するメモを表示する\n"
+"  --start-here\t\t\t\"ここから開始\" メモを表示する\n"
+"  --highlight-search [text]\t開いたメモから text を検索して強調表示する\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "バージョン {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (新規)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "Tomboy について(_A)"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"\"Tomboy メモのマニュアル\" が見つかりませんでした。インストールが問題なく行"
+"われているかどうか確認してみてください。"
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "ヘルプが見つかりませんでした"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "指定した場所を開けません"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "今日の{0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "今日"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "昨日の{0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "昨日"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0}日前の{1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0}日前"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "明日の{0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "明日"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "{0}日内の{1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "{0}日内"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d日 tth:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "MMMM d日"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "日付なし"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "yyyy年 MMMM d日 tth:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "yyyy年 MMMM d日"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(タイトルなし {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"タイトル <b>{0}</b> が付いたメモが既に存在します。続行する前に別のタイトルを"
+"選択してください。"
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "メモのタイトル"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "リンク先のアドレスのコピー(_C)"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "リンクを開く(_O)"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "最後に HTML をエクスポートしたフォルダ"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "このメモを本当に削除してもよろしいですか?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "メモを検索します (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "接続が完了しました!"
diff --git a/po/ko.po b/po/ko.po
index 752c16e..81a4741 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -12,15 +12,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&component=general\n"
-"POT-Creation-Date: 2011-03-19 23:44+0900\n"
-"PO-Revision-Date: 2011-03-19 23:44+0900\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-08-30 20:22+0000\n"
+"PO-Revision-Date: 2011-09-23 04:15+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu at debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr at googlegroups.com>\n"
-"Language: Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: Korean\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
@@ -84,37 +85,44 @@ msgid "Custom Font Face"
 msgstr "사용자 글꼴"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "검색 창의 X 좌표, 톰보이가 끝날 때 저장합니다."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr "\"모든 쪽지 검색\" 창의 X 좌표, 톰보이가 끝날 때 저장합니다."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "검색 창의 Y 좌표, 톰보이가 끝날 때 저장합니다."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr "\"모든 쪽지 검색\" 창의 Y 좌표, 톰보이가 끝날 때 저장합니다."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr "검색 창의 픽셀 높이, 톰보이가 끝날 때 저장합니다."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr "\"모든 쪽지 검색\" 창의 픽셀 높이, 톰보이가 끝날 때 저장합니다."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
-msgstr "검색 창의 픽셀 너비, 톰보이가 끝날 때 저장합니다."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "\"모든 쪽지 검색\" 창의 픽셀 너비, 톰보이가 끝날 때 저장합니다."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "자동 목록 만들기를 사용합니다."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "아이콘에 가운데 단추 붙여넣기 기능을 사용합니다."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "트레이 아이콘 사용"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "위키문법 강조 사용"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "자동으로 목록을 만듭니다."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Esc 키로 쪽지 닫기 기능을 사용합니다."
@@ -172,25 +180,21 @@ msgid "HTML Export All Linked Notes"
 msgstr "HTML 내보내기 - 모든 연결된 쪽지"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "HTML 내보내기 - 마지막 디렉터리"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "HTML 내보내기 - 연결된 쪽지"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr "거짓이면 \"쪽지 삭제\" 확인 창이 나타나지 않습니다."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
 msgstr "enable_custom_font이 참이면 여기에 설정된 글꼴로 쪽지를 나타냅니다."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -198,11 +202,11 @@ msgstr ""
 "참이면 톰보이가 끝날때 열려있던 모든 쪽지가 다음에 시작할 때 자동으로 모두 열"
 "립니다."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "참이면 Esc 키를 눌렀을 때 열려 있는 쪽지를 닫습니다."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -211,7 +215,7 @@ msgstr ""
 "참이면 알림 영역에 톰보이 트레이 아이콘을 표시합니다. 다른 프로그램이 트레이 "
 "아이콘의 기능을 대싱 하는 경우 거짓으로 설정하는 편이 좋을 수도 있습니다."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -219,7 +223,7 @@ msgstr ""
 "참이면 맞춤법이 틀릴 때 빨간색으로 보이고, 오른쪽 마우스 단추를 누르면 올바"
 "른 맞춤법으로 된 단어가 보입니다."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -228,7 +232,7 @@ msgstr ""
 "참이면 /apps/tomboy/global_keybindings이 데스크톱 전체 바로가기 키로 설정되"
 "며 모든 응용프로그램에서 톰보이를 사용할 수 있게됩니다."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -236,7 +240,7 @@ msgstr ""
 "참이면 custom_font_face에 설정된 글꼴이름이 쪽지를 보이는 기본 글꼴로 됩니"
 "다. 그렇지 않으면 데스크톱 기본 글꼴로 쪽지를 보여줍니다."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -244,13 +248,13 @@ msgstr ""
 "쪽지 가져오기 플러그인을 아직 실행하지 않았다는 뜻입니다. 즉 톰보이가 다음 번"
 "에 시작할 때 가져오기 플러그인을 실행해야 한다는 뜻입니다."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr "톰보이 쪽지 메뉴에 표시할 쪽지의 최소 개수를 결정하는 숫자."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -261,7 +265,7 @@ msgstr ""
 "설정한 경우.) 값이 1보다 작으면 동기화를 하지 않는다는 뜻입니다. 사용할 수 있"
 "는 최소값은 5입니다. 이 값은 분 단위입니다."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -273,7 +277,7 @@ msgstr ""
 "를 나타내는 정수 값. 이 값은 내부의 열거형을 나타냅니다. 값이 0이면 충돌이 발"
 "생했을 때 사용자에게 확인해서 충돌 상황에 따라 개별적으로 처리할 수 있습니다."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -288,6 +292,10 @@ msgstr ""
 "어떻게 할지 물어봅니다. 값이 1이면 링크를 자동으로 제거합니다. 값이 2이면 링"
 "크 텍스트도 새 이름에 맞게 업데이트해서 이름 바뀐 쪽지로 연결되게 합니다."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "최근 HTML 내보내기에 사용한 디렉터리"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "쪽지 이름을 바꿨을 때 링크 업데이트 방식"
@@ -353,20 +361,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS 동기화 서버 URL"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "검색 창의 높이 저장"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "\"모든 쪽지 검색\" 창의 저장된 높이"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "검색 창의 가로 위치 저장"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "\"모든 쪽지 검색\" 창의 저장된 가로 위치"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "검색 창의 세로 위치 저장"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "\"모든 쪽지 검색\" 창의 저장된 세로 위치"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "검색 창의 너비 저장"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "\"모든 쪽지 검색\" 창의 저장된 너비"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -585,7 +593,7 @@ msgstr "삭제(_D)"
 msgid "Delete the selected note"
 msgstr "선택한 쪽지를 삭제합니다"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "닫기(_C)"
 
@@ -629,7 +637,7 @@ msgstr "트레이 아이콘"
 msgid "Create _New Note"
 msgstr "새 쪽지 만들기(_N)"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "모든 쪽지 검색(_S)"
 
@@ -641,11 +649,22 @@ msgstr "모든 쪽지 검색 창을 엽니다"
 msgid "Start synchronizing notes"
 msgstr "쪽지 동기화를 시작합니다"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "고급"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "최근 목록에서 표시할 쪽지 최소 개수 (최대 18개)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "여기로 연결되는 쪽지?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(없음)"
 
@@ -698,6 +717,26 @@ msgstr "이 아이콘을 정말로 제거하시겠습니까?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "아이콘을 제거하면 되살릴 수 없습니다."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "email 열 수 없음"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "HTML로 보낼 위치"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "연결된 쪽지 내보내기"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "기타 연결된 쪽지 모두 포함"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "HTML로 내보내기"
@@ -712,10 +751,14 @@ msgid "Note exported successfully"
 msgstr "쪽지를 성공적으로 내보냈습니다."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "접근이 거부되었습니다."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "폴더가 없습니다."
 
@@ -724,22 +767,6 @@ msgstr "폴더가 없습니다."
 msgid "Could not save the file \"{0}\""
 msgstr "\"{0}\" 파일을 저장할 수 없습니다"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "HTML로 보낼 위치"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "연결된 쪽지 내보내기"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "기타 연결된 쪽지 모두 포함"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "email 열 수 없음"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "폴더 경로(_F):"
@@ -748,16 +775,16 @@ msgstr "폴더 경로(_F):"
 msgid "Select Synchronization Folder..."
 msgstr "동기화 폴더 선택..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "폴더 경로가 비어있습니다."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "지정한 폴더 경로가 없습니다, 또한 톰보이가 폴더를 만들 수 없습니다."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "로컬 폴더"
 
@@ -820,11 +847,9 @@ msgstr "약속"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
-msgstr ""
-"오늘의 쪽지에 있는 내용을 고치려면 <span weight=\"bold\">오늘: 서식</span>쪽"
-"지를 바꾸십시오."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
+msgstr "새로 만든 오늘의 쪽지에 있는 내용을 바꾸려면 <b>오늘: 서식</b>쪽지를 바꾸십시오."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -849,40 +874,45 @@ msgstr "페이지 {0} (전체 {1})"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "yyyy/MM/dd dddd, tt hh:mm:ss"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "깨진 링크 제거"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "스케치 추가"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "서버(_R):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "사용자 이름(_N):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "폴더 경로(_F) (선택사항):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
 msgstr "SSH 데몬에 서버와 사용자의 SSH 키를 추가해야 SSH 동기화가 동작합니다."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "서버 또는 사용자 이름 필드가 비었습니다."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -909,14 +939,16 @@ msgstr "메모지에서 모두 가져왔습니다"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{1}</b>개중 <b>{0}</b>개의 메모지를 가져왔습니다."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{1}</b>개 중 <b>{0}</b>개 메모지를 가져왔습니다."
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "제목 없음"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "메모지:"
 
@@ -940,23 +972,23 @@ msgstr "--- 작업 기능을 실행하고 있지 않습니다 ---"
 msgid "_Underline"
 msgstr "밑줄(_U)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "암호(_P):"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "URL, 사용자 이름 또는 암호 입력란이 비어있습니다."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -969,17 +1001,13 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "그놈 키 모음에 설정을 저장하는데 다음과 같은 오류가 생겼습니다:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "톰보이 웹"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "서버에 연결"
 
@@ -988,45 +1016,143 @@ msgid "Connected"
 msgstr "열결됨"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "서버가 응답하지 않습니다. 다시 시도해 보십시오."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "동기화 실패. 다시 시도해 보십시오"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "톰보이 웹 인증이 성공했습니다"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
 msgstr ""
 "동기화를 시작하려면 톰보이 기본 설정 창으로 돌아가서 저장을 누르십시오."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "연결. 동기화를 시작하려면 저장을 누르십시오."
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "브라우저에서 인증 (연결을 초기화하려면 누르십시오)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "기본 브라우저를 설정하고 다시 시도하십시오"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "톰보이 웹"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "모든 쪽지 {0} 내보내기"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "쪽지를 {0}에 내보내기를 시작합니다"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "선택한 쪽지함 {0} 내보내기"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "쪽지함을 {0}에 내보내기를 시작합니다"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "도구(_T)"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "내보내기"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "쪽지를 내보냅니다."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "모든 쪽지를 {0} 내보내기"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "선택한 쪽지함을 {0}에 내보내기"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "모든 쪽지 {0} 내보내기"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "내보낼 수 없습니다. 접근이 거부되었습니다."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "내보낼 수 없습니다. 폴더가 없습니다."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "내보낼 수 없습니다: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "알 수 없는 오류."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "분류하지 않은 쪽지"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "쪽지를 \"{0}\"에 내보냈습니다."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "쪽지를 성공적으로 내보냈습니다."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "\"{0}\"에 파일을 저장할 수 없습니다"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "{0} 내보내기 대상 폴더 만들기"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "모든 쪽지 검색"
 
@@ -1079,26 +1205,6 @@ msgstr "이름을 이미 사용 중입니다"
 msgid "C_reate"
 msgstr "만들기(_R)"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} 쪽지 서식"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "모든 쪽지"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "분류하지 않은 쪽지"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "쪽지함(_B)"
@@ -1138,15 +1244,35 @@ msgid "Delete the selected notebook"
 msgstr "선택한 쪽지함을 삭제합니다"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "쪽지함"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} 쪽지 서식"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "새 쪽지"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "모든 쪽지"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "이 쪽지함을 정말로 삭제하시겠습니까?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1167,33 +1293,39 @@ msgstr "쪽지함 없음"
 msgid "New \"{0}\" Note"
 msgstr "새 \"{0}\" 쪽지"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "이 쪽지를 쪽지함에 놓습니다"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "쪽지함"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "새 쪽지함(_N)..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "이 쪽지를 정말로 삭제하시겠습니까?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "새 쪽지 {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "정말로 \"{0}\" 쪽지를 삭제하시겠습니까?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "정말로 쪽지 {0}개를 삭제하시겠습니까?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "쪽지를 삭제하면 되살릴 수 없습니다."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1203,13 +1335,13 @@ msgstr ""
 "쪽지를 저장하는 데 오류가 발생했습니다. 디스크 공간이 충분한 지 확인하시고, "
 "{0}의 권한이 올바른지 확인하십시오. 자세한 오류 내용은 {1} 파일에 있습니다."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "쪽지 데이터 저장에 오류."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "새 쪽지 서식"
 
@@ -1329,7 +1461,7 @@ msgstr ""
 "</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "여기서 시작"
 
@@ -1337,14 +1469,9 @@ msgstr "여기서 시작"
 msgid "Using Links in Tomboy"
 msgstr "톰보이에서 연결 사용하기"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "새 쪽지 {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "새 쪽지를 적으십시오."
 
@@ -1408,139 +1535,162 @@ msgstr "링크 이름 바꾸지 않기(_L)"
 msgid "Alwa_ys rename links"
 msgstr "항상 링크 이름 바꾸기(_Y)"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "이 쪽지에서 찾기"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "새 쪽지로 연결(_L)"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "텍스트(_X)"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "이 쪽지에서 찾기(_F)"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "모든 쪽지 닫기(_E)"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "검색"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "쪽지에서 검색합니다 (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "쪽지 검색"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "연결"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "선택한 텍스트를 새 쪽지로 연결합니다 (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "선택한 텍스트를 새 쪽지로 연결합니다"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "텍스트(_T)"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "텍스트 등록정보 설정"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "도구(_O)"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "이 쪽지에 도구를 씁니다"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "이 쪽지를 삭제합니다"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "쪽지 동기화"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr "이 쪽지는 서식 쪽지입니다. 서식 쪽지는 일반 쪽지 내용의 기본값을 지정하는 쪽지이고, 쪽지 메뉴나 검색 창에 나타나지 않습니다."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "일반 쪽지로 변환"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "크기 저장(_Z)"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "선택 사항 저장(_L)"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "제목 저장(_T)"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "찾기(_F)..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "다음 찾기(_N)"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "이전 찾기(_P)"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "새 쪽지 만들 수 없음"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "찾기(_F):"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "이전(_P)"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "다음(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "굵게(_B)"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "기울임(_I)"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "취소선(_S)"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "강조(_H)"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "글꼴 크기"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "보통(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "아주 크게(_G)"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "크게(_L)"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "작게(_M)"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "글꼴 크기 확대"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "글꼴 크기 축소"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "목록 표시"
 
@@ -1560,11 +1710,11 @@ msgstr "동기화"
 msgid "Add-ins"
 msgstr "추가 기능"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "입력할 때 맞춤법 검사(_S)"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1573,11 +1723,11 @@ msgstr ""
 "에 올바른 단어 목록이 나옵니다."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "위키문법 강조(_W)"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1586,46 +1736,46 @@ msgstr ""
 "그 이름에 해당하는 쪽지를 만들어 줍니다."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "자동 목록 만들기 사용(_B)"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "사용자 글꼴 사용(_F)"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "연결된 쪽지의 이름을 바꿀 때: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "어떻게 할지 물어보기"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "링크 이름 바꾸지 않기"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "항상 링크 이름 바꾸기"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr "새 쪽지 서식을 이용해 새 쪽지를 만들 때 사용할 텍스트를 지정합니다."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "새 쪽지 서식 열기"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "단축키 사용(_H)"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1635,104 +1785,104 @@ msgstr ""
 "제 단축키: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
-msgstr "쪽지 메뉴 보기(_M)"
+msgstr "쪽지 메뉴 표시(_M)"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "\"여기서 시작\" 열기(_S)"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "새 쪽지 만들기(_N)"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "\"모든 쪽지 검색\" 열기(_A)"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "서비스(_V):"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "설정 없음"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "백그라운드에서 자동으로 동기화(_Y)"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "분"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "고급(_A)..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "아래와 같은 추가 기능이 설치되었습니다"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "추가 기능 더 받기..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "사용(_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "사용하지 않음(_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "구현되지 않음"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} 기본 설정"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "쪽지 글꼴 고르기"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "기타 동기화 옵션"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr "로컬의 쪽지와 설정된 동기화 서버의 쪽지가 충돌났을때:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "어떻게 할것인지 물어봅니다."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "로컬 쪽지의 이름을 바꿉니다."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "로컬 쪽지를 서버에 있는 쪽지로 업데이트합니다."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "WARNING: 정말로 그렇게 하시겠습니까?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "정말로 그렇게 하시겠습니까?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1740,334 +1890,148 @@ msgstr ""
 "동기화 설정을 초기화 하는 것은 바람직하지 않습니다. 새 설정을 저장할 때 모든 "
 "쪽지를 다시 강제로 동기화 해야 합니다."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "동기화 설정 초기화중"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "설정한 동기화 서비스를 사용하지 않도록 했습니다. 동기화 설정을 초기화합니"
 "다.  새 설정을 저장할 때 모든 쪽지를 다시 강제로 동기화 해야 합니다."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "성공! 연결되었습니다!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "연결 성공"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "쪽지를 동기화할 준비가 되었습니다. 지금 동기화하시겠습니까?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
-msgstr ""
-"뭔가 잘못되고 있습니다. 정보를 확인하고 다시 시도하십시오. {0} 파일이 유용할 "
-"수도 있습니다."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
+msgstr "정보가 올바른지 확인하고 다시 시도하십시오. {0} 로그 파일에 오류 관련 정보가 들어 있을 수도 있습니다."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
 msgstr "연결 실패"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "버전:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "만든이:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "저작권:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "추가 기능 의존성:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "검색(_S):"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "쪽지"
 
 # 최근 바뀐 날짜를 표시하는 데 쓰인다
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "최근 바뀜"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "일치"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "제목 일치"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0}개 일치"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "모두: {0}개 쪽지"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "해당: {0}개 쪽지"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"선택한 쪽지함에 결과가 없습니다.\n"
+"모든 쪽지에서 검색하려면 여기를 누르십시오."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "모든 쪽지에서 검색하려면 여기를 누르십시오"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "쪽지"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "새 쪽지를 만들 수 없습니다"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"이 동기화 추가기능은 이 시스템에서 동작하지 못합니다. FUSE와 {0}(을)를 올바르"
+"게 설치하고 설정해주시기 바립니다."
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "주요 개발:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "테스트 파일을 읽을 수 없습니다."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "도움을 준 분들:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "쓰기 테스트가 실패했습니다."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"차영호 <ganadist at gmail.com>, 2005-2007\n"
-"류창우 <cwryu at debian.org>, 2007, 2008, 2009"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "서버에 연결 중 시간제한 지남."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "서버에 연결 중 오류."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "사용하기 쉽고 간단한 데스크톱 쪽지 프로그램."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "FUSE를 사용할 수 없습니다."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "홈페이지"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "지정한 서버에 연결하는 중 오류가 발생했습니다:"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"톰보이: 사용하기 쉽고 간단한 데스크톱 쪽지 프로그램.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"사용법:\n"
-"  --version\t\t\t버전 정보를 표시합니다.\n"
-"  --help\t\t\t이 도움말을 표시합니다.\n"
-"  --note-path [경로]\t\t이 디렉터리에 쪽지 데이터를 읽고 저장합니다.\n"
-"  --search [텍스트]\t\t해당 텍스트에 대한 모든 쪽지 검색 창을 엽니다.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"사용법:\n"
-"  --new-note\t\t\t새 쪽지를 만들고 보여줍니다.\n"
-"  --new-note [제목]\t\t제목이 있는 새 쪽지를 만들고 보여줍니다.\n"
-"  --open-note [제목/url]\t해당 제목의 쪽지를 보여줍니다.\n"
-"  --start-here\t\t\t'여기서 시작' 쪽지를 보여줍니다.\n"
-"  --highlight-search [텍스트]\t열린 쪽지에서 해당 텍스트를 찾아서 강조합니"
-"다.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "버전 {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (새 쪽지)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "톰보이 정보(_A)"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"\"톰보이 쪽지 안내서\"를 찾을 수 없습니다.  설치를 성공적으로 마쳤는 지 확인"
-"하십시오."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "도움말을 찾지 못했습니다"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "위치를 열 수 없음"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "오늘, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "오늘"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "어제, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "어제"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0}일전, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0}일전"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "내일, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "내일"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "{0}일내, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "{0}일내"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d일, tt h:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "MMMM d일"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "날짜 없음"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "yyyy MMMM d일, tt h:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "yyyy MMMM d"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(제목 없음 {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"제목이 <b>{0}</b>인 쪽지가 이미 있습니다. 계속하려면 쪽지의 이름을 다르게 해"
-"주십시오."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "가져온 쪽지 제목"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "링크 주소 복사(_C)"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "링크 열기(_O)"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"이 동기화 추가기능은 이 시스템에서 동작하지 못합니다. FUSE와 {0}(을)를 올바르"
-"게 설치하고 설정해주시기 바립니다."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "테스트 파일을 읽을 수 없습니다."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "쓰기 테스트가 실패했습니다."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "서버에 연결 중 시간제한 지남."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "서버에 연결 중 오류."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "FUSE를 사용할 수 없습니다."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "지정한 서버에 연결하는 중 오류가 발생했습니다:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "상세 정보"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "상세 정보"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2261,10 +2225,6 @@ msgstr ""
 "\"{0}\"의 서버 버전이 로컬의 쪽지와 충돌납니다. 로컬 쪽지를 어떻게 하시겠습니"
 "까?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "도구(_T)"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2299,6 +2259,228 @@ msgstr ""
 "init.d/boot.local에 \"modprobe fuse\"를 추가하거나, /etc/modules에 \"fuse"
 "\"를 추가하십시오."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "새 쪽지를 만들 수 없습니다"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "주요 개발:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "도움을 준 분들:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"차영호 <ganadist at gmail.com>, 2005-2007\n"
+"류창우 <cwryu at debian.org>, 2007-2011"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "사용하기 쉽고 간단한 데스크톱 쪽지 프로그램."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "홈페이지"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"톰보이: 사용하기 쉽고 간단한 데스크톱 쪽지 프로그램.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"사용법:\n"
+"  --version\t\t\t버전 정보를 표시합니다.\n"
+"  --help\t\t\t이 도움말을 표시합니다.\n"
+"  --note-path [경로]\t\t이 디렉터리에 쪽지 데이터를 읽고 저장합니다.\n"
+"  --search [텍스트]\t\t해당 텍스트에 대한 모든 쪽지 검색 창을 엽니다.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"사용법:\n"
+"  --new-note\t\t\t새 쪽지를 만들고 보여줍니다.\n"
+"  --new-note [제목]\t\t제목이 있는 새 쪽지를 만들고 보여줍니다.\n"
+"  --open-note [제목/url]\t해당 제목의 쪽지를 보여줍니다.\n"
+"  --start-here\t\t\t'여기서 시작' 쪽지를 보여줍니다.\n"
+"  --highlight-search [텍스트]\t열린 쪽지에서 해당 텍스트를 찾아서 강조합니"
+"다.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "버전 {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (새 쪽지)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "톰보이 정보(_A)"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"\"톰보이 쪽지 안내서\"를 찾을 수 없습니다.  설치를 성공적으로 마쳤는 지 확인"
+"하십시오."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "도움말을 찾지 못했습니다"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "위치를 열 수 없음"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "오늘, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "오늘"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "어제, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "어제"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0}일전, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0}일전"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "내일, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "내일"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "{0}일내, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "{0}일내"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d일, tt h:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "MMMM d일"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "날짜 없음"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "yyyy MMMM d일, tt h:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "yyyy MMMM d"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(제목 없음 {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"제목이 <b>{0}</b>인 쪽지가 이미 있습니다. 계속하려면 쪽지의 이름을 다르게 해"
+"주십시오."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "가져온 쪽지 제목"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "링크 주소 복사(_C)"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "링크 열기(_O)"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "HTML 내보내기 - 마지막 디렉터리"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "이 쪽지를 정말로 삭제하시겠습니까?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "쪽지에서 검색합니다 (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "성공! 연결되었습니다!"
+
 #~ msgid "_Browse..."
 #~ msgstr "찾아보기(_B)..."
 
diff --git a/po/lv.po b/po/lv.po
index f71ac38..51d1cce 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: tomboy.gnome-2-26.lv\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-07-07 14:18+0000\n"
-"PO-Revision-Date: 2011-07-10 12:01+0300\n"
+"POT-Creation-Date: 2011-09-09 20:11+0000\n"
+"PO-Revision-Date: 2011-09-16 16:36+0300\n"
 "Last-Translator: Rūdofls Mazurs <rudolfs.mazurs at gmail.com>\n"
 "Language-Team: Latvian <lata-l10n at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,8 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 "X-Launchpad-Export-Date: 2009-01-04 12:52+0000\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.2\n"
+"Language: lv\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -85,32 +86,28 @@ msgid "Custom Font Face"
 msgstr "Pielāgots fonta veidols"
 
 #: ../data/tomboy.schemas.in.h:5
-#| msgid "Determines X coordinate of Search window; stored on Tomboy exit."
 msgid ""
 "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
 msgstr ""
-"Nosaka visu piezīmju meklēšanas loga X koordinātu; saglabā aizverot Tomboy."
+"Nosaka visu piezīmju meklēšanas loga X koordinātu; saglabā, aizverot Tomboy."
 
 #: ../data/tomboy.schemas.in.h:6
-#| msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
 msgid ""
 "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
 msgstr ""
-"Nosaka visu piezīmju meklēšanas loga Y koordinātu; saglabā aizverot Tomboy."
+"Nosaka visu piezīmju meklēšanas loga Y koordinātu; saglabā, aizverot Tomboy."
 
 #: ../data/tomboy.schemas.in.h:7
-#| msgid "Determines pixel height of Search window; stored on Tomboy exit."
 msgid ""
 "Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
 "exit."
 msgstr ""
-"Nosaka visu piezīmju meklēšanas loga augstumu pikseļos; saglabā aizverot "
+"Nosaka visu piezīmju meklēšanas loga augstumu pikseļos; saglabā, aizverot "
 "Tomboy."
 
 #: ../data/tomboy.schemas.in.h:8
-#| msgid "Determines pixel width of Search window; stored on Tomboy exit."
 msgid ""
 "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
@@ -130,7 +127,6 @@ msgid "Enable WikiWord highlighting"
 msgstr "Aktivizēt WikiWord izcelšanu"
 
 #: ../data/tomboy.schemas.in.h:12
-#| msgid "Enable Auto bulleted lists."
 msgid "Enable automatic bulleted lists."
 msgstr "Aktivēt automātisku sarakstu veidošanu."
 
@@ -388,22 +384,18 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS attālinātās sinhronizācijas servera URL"
 
 #: ../data/tomboy.schemas.in.h:54
-#| msgid "Saved height of Search window"
 msgid "Saved height of \"Search All Notes\" window"
 msgstr "Visu piezīmju meklēšanas loga saglabātais augstums"
 
 #: ../data/tomboy.schemas.in.h:55
-#| msgid "Saved horizontal position of Search window"
 msgid "Saved horizontal position of \"Search All Notes\" window"
 msgstr "Saglabātais visu piezīmju meklēšanas loga horizontālais novietojums"
 
 #: ../data/tomboy.schemas.in.h:56
-#| msgid "Saved vertical position of Search window"
 msgid "Saved vertical position of \"Search All Notes\" window"
 msgstr "Saglabātais visu piezīmju meklēšanas loga vertikālais novietojums"
 
 #: ../data/tomboy.schemas.in.h:57
-#| msgid "Saved width of Search window"
 msgid "Saved width of \"Search All Notes\" window"
 msgstr "Visu piezīmju meklēšanas loga saglabātais platums"
 
@@ -643,7 +635,7 @@ msgstr "_Dzēst"
 msgid "Delete the selected note"
 msgstr "Dzēst izvēlēto piezīmi"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Aizvērt"
 
@@ -687,7 +679,7 @@ msgstr "Rīkjoslas ikona"
 msgid "Create _New Note"
 msgstr "Izveidot jau_nu piezīmi"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "Meklēt vi_sās piezīmēs"
 
@@ -699,6 +691,16 @@ msgstr "Atvērt meklēt visās piezīmēs logu"
 msgid "Start synchronizing notes"
 msgstr "Sākt piezīmju sinhronizāciju"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Paplašināti"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Minimālais neseno sarakstā rādāmo piezīmju skaits (maks. 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Kas saitē uz šejieni?"
@@ -751,16 +753,32 @@ msgstr "Nevar saglabāt ikonas failu."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
-msgstr "Patiešām dzēst šo ikonu?"
+msgstr "Tiešām dzēst šo ikonu?"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
 msgid "If you remove an icon it is permanently lost."
 msgstr "Ja jūs dzēsīsiet šo ikonu tā tiks neatgriezeniski zaudēta."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Nevar atvērt e-pastu"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
 msgid "HTML"
 msgstr "HTML"
 
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "HTML eksportēšanas mērķis"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Eksportēt saistītās piezīmes"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Iekļaut visas citas savienotās piezīmes"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Eksportēt uz HTML"
@@ -791,22 +809,6 @@ msgstr "Mape neeksistē."
 msgid "Could not save the file \"{0}\""
 msgstr "Nevar saglabāt failu \"{0}\""
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "HTML eksportēšanas mērķis"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Eksportēt saistītās piezīmes"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Iekļaut visas citas savienotās piezīmes"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Nevar atvērt e-pastu"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Mapes ceļš:"
@@ -815,16 +817,16 @@ msgstr "_Mapes ceļš:"
 msgid "Select Synchronization Folder..."
 msgstr "Izvēlēties sinhronizācijas mapi..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Mapes ceļa lauks ir tukšs."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "Norādītais mapes ceļš neeksistē un Tomboy nevarēja to izveidot."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Vietējā mape"
 
@@ -888,15 +890,12 @@ msgid "Appointments"
 msgstr "Tikšanās"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-#| msgid ""
-#| "Change the <span weight=\"bold\">Today: Template</span> note to customize "
-#| "the text that new Today notes have."
 msgid ""
 "Change the <b>Today: Template</b> note to customize the text that new Today "
 "notes have."
 msgstr ""
-"Izmainiet <b>Today: Template</b> piezīmi, lai "
-"pielāgotu Šodienas piezīmēs redzamo tekstu."
+"Izmainiet <b>Today: Template</b> piezīmi, lai pielāgotu Šodienas piezīmēs "
+"redzamo tekstu."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -923,7 +922,6 @@ msgstr "dddd MM/dd/yyyy, hh:mm:ss tt"
 
 #. Adding menu item when note is opened and window created
 #: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
-#| msgid "Never rename links"
 msgid "Remove broken links"
 msgstr "Izņemt salauztās saites"
 
@@ -931,22 +929,22 @@ msgstr "Izņemt salauztās saites"
 msgid "Add a sketch"
 msgstr "Pievienot skici"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rveris:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Ceļš uz mapi (neobligāts):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -954,15 +952,15 @@ msgstr ""
 "SSH sinhronizācijai nepieciešama eksistējoša SSH atslēga šim serverimun "
 "lietotājam, pievienota jau palaistam SSH dēmonam."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Servera vai lietotājvārda lauks ir tukšs."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
 msgid "SSH"
 msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -989,7 +987,6 @@ msgstr "Sticky Notes importēšana pabeigta"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-#| msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
 msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
 msgid_plural ""
 "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
@@ -1025,23 +1022,23 @@ msgstr "--- Tasque nedarbojas ---"
 msgid "_Underline"
 msgstr "_Pasvītrot"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Parole:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "URL, lietotājvārda, vai paroles lauks ir tukšs."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1054,19 +1051,15 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "GNOME atslēgu saišķa konfigurācijas saglabāšana neizdevās, ar šādu "
 "paziņojumu:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy Tīmeklī"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Savienojas ar serverim"
 
@@ -1075,23 +1068,23 @@ msgid "Connected"
 msgstr "Savienojies"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Serveris neatbild. Pamēģiniet vēlāk atkal."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Autorizācija neizdevās, pamēģiniet vēlreiz."
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy tīmekļa autorizācija veiksmīga"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1099,39 +1092,44 @@ msgstr ""
 "Lūdzu, atgriezieties Tomboy iestatījumu logā un nospiediet 'Saglabāt', lai "
 "sāktu sinhronizāciju."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Savienojies. Nospiediet 'Saglabāt', lai sāktu sinhronizāciju"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Autorizēšanās pārlūkā (piespiediet lai atstatītu savienojumu)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Iestatiet noklusēto pārlūku un mēģiniet vēlreiz"
 
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy Tīmeklī"
+
 #: ../Tomboy/ExportAllApplicationAddin.cs:53
-#| msgid "HTML Export All Linked Notes"
-msgid "Export All Notes to "
-msgstr "Eksportēt visas piezīmes uz "
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Eksportēt visas piezīmes uz {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:54
-#| msgid "Start synchronizing notes"
-msgid "Start exporting notes to "
-msgstr "Sākt eksportēt piezīmes uz "
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Sākt eksportēt piezīmes uz {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:58
-#| msgid "Delete the selected notebook"
-msgid "Export selected notebook to "
-msgstr "Eksportēt izvēlēto piezīmju bloku uz "
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Eksportēt izvēlēto piezīmju bloku uz {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Sākt eksportēt piezīmju bloku uz "
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Sākt eksportēt piezīmju bloku uz {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:65
 #: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1139,41 +1137,41 @@ msgid "_Tools"
 msgstr "_Rīki"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:68
-#| msgid "Export to HTML"
 msgid "Export"
 msgstr "Eksportēt"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:69
-#| msgid "Export linked notes"
 msgid "Export your notes."
 msgstr "Eksportēt savas piezīmes."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:72
-#| msgid "HTML Export All Linked Notes"
-msgid "Export All Notes To "
-msgstr "Eksportēt visas piezīmes uz "
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Eksportēt visas piezīmes uz {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:77
-#| msgid "Delete Note_book"
-msgid "Export Selected Notebook To "
-msgstr "Eksportēt izvēlēto piezīmju bloku uz "
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Eksportēt izvēlēto piezīmju bloku uz {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Visas piezīmes {0} eksportēt"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:193
 #: ../Tomboy/ExportAllApplicationAddin.cs:271
-#| msgid "Could not read testfile."
 msgid "Could not export, access denied."
 msgstr "Nevarēja eksportēt, pieeja liegta."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:198
 #: ../Tomboy/ExportAllApplicationAddin.cs:276
-#| msgid "Folder does not exist."
 msgid "Could not export, folder does not exist."
 msgstr "Nevarēja eksportēt, mape neeksistē."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:203
 #: ../Tomboy/ExportAllApplicationAddin.cs:281
 #, csharp-format
-#| msgid "Your note was exported to \"{0}\"."
 msgid "Could not export: {0}"
 msgstr "Nevarēja eksportēt: {0}"
 
@@ -1183,30 +1181,29 @@ msgid "Unknown error."
 msgstr "Nezināma kļūda."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
 msgid "Unfiled Notes"
 msgstr "Nešķirotās piezīmes"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:389
 #, csharp-format
-#| msgid "Your note was exported to \"{0}\"."
 msgid "Your notes were exported to \"{0}\"."
 msgstr "Piezīmes tika eksportētas uz \"{0}\"."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:398
-#| msgid "Note exported successfully"
 msgid "Notes exported successfully"
 msgstr "Piezīmes veiksmīgi eksportētas"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:421
 #, csharp-format
-#| msgid "Could not save the file \"{0}\""
 msgid "Could not save the files in \"{0}\""
 msgstr "Nevar saglabāt failus iekš \"{0}\""
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Izveidot mērķa mapi priekš "
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Izveidot mērķa mapi {0} eksportēšanai"
 
 #: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
@@ -1261,22 +1258,6 @@ msgstr "Šāds nosaukums jau aizņemts"
 msgid "C_reate"
 msgstr "Iz_veidot"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} piezīmju bloka sagatave"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Visas piezīmes"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "_Piezīmju bloki"
@@ -1320,11 +1301,31 @@ msgstr "Izdzēst izvēlēto piezīmju bloku"
 msgid "Notebooks"
 msgstr "Piezīmju bloki"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} piezīmju bloka sagatave"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Jauna piezīme"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Visas piezīmes"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Vai tiešām izdzēst šo piezīmju bloku?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1345,40 +1346,41 @@ msgstr "Bez piezīmju bloka"
 msgid "New \"{0}\" Note"
 msgstr "Jauna \"{0}\" piezīme"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Ievietot šo piezīmi piezīmju blokā"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Piezīmju bloks"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "Jau_ns piezīmju bloks..."
 
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Jauna piezīme {0}"
 
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Patiešām dzēst šo piezīmi?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Tiešām dzēst \"{0}\"?"
 
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
-msgstr[0] "Patiešām dzēst šo {0} piezīmi?"
-msgstr[1] "Patiešām dzēst šīs {0} piezīmes?"
-msgstr[2] "Patiešām dzēst šīs {0} piezīmes?"
+msgstr[0] "Tiešām dzēst šo {0} piezīmi?"
+msgstr[1] "Tiešām dzēst šīs {0} piezīmes?"
+msgstr[2] "Tiešām dzēst šīs {0} piezīmes?"
 
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Ja jūs dzēsīsiet piezīmi, tā tiks  neatgriezeniski zaudēta."
 
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1389,7 +1391,7 @@ msgstr ""
 "daudz brīvās diska vietas un ka jums ir nepieciešamās atļaujas {0} mapei. "
 "Sīkāka informācija par kļūdu pieejama {1}."
 
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Kļūda saglabājot datus."
 
@@ -1530,7 +1532,7 @@ msgstr "Tomboy saišu izmantošana"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Aprakstiet savu piezīmi šeit."
 
@@ -1594,142 +1596,164 @@ msgstr "Nekad nepārsaukt _saites"
 msgid "Alwa_ys rename links"
 msgstr "Vienmēr _pārsaukt saites"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Meklēt šajā piezīmē"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "Saite uz jaunu piezīmi"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_ksts"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Meklēt šajā piezīmē"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Aizvērt visas pi_ezīmes"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Meklēt"
 
 #. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
-#| msgid "Search All Notes"
+#: ../Tomboy/NoteWindow.cs:445
 msgid "Search your notes"
 msgstr "Meklēt savas piezīmes"
 
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Saite"
 
-#: ../Tomboy/NoteWindow.cs:459
-#| msgid "Link selected text to a new note (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
 msgid "Link selected text to a new note"
 msgstr "Izveidot saiti izvēlētajam tekstam uz jaunu piezīmi"
 
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Teksts"
 
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Iestatīt teksta īpašības"
 
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Rīki"
 
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Izmantot rīkus šai piezīmei"
 
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Dzēst šo piezīmi"
 
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Sinhronizēt piezīmes"
 
-#: ../Tomboy/NoteWindow.cs:564
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Šī piezīme ir pagaidu veidne. Tā nosaka noklusēto saturu parastām piezīmēm "
+"un neparādīsies piezīmju izvēlnē vai meklēšanas logā."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Pārveidot par parastu piezīmi"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Saglabāt i_zmēru"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Sag_labāt izvēli"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Saglabā_t virsrakstu"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Meklēt..."
 
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Meklēt _nākamo"
 
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Meklēt ie_priekšējo"
 
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Nevar izveidot piezīmi"
 
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Meklēt:"
 
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "Ie_priekšējais"
 
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Nākamais"
 
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Treknraksts"
 
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Slīpraksts"
 
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Pārsvītrots"
 
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Izcelts"
 
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Fonta izmērs"
 
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normāls"
 
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "Milzī_gs"
 
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Liels"
 
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "Maz_s"
 
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Palielināt fonta izmēru"
 
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Samazināt fonta izmēru"
 
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Aizzīmes"
 
@@ -1922,7 +1946,6 @@ msgid "Replace my local note with the server's update."
 msgstr "Aizvietot manu lokālo piezīmi ar servera atjauninājumu."
 
 #: ../Tomboy/PreferencesDialog.cs:1142
-#| msgid "WARNING: Are you sure?"
 msgid "Are you sure?"
 msgstr "Esat pārliecināts?"
 
@@ -1940,10 +1963,6 @@ msgid "Resetting Synchronization Settings"
 msgstr "Atiestatu sinhronizācijas iestatījumus"
 
 #: ../Tomboy/PreferencesDialog.cs:1159
-#| msgid ""
-#| "You have disabled the configured synchronization service.  Your "
-#| "synchronization settings will now be cleared.  You may be forced to "
-#| "synchronize all of your notes again when you save new settings"
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1967,34 +1986,30 @@ msgstr ""
 
 #: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
-#| msgid ""
-#| "Sorry, but something went wrong.  Please check your information and try "
-#| "again.  The {0} might be useful too."
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
 "more information about the error."
 msgstr ""
-"Lūdzu, pārbaudiet savu informāciju un mēģiniet vēlreiz. "
-"Iespējams, {0} satur vairāk informācijas par kļūdu."
+"Lūdzu, pārbaudiet savu informāciju un mēģiniet vēlreiz. Iespējams, {0} satur "
+"vairāk informācijas par kļūdu."
 
 #: ../Tomboy/PreferencesDialog.cs:1274
-#| msgid "Error connecting :("
 msgid "Error connecting"
 msgstr "Kļūda savienojoties"
 
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Versija:"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Autors:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Autortiesības:"
 
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Pielikumu atkarības:"
 
@@ -2006,29 +2021,27 @@ msgstr "_Meklēt:"
 msgid "Note"
 msgstr "Piezīme"
 
-#: ../Tomboy/RecentChanges.cs:372
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Pēdējās izmaiņas"
 
-#: ../Tomboy/RecentChanges.cs:511
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
-msgstr "Atbilstības"
+msgstr "Atbilsmes"
 
-#: ../Tomboy/RecentChanges.cs:562
-#| msgid "{0} match"
-#| msgid_plural "{0} matches"
+#: ../Tomboy/RecentChanges.cs:563
 msgid "Title match"
-msgstr "Virsraksta atbilstība"
+msgstr "Virsraksta atbilsme"
 
-#: ../Tomboy/RecentChanges.cs:565
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
-msgstr[0] "{0} atbilstība"
-msgstr[1] "{0} atbilstības"
-msgstr[2] "{0} atbilstību"
+msgstr[0] "{0} atbilsme"
+msgstr[1] "{0} atbilsmes"
+msgstr[2] "{0} atbilsmju"
 
-#: ../Tomboy/RecentChanges.cs:579
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
@@ -2036,15 +2049,15 @@ msgstr[0] "Kopā: {0} piezīme"
 msgstr[1] "Kopā: {0} piezīmes"
 msgstr[2] "Kopā: {0} piezīmju"
 
-#: ../Tomboy/RecentChanges.cs:590
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
-msgstr[0] "Atbilstoša: {0} piezīme"
-msgstr[1] "Atbilstošas: {0} piezīmes"
-msgstr[2] "Atbilstība: {0} piezīmēm"
+msgstr[0] "Atbilsmes: {0} piezīme"
+msgstr[1] "Atbilsmes: {0} piezīmes"
+msgstr[2] "Atbilsmes: {0} piezīmēm"
 
-#: ../Tomboy/RecentChanges.cs:602
+#: ../Tomboy/RecentChanges.cs:603
 msgid ""
 "No results found in the selected notebook.\n"
 "Click here to search across all notes."
@@ -2052,302 +2065,75 @@ msgstr ""
 "Nav atrastu rezultātu izvēlētajā piezīmju blokā.\n"
 "Spiediet šeit, lai meklētu visās piezīmēs."
 
-#: ../Tomboy/RecentChanges.cs:608
+#: ../Tomboy/RecentChanges.cs:609
 msgid "Click here to search across all notebooks"
 msgstr "Spiediet šeit, lai meklētu visos piezīmju blokos"
 
-#: ../Tomboy/RecentChanges.cs:774
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Piezīmes"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Nevar izveidot jaunu piezīmi"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Galvenā izstrāde:"
-
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "Atbalstītāji:"
-
-#: ../Tomboy/Tomboy.cs:415
-msgid "translator-credits"
-msgstr ""
-"Raivis Dejus <orvils at gmail.com>\n"
-"Edgars Burmistris <stendec at inbox.lv>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Guntis https://launchpad.net/~guntisg\n"
-"  Mārtiņš Bruņenieks https://launchpad.net/~papuass\n"
-"  Peteris Krisjanis https://launchpad.net/~pecisk-gmail\n"
-"  Raivis Dejus https://launchpad.net/~orvils\n"
-"  karass https://launchpad.net/~kaspars-karass\n"
-"  tm https://launchpad.net/~toms-baugis"
-
-#: ../Tomboy/Tomboy.cs:424
-#| msgid ""
-#| "Copyright © 2004-2007 Alex Graveley\n"
-#| "Copyright © 2004-2010 Others\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
 msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Others\n"
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
 msgstr ""
-"Autortiesības © 2004-2007 Alex Graveley\n"
-"Autortiesības © 2004-2011 Citi\n"
+"Šim sinhronizācijas pielikumam nav atbalsta jūsu datorā. Lūdzu "
+"pārliecinieties, ka jums ir FUSE un {0} pareizi uzinstalēts un nokonfigurēts"
 
-#: ../Tomboy/Tomboy.cs:426
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Vienkārša un viegli lietojama piezīmju programma."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Nevar nolasīt testa failu."
 
-#: ../Tomboy/Tomboy.cs:436
-msgid "Homepage"
-msgstr "Mājas lapa"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Rakstīšanas tests neizdevās."
 
-#: ../Tomboy/Tomboy.cs:554
-#| msgid ""
-#| "Tomboy: A simple, easy to use desktop note-taking application.\n"
-#| "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-#| "\n"
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright © 2004-2007 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"Tomboy: Vienkārša un viegli lietojama piezīmju programma.\n"
-"Autortiesības (C) 2004-2006 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Autortiesības (C) 2004-2011 Citi\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Noildze savienojoties ar serveri."
 
-#: ../Tomboy/Tomboy.cs:568
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Izmantošana\n"
-"  --version\t\t\tIzdrukā versijas numuru.\n"
-"  --help\t\t\tIzdrukā palīdzības pazinojumu.\n"
-"  --note-path [ceļš]\t\tIelādē/Saglabā piezīmes norādītajā mapē.\n"
-"  --search [teksts]\t\tAtvērt meklēt visās piezīmēs logu ar norādīto "
-"tekstu.\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Kļūda savienojoties ar serveri."
 
-#: ../Tomboy/Tomboy.cs:578
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tIzveidot un parādīt jaunu piezīmi.\n"
-"  --new-note [virsraksts]\t\tIzveido jaunu piezīmi ar virsrakstu.\n"
-"  --open-note [virsraksts/url]\tParāda esošo piezīmi, kas atbilst "
-"virsrakstam.\n"
-"  --start-here\t\t\tParāda 'Sākt šeit' piezīmi.\n"
-"  --highlight-search [text]\tMeklē un izceļ tekstu atvērtajā piezīmē.\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "FUSE aktivizēt nav iespējams."
 
-#: ../Tomboy/Tomboy.cs:592
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versija {0}"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Kļūda savienojumā ar norādīto serveri:"
 
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (jauna)"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Detaļas"
 
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "P_ar Tomboy"
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
+msgid "Status"
+msgstr "Statuss"
 
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"\"Tomboy piezīmju rokasgrāmata\" nav atrodama.  Lūdzu pārliecinieties, ka "
-"jūsu instalācija ir bijusi veiksmīga."
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
+msgid "Acquiring sync lock..."
+msgstr "Iegūst sinhronizācijas slēgu..."
 
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Palīdzība nav atrasta"
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
+msgid "Committing changes..."
+msgstr "Saskaņo izmaiņas..."
 
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Nevar atvērt norādīto vietu"
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
+msgid "Synchronizing Notes"
+msgstr "Sinhronizē piezīmes"
 
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Šodien, {0}"
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
+msgid "Synchronizing your notes..."
+msgstr "Sinhronizē jūsu piezīmes..."
 
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Šodien"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Vakar, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Vakar"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Pirms {0} dienas, {1}"
-msgstr[1] "Pirms {0} dienām, {1}"
-msgstr[2] "Pirms {0} dienām, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Pirms {0} dienas"
-msgstr[1] "Pirms {0} dienām"
-msgstr[2] "Pirms {0} dienām"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Rīt, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Rīt"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Pēc {0} dienas, {1}"
-msgstr[1] "Pēc {0} dienām, {1}"
-msgstr[2] "Pēc {0} dienām, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Pēc {0} dienas"
-msgstr[1] "Pēc {0} dienām"
-msgstr[2] "Pēc {0} dienām"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d. MMMM , h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Nav datuma"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "yyyy. gada d. MMMM, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Nenosaukts {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Piezīme ar virsrakstu <b>{0}</b> jau eksistē. Lūdzu, izvēlieties citu "
-"virsrakstu."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Piezīmes virsraksts jau eksistē"
-
-#: ../Tomboy/Watchers.cs:587
-msgid "_Copy Link Address"
-msgstr "_Kopēt saites adresi"
-
-#: ../Tomboy/Watchers.cs:592
-msgid "_Open Link"
-msgstr "_Atvērt saiti"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Šim sinhronizācijas pielikumam nav atbalsta jūsu datorā. Lūdzu "
-"pārliecinieties, ka jums ir FUSE un {0} pareizi uzinstalēts un nokonfigurēts"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Nevar nolasīt testa failu."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Rakstīšanas tests neizdevās."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Noildze savienojoties ar serveri."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Kļūda savienojoties ar serveri."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "FUSE aktivizēt nav iespējams."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Kļūda savienojumā ar norādīto serveri:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Detaļas"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:126
-msgid "Status"
-msgstr "Statuss"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:236
-msgid "Acquiring sync lock..."
-msgstr "Iegūst sinhronizācijas slēgu..."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:239
-msgid "Committing changes..."
-msgstr "Saskaņo izmaiņas..."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:242
-msgid "Synchronizing Notes"
-msgstr "Sinhronizē piezīmes"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
-msgid "Synchronizing your notes..."
-msgstr "Sinhronizē jūsu piezīmes..."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:244
-msgid "This may take a while, kick back and enjoy!"
-msgstr "Tas var aizņemt kādu brīdi, iedzeriet tēju un izbaudiet!"
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
+msgid "This may take a while, kick back and enjoy!"
+msgstr "Tas var aizņemt kādu brīdi, iedzeriet tēju un izbaudiet!"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
@@ -2555,6 +2341,229 @@ msgstr ""
 "datora ielādes laikā. Pievienojiet \"modprobe fuse\" failā/etc/init.d/boot."
 "local vai \"fuse\" failā /etc/modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Nevar izveidot jaunu piezīmi"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Galvenā izstrāde:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Atbalstītāji:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Raivis Dejus <orvils at gmail.com>\n"
+"Edgars Burmistris <stendec at inbox.lv>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Guntis https://launchpad.net/~guntisg\n"
+"  Mārtiņš Bruņenieks https://launchpad.net/~papuass\n"
+"  Peteris Krisjanis https://launchpad.net/~pecisk-gmail\n"
+"  Raivis Dejus https://launchpad.net/~orvils\n"
+"  karass https://launchpad.net/~kaspars-karass\n"
+"  tm https://launchpad.net/~toms-baugis"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Autortiesības © 2004-2007 Alex Graveley\n"
+"Autortiesības © 2004-2011 Citi\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Vienkārša un viegli lietojama piezīmju programma."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Mājas lapa"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Vienkārša un viegli lietojama piezīmju programma.\n"
+"Autortiesības (C) 2004-2006 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Autortiesības (C) 2004-2011 Citi\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Izmantošana\n"
+"  --version\t\t\tIzdrukā versijas numuru.\n"
+"  --help\t\t\tIzdrukā palīdzības pazinojumu.\n"
+"  --note-path [ceļš]\t\tIelādē/Saglabā piezīmes norādītajā mapē.\n"
+"  --search [teksts]\t\tAtvērt meklēt visās piezīmēs logu ar norādīto "
+"tekstu.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tIzveidot un parādīt jaunu piezīmi.\n"
+"  --new-note [virsraksts]\t\tIzveido jaunu piezīmi ar virsrakstu.\n"
+"  --open-note [virsraksts/url]\tParāda esošo piezīmi, kas atbilst "
+"virsrakstam.\n"
+"  --start-here\t\t\tParāda 'Sākt šeit' piezīmi.\n"
+"  --highlight-search [text]\tMeklē un izceļ tekstu atvērtajā piezīmē.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versija {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (jauna)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "P_ar Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"\"Tomboy piezīmju rokasgrāmata\" nav atrodama.  Lūdzu pārliecinieties, ka "
+"jūsu instalācija ir bijusi veiksmīga."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Palīdzība nav atrasta"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Nevar atvērt norādīto vietu"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Šodien, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Šodien"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Vakar, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Vakar"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Pirms {0} dienas, {1}"
+msgstr[1] "Pirms {0} dienām, {1}"
+msgstr[2] "Pirms {0} dienām, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Pirms {0} dienas"
+msgstr[1] "Pirms {0} dienām"
+msgstr[2] "Pirms {0} dienām"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Rīt, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Rīt"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Pēc {0} dienas, {1}"
+msgstr[1] "Pēc {0} dienām, {1}"
+msgstr[2] "Pēc {0} dienām, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Pēc {0} dienas"
+msgstr[1] "Pēc {0} dienām"
+msgstr[2] "Pēc {0} dienām"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d. MMMM , h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Nav datuma"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "yyyy. gada d. MMMM, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Nenosaukts {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Piezīme ar virsrakstu <b>{0}</b> jau eksistē. Lūdzu, izvēlieties citu "
+"virsrakstu."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Piezīmes virsraksts jau eksistē"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Kopēt saites adresi"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Atvērt saiti"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Patiešām dzēst šo piezīmi?"
+
 #~ msgid "HTML Export Last Directory"
 #~ msgstr "Pēdējās mapes HTML eksportēšana"
 
diff --git a/po/nl.po b/po/nl.po
index aaecba1..ef7897a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,29 +4,31 @@
 #
 # Paul Bolle <pebolle at tiscali.nl>
 # 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–2011
-# Daniel van Eeden <gnomenl at myname.nl>, 2008
 #
 # 200902: Wouter Bolsterlee heeft flink opgeruimd, want dat was gezien het
 # absurd hoge aantal taalfouten meer dan nodig. Bovendien waren veel
 # vertalingen erg krom en voldeden deze niet aan de hoge kwalititeitseisen die
 # we normaal stellen. :)
 #
+# 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–2011.
+# Daniel van Eeden <gnomenl at myname.nl>, 2008.
+# Hannie Dumoleyn <hannie at ubuntu-nl.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Tomboy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-11 22:32+0100\n"
-"PO-Revision-Date: 2011-02-11 22:32+0100\n"
-"Last-Translator: Wouter Bolsterlee <wbolster at gnome.org>\n"
-"Language-Team: Dutch\n"
+"POT-Creation-Date: 2011-09-18 20:25+0200\n"
+"PO-Revision-Date: 2011-09-15 09:46+0200\n"
+"Last-Translator: Hannie Dumoleyn <hannie at ubuntu-nl.org>\n"
+"Language-Team: Dutch <vertaling at vrijschrift.org>\n"
 "Language: \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: Lokalize 1.2\n"
 
 # accesoires/hulpmiddelen/hulpjes
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
@@ -40,7 +42,7 @@ msgstr "Eenvoudig en snel notities maken"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:3
 msgid "Tomboy Applet Factory"
-msgstr "Tomboy-appletfabriek"
+msgstr "Tomboy-appletfactory"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
 #: ../Tomboy/Tray.cs:579
@@ -92,45 +94,52 @@ msgid "Custom Font Face"
 msgstr "Aangepast lettertype"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Bepaalt de x-coördinaat van het zoekvenster; opgeslagen als Tomboy "
-"afgesloten wordt."
+"Bepaalt de x-coördinaat van het venster \"Alle notities doorzoeken\"; "
+"opgeslagen als Tomboy afgesloten wordt."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Bepaalt de y-coördinaat van het zoekvenster; opgeslagen als Tomboy "
-"afgesloten wordt."
+"Bepaalt de y-coördinaat van het venster \"Alle notities doorzoeken\"; "
+"opgeslagen als Tomboy afgesloten wordt."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Bepaalt de hoogte van het zoekvenster (in pixels); opgeslagen als Tomboy "
-"afgesloten wordt."
+"Bepaalt de hoogte van het venster \"Alle notities doorzoeken\" (in pixels); "
+"opgeslagen als Tomboy afgesloten wordt."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Bepaalt de breedte van het zoekvenster (in pixels); opgeslagen als Tomboy "
-"afgesloten wordt."
+"Bepaalt de breedte van het venster \"Alle notities doorzoeken\" (in pixels); "
+"opgeslagen als Tomboy afgesloten wordt."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Automatische opsommingen inschakelen."
-
-#: ../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:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Pictogram in mededelingengebied inschakelen"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "WikiWoord-markering gebruiken"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Automatische opsommingen inschakelen."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Sluiten van notities met Esc inschakelen."
@@ -145,7 +154,7 @@ msgstr "Sneltoetsen gebruiken"
 
 #: ../data/tomboy.schemas.in.h:16
 msgid "Enable spellchecking"
-msgstr "Spellingscontrole gebruiken"
+msgstr "Spellingcontrole gebruiken"
 
 #: ../data/tomboy.schemas.in.h:17
 msgid "Enable startup notes"
@@ -169,7 +178,7 @@ msgid ""
 "paste timestamped content into the Start Here note."
 msgstr ""
 "Schakel deze optie in voor het plakken van inhoud met tijdstip in de ‘Begin "
-"hier’-notitie door met de middelste muisknop op het Tomboy pictogram te "
+"hier’-notitie door met de middelste muisknop op het Tomboy-pictogram te "
 "klikken."
 
 #: ../data/tomboy.schemas.in.h:21
@@ -182,28 +191,24 @@ msgstr ""
 
 #: ../data/tomboy.schemas.in.h:22
 msgid "FUSE Mounting Timeout (ms)"
-msgstr "FUSE-koppelings-timeout (ms)"
+msgstr "FUSE-koppelingstimeout (ms)"
 
 #: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export All Linked Notes"
 msgstr "Alle notities waarnaar verwezen wordt exporteren"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Laatst gebruikte map voor HTML-export"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Notities waarnaar verwezen wordt exporteren"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
-"Indien ingeschakeld, wordt het ‘Notitie verwijderen?’-bevestigingsvenster "
+"Indien uitgeschakeld, wordt het ‘Notitie verwijderen?’-bevestigingsvenster "
 "onderdrukt."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -211,7 +216,7 @@ msgstr ""
 "Als ‘enable_custom_font’ ingeschakeld is, wordt het hier gekozen lettertype "
 "gebruikt voor de notities."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -219,11 +224,11 @@ msgstr ""
 "Indien ingeschakeld zullen alle notities die openstonden toen Tomboy "
 "afgesloten werd, weer geopend worden bij het opstarten."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "Schakel deze optie in voor het sluiten van notities met de Esc-toets."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -233,15 +238,15 @@ msgstr ""
 "Als een andere toepassing de functionaliteit van het pictogram in het "
 "mededelingengebied verzorgt, kan het nuttig zijn dit uit te schakelen."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
 msgstr ""
 "Indien ingeschakeld zullen spelfouten rood worden onderstreept en zullen "
-"door rechts te klikken verbeteringen in een menu verschijnen."
+"door rechts te klikken correctiesuggesties in een menu verschijnen."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -251,7 +256,7 @@ msgstr ""
 "global_keybindings’ actief zijn, zodat vanuit elk programma handige Tomboy-"
 "handelingen verricht kunnen worden."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -260,22 +265,22 @@ msgstr ""
 "worden gebruikt in de notities. Anders wordt het standaardlettertype "
 "gebruikt."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
 msgstr ""
-"Geeft aan dat de plugin voor het importeren van memo's nog niet gebruikt is, "
-"zodat deze automatisch begint na een herstart van Tomboy."
+"Geeft aan dat de plug-in voor het importeren van memo's nog niet gebruikt "
+"is, zodat deze automatisch begint na een herstart van Tomboy."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr ""
 "Getal dat aangeeft hoeveel notities minimaal worden getoond in het menu."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -284,10 +289,10 @@ msgid ""
 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 "
+"opgegeven in minuten. Waarden kleiner dan 1 geven aan dat synchronisatie is "
 "uitgeschakeld. De kleinste geldige positieve waarde is 5."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -296,12 +301,12 @@ msgid ""
 "conflict situation on a case-by-case basis."
 msgstr ""
 "Integer-waarde die aangeeft of er een voorkeur is voor het uitvoeren van een "
-"specifieke actie wanneer een conflict onstaan is, in tegenstelling tot het "
-"vragen aan de gebruiker. Deze waardes komen overeen met een interne "
+"specifieke actie wanneer een conflict ontstaan is, in tegenstelling tot het "
+"vragen aan de gebruiker. Deze waarden komen overeen met een interne "
 "opsomming. ‘0’ betekent dat gebruiker op de hoogte wordt gebracht van "
-"conflicten zodat deze per geval afgehandeld kunnen worden."
+"conflicten, zodat deze per geval afgehandeld kunnen worden."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -318,7 +323,11 @@ msgstr ""
 "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."
+"zodat de verwijzing blijft werken nadat het verwijzingsdoel hernoemd is."
+
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Laatste map gebruikt voor HTML-export"
 
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
@@ -327,14 +336,14 @@ msgstr ""
 
 #: ../data/tomboy.schemas.in.h:40
 msgid "List of pinned notes."
-msgstr "Lijst van vastgepinde notities"
+msgstr "Lijst van vastgepinde notities."
 
 #: ../data/tomboy.schemas.in.h:41
 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 "
+"Het maximum aantal tekens van de notitietitel dat getoond wordt in het "
 "Tomboy-notificatiepictogram of in het menu van het paneel-applet."
 
 #: ../data/tomboy.schemas.in.h:42
@@ -390,20 +399,22 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "Server-url voor SSHFS-synchronisatieserver"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Opgeslagen hoogte van het zoekvenster"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Opgeslagen hoogte van het venster \"Alle notities doorzoeken\""
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Opgeslagen horizontale positie van het zoekvenster"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr ""
+"Opgeslagen horizontale positie van het venster \"Alle notities doorzoeken\""
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Opgeslagen verticale positie van het zoekvenster"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr ""
+"Opgeslagen verticale positie van het venster \"Alle notities doorzoeken\""
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Opgeslagen breedte van het zoekvenster"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Opgeslagen breedte van het venster \"Alle notities doorzoeken\""
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -435,7 +446,7 @@ msgstr "Lokaal pad voor synchronisatie"
 
 #: ../data/tomboy.schemas.in.h:65
 msgid "The date format that is used for the timestamp."
-msgstr "De datum opmaak voor tijdstipweergave."
+msgstr "De datumopmaak voor tijdstipweergave."
 
 #: ../data/tomboy.schemas.in.h:66
 msgid ""
@@ -520,8 +531,8 @@ msgstr "De afhandeling van ‘note://’-URLs"
 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."
+"De laatst gebruikte map voor het opslaan van notities met de HTML-exportplug-"
+"in."
 
 #: ../data/tomboy.schemas.in.h:73
 msgid ""
@@ -529,7 +540,7 @@ msgid ""
 "HTML plugin."
 msgstr ""
 "De laatste gebruikte instelling voor het ‘Notities waarnaar verwezen wordt’-"
-"selectievakje in de HTML-export plugin."
+"selectievakje in de HTML-exportplug-in."
 
 #: ../data/tomboy.schemas.in.h:74
 msgid ""
@@ -539,7 +550,7 @@ msgid ""
 "recursively) should be included during an export to HTML."
 msgstr ""
 "De laatste gebruikte instelling voor het ‘Alle notities waarnaar verwezen "
-"wordt’-selectievakje in de HTML-export plugin. Deze instelling dient "
+"wordt’-selectievakje in de HTML-exportplug-in. Deze instelling dient "
 "gebruikt te worden in combinatie met de instelling van ‘Notities waarnaar "
 "verwezen wordt’ en geeft aan of alle notities (recursief vanaf de huidige "
 "notitie) als HTML geëxporteerd dienen te worden."
@@ -551,8 +562,8 @@ msgid ""
 "accessible by hotkey."
 msgstr ""
 "De URL van de notitie die als ‘Begin hier’-notitie gebruikt wordt. Deze "
-"notitie wordt altijd getoond in het menu en is ook tevens met een sneltoets "
-"te openen."
+"notitie wordt altijd getoond in het menu en is ook met een sneltoets te "
+"openen."
 
 #: ../data/tomboy.schemas.in.h:76
 msgid ""
@@ -568,12 +579,12 @@ msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
 msgstr ""
-"De tijd (in milliseconden) dat Tomboy moet blijven wachten op een antwoord "
+"De tijd (in milliseconden) die 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:78
 msgid "Timestamp format"
-msgstr "Tijdstip opmaak"
+msgstr "Opmaak tijdaanduiding"
 
 #: ../data/tomboy.schemas.in.h:79
 msgid "URL of SSH server containing Tomboy synchronization directory."
@@ -585,15 +596,15 @@ msgid ""
 "addin."
 msgstr ""
 "Unieke identifier voor de momenteel geconfigureerde uitbreiding voor het "
-"sychroniseren van notities."
+"synchroniseren van notities."
 
 #: ../data/tomboy.schemas.in.h:81
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
 msgstr ""
-"Unieke identificatie voor deze Tomboy-client, gebruikt voor de communicatie "
-"met de synchronisatieserver."
+"Unieke identifier voor deze Tomboy-client, gebruikt voor de communicatie met "
+"de synchronisatieserver."
 
 #: ../data/tomboy.schemas.in.h:82
 msgid ""
@@ -606,7 +617,7 @@ msgstr ""
 #: ../data/tomboy.schemas.in.h:83
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr ""
-"Te gebruiken gebruikersnaam voor het verbinden naar de synchroniesatiedienst "
+"Te gebruiken gebruikersnaam voor het verbinden met de synchroniesatiedienst "
 "over SSH."
 
 #: ../data/tomboy.schemas.in.h:84
@@ -645,13 +656,13 @@ msgstr "Ver_wijderen"
 msgid "Delete the selected note"
 msgstr "De geselecteerde notitie verwijderen"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "Sl_uiten"
 
 #: ../Tomboy/ActionManager.cs:143
 msgid "Close this window"
-msgstr "Venster sluiten"
+msgstr "Dit venster sluiten"
 
 #: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
 msgid "_Quit"
@@ -671,7 +682,7 @@ msgstr "Voorkeuren"
 
 #: ../Tomboy/ActionManager.cs:160
 msgid "_Contents"
-msgstr "I_nhoud"
+msgstr "In_houd"
 
 #: ../Tomboy/ActionManager.cs:161
 msgid "Tomboy Help"
@@ -691,7 +702,7 @@ msgstr "Pictogram in mededelingengebied"
 msgid "Create _New Note"
 msgstr "_Nieuwe notitie"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Alle notities doorzoeken"
 
@@ -701,15 +712,28 @@ msgstr "Zoekvenster om alle notities te doorzoeken openen"
 
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
-msgstr "Synchronseren van notities starten"
+msgstr "Synchroniseren van notities starten"
+
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr ""
+"Minimum aantal notities dat in de lijst \"Recent geopend\" getoond wordt "
+"(maximaal 18)"
 
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Wat verwijst hiernaartoe?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
-msgstr "(niets)"
+msgstr "(geen)"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:23
 msgid ""
@@ -718,11 +742,11 @@ msgid ""
 msgstr ""
 "U kunt elke Bugzilla gebruiken door de hyperlinks naar de notities te "
 "verslepen. Wanneer u een speciaal pictogram voor bepaalde hosts wilt "
-"gebruiken kunt u die hier toevoegen."
+"gebruiken, kunt u die hier toevoegen."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
 msgid "Host Name"
-msgstr "Hostnaam:"
+msgstr "Hostnaam"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:58
 msgid "Icon"
@@ -753,7 +777,7 @@ msgstr "Fout bij opslaan van afbeelding"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
 msgid "Could not save the icon file."
-msgstr "Kon pictogrambestand niet opslaan."
+msgstr "Kon afbeeldingsbestand niet opslaan."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
@@ -764,6 +788,29 @@ msgstr "Deze afbeelding echt verwijderen?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Het verwijderen van een afbeelding kan niet ongedaan gemaakt worden."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "E-mail kon niet geopend worden"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+# met destination wordt een doelmap bedoeld
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Doelmap voor de HTML-export"
+
+# gerelateerde/verwante/gelinkte notities
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Notities waarnaar verwezen wordt exporteren"
+
+# gerelateerde/verwante/gelinkte notities
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Alle notities waarnaar verwezen wordt exporteren"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Exporteren naar HTML"
@@ -779,10 +826,14 @@ msgstr "Notitie succesvol geëxporteerd"
 
 # accesoires/hulpmiddelen/hulpjes
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Toegang geweigerd."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Map bestaat niet."
 
@@ -791,25 +842,6 @@ msgstr "Map bestaat niet."
 msgid "Could not save the file \"{0}\""
 msgstr "Kon bestand ‘{0}’ niet opslaan."
 
-# met destination wordt een doelmap bedoeld
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Doelmap voor de HTML-export"
-
-# gerelateerde/verwante/gelinkte notities
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Notities waarnaar verwezen wordt exporteren"
-
-# gerelateerde/verwante/gelinkte notities
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Alle notities waarnaar verwezen wordt exporteren"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "E-mail kon niet geopend worden"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Pad naar map:"
@@ -818,16 +850,16 @@ msgstr "_Pad naar map:"
 msgid "Select Synchronization Folder..."
 msgstr "Synchronisatiemap selecteren…"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Het veld voor het pad naar de map is leeg."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 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:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Lokale map"
 
@@ -857,7 +889,7 @@ msgstr "dddd d MMMM, hh:mm"
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
 msgid "Choose one of the predefined formats or use your own."
-msgstr "Een van de voorgedefinieerde formaten gebruiken, of uw eigen formaat."
+msgstr "Een van de voorgedefinieerde opmaken gebruiken, of uw eigen opmaak."
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
 msgid "Use _Selected Format"
@@ -890,11 +922,11 @@ msgstr "Afspraken"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Wijzig de <span weight=\"bold\">Vandaag: sjabloon</span>-notitie om de tekst "
-"van nieuwe Vandaag-notities aan uw wensen aan te passen."
+"Wijzig de <b>Vandaag: sjabloon</b>-notitie om de tekst van nieuwe Vandaag-"
+"notities aan uw wensen aan te passen."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -919,48 +951,53 @@ msgstr "Pagina {0} van {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd dd MMMM yyyy, hh:mm:ss"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Verbroken verwijzingen verwijderen"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Tekening toevoegen"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rver:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "Gebruikers_naam:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
-msgstr "_Map pad (optioneel):"
+msgstr "_Pad naar Map (optioneel):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
 msgstr ""
-"SSH synchronisatie vereist een bestaande SSH key voor deze server en "
-"gebruiker, toegevoegd aan een actieve SSH daemon."
+"SSH-synchronisatie vereist een bestaande SSH-sleutel voor deze server en "
+"gebruiker, toegevoegd aan een actieve SSH-daemon."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
-msgstr "Server of gebruikersnaam veld is leeg."
+msgstr "Server- of gebruikersnaamveld is leeg."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
 msgstr ""
-"Wachttijd overschreden bij verbinden met de server. Controleer of uw SSH "
-"sleutel is toegevoegd aan een actieve SSH daemon."
+"Wachttijd overschreden bij verbinden met de server. Controleer of uw SSH-"
+"sleutel is toegevoegd aan een actieve SSH-daemon."
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
 msgid "Import from Sticky Notes"
@@ -981,14 +1018,17 @@ msgstr "Importeren van memo's voltooid"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> van de <b>{1}</b> memo's zijn succesvol geïmporteerd."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> van de <b>{1}</b> memo's is succesvol geïmporteerd."
+msgstr[1] "<b>{0}</b> van de <b>{1}</b> memo's zijn succesvol geïmporteerd."
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Memo: "
 
@@ -1013,23 +1053,23 @@ msgstr "— Tasque is niet actief —"
 msgid "_Underline"
 msgstr "_Onderstreept"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
-msgstr "URL-, gebruikersnaam- of wachtwoord-veld is leeg."
+msgstr "Het veld voor de URL, gebruikersnaam of wachtwoord is leeg."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1042,18 +1082,14 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Verbinden met server"
 
@@ -1062,23 +1098,23 @@ 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Server antwoordt niet. Probeer het later opnieuw."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
-msgstr "Autorisatie voor Tomboy Web succesvol"
+msgstr "Autorisatie voor Tomboy Web geslaagd"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1086,22 +1122,122 @@ msgstr ""
 "Keer terug naar het Tomboy-voorkeurenvenster en kies Opslaan om de "
 "synchronisatie te starten."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Stel de standaardbrowser in en probeer opnieuw"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy Web"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Alle notities exporteren naar {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Starten van exporteren van notities naar {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Het geselecteerde notitieboek exporteren naar {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Starten van exporteren van notitieboek naar {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Hulpmiddelen"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exporteren"
+
+# gerelateerde/verwante/gelinkte notities
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Uw notities exporteren."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Alle notities exporteren naar {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Geselecteerd notitieboek exporteren naar {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Alle notities {0} exporteren"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Kon niet exporteren, toegang geweigerd."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Kon niet exporteren, map bestaat niet."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Kon niet exporteren: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Onbekende fout."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Niet opgeborgen notities"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Uw notities zijn geëxporteerd naar ‘{0}’."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Notities succesvol geëxporteerd"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Kon de bestanden niet opslaan in ‘{0}’"
+
+# met destination wordt een doelmap bedoeld
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Doelmap voor exporteren van{0} aanmaken"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Alle notities doorzoeken"
 
@@ -1138,7 +1274,7 @@ msgstr "Een nieuw notitieboek aanmaken"
 
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:25
 msgid "Type the name of the notebook you'd like to create."
-msgstr "Geef de naam van het aan te maken notitietieboek."
+msgstr "Geef de naam van het aan te maken notitieboek."
 
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:31
 msgid "N_otebook name:"
@@ -1154,29 +1290,9 @@ msgstr "Deze naam wordt al gebruikt"
 msgid "C_reate"
 msgstr "_Aanmaken"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} notitieboeksjabloon"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Alle notities"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Niet opgeborgen notities"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
-msgstr "Notitie_boek"
+msgstr "Notitie_boeken"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:69
@@ -1194,11 +1310,11 @@ msgstr "_Nieuwe notitie"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:57
 msgid "Create a new note in this notebook"
-msgstr "Een nieuwe notitie aan in dit notitieboek aanmaken"
+msgstr "Een nieuwe notitie in dit notitieboek aanmaken"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:60
 msgid "_Open Template Note"
-msgstr "Notitiesjabloon openen"
+msgstr "Notitiesjabloon _openen"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:61
 msgid "Open this notebook's template note"
@@ -1213,15 +1329,35 @@ msgid "Delete the selected notebook"
 msgstr "Het geselecteerde notitieboek verwijderen"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Notitieboeken"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} notitieboeksjabloon"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nieuwe notitie"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Alle notities"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Wilt u dit notitieboek echt verwijderen?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1243,34 +1379,40 @@ msgstr "Geen notitieboek"
 msgid "New \"{0}\" Note"
 msgstr "Nieuwe ‘{0}’-notitie"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Deze notitie in een notitieboek plaatsen"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Notitieboek"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "Nieuw notitie_boek…"
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Wilt u deze notitie echt verwijderen?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nieuwe notitie {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Wilt u ‘{0}’ echt verwijderen?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, 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:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Het verwijderen van een notitie kan niet ongedaan gemaakt worden."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1278,16 +1420,16 @@ msgid ""
 "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 "
+"genoeg schijfruimte heeft en dat u de juiste toegangsrechten heeft tot "
 "‘{0}’. Meer details kunt u vinden in ‘{1}’."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 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:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Nieuw notitiesjabloon"
 
@@ -1329,10 +1471,11 @@ msgstr ""
 "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"
+"url>. Mocht u teruggaan naar een oudere versie van Tomboy, dan zal deze daar "
+"naar notities zoeken.\n"
+"\n"
+"Uw notities en instellingen zijn echter gekopieerd naar nieuwe mappen, die "
+"vanaf nu 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:"
@@ -1414,7 +1557,7 @@ msgstr ""
 "bestaande notities wijzen als een notitie wordt hernoemd.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Begin hier"
 
@@ -1422,16 +1565,11 @@ msgstr "Begin hier"
 msgid "Using Links in Tomboy"
 msgstr "Verwijzingen in Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, 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:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
-msgstr "Schrijf hier uw nieuwe notitie."
+msgstr "Beschrijf hier uw nieuwe notitie."
 
 #: ../Tomboy/NoteRenameDialog.cs:50
 msgid "Rename Note Links?"
@@ -1456,7 +1594,7 @@ 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 "
+"Als u de verwijzingen niet hernoemt, zullen deze nergens meer naar toe "
 "verwijzen."
 
 #: ../Tomboy/NoteRenameDialog.cs:83
@@ -1494,144 +1632,169 @@ msgstr "_Nooit verwijzingen hernoemen"
 msgid "Alwa_ys rename links"
 msgstr "_Altijd verwijzingen hernoemen"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "In deze notitie zoeken"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "Naar nieuwe notitie verwij_zen"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_kst"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "In deze notitie _zoeken"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Alle notities sl_uiten"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Notities doorzoeken (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Al uw notities doorzoeken"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Verwijzen"
 
-#: ../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)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "De geselecteerde tekst naar een nieuwe notitie laten verwijzen"
 
 # Hierboven staat ook al een keer Te_xt met een andere mnemonic... gewoon maar
 # hetzelfde houden (Wouter Bolsterlee)
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "Te_kst"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
-msgstr "Eigenschappen van de tekst"
+msgstr "Eigenschappen van tekst instellen"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Hulpmiddelen"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
-msgstr "Hulpmiddelen gebruiken op deze notitie"
+msgstr "Hulpmiddelen gebruiken voor deze notitie"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Deze notitie verwijderen"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Notities synchroniseren"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Deze notitie is een sjabloon-notitie. Deze bepaalt de standaard inhoud van "
+"een gewone notitie en zal niet worden getoond in het notitiemenu of in het "
+"zoekvenster."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Converteren naar een gewone notitie"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "_Afmetingen opslaan"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "S_electie opslaan"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "_Titel opslaan"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Zoeken…"
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "V_olgende zoeken"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Vo_rige zoeken"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Kon notitie niet aanmaken"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Zoeken:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "Vo_rige"
 
 # Hierboven staat ook al een keer Te_xt met een andere mnemonic... gewoon maar
 # hetzelfde houden (Wouter Bolsterlee)
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
-msgstr "Vol_gende"
+msgstr "V_olgende"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Vetgedrukt"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Cursief"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Doorhalen"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
-msgstr "_Oplichten"
+msgstr "_Markeren"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Tekstgrootte"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "_Enorm"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Groot"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Klein"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Grotere tekst"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Kleinere tekst"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Opsomming"
 
@@ -1651,24 +1814,24 @@ msgstr "Synchronisatie"
 msgid "Add-ins"
 msgstr "Uitbreidingen"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "_Spelling controleren tijdens het typen"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr ""
-"Spelfouten worden rood onderstreept. Verbetersuggesties verschijnen in het "
+"Spelfouten worden rood onderstreept. Correctiesuggesties verschijnen in het "
 "contextmenu."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "_WikiWoorden markeren"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1677,31 +1840,31 @@ msgstr ""
 "woord aan te klikken maakt u een nieuwe notitie met die naam."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Automatische _opsommingen inschakelen"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "_Aangepast lettertype gebruiken"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Bij het hernoemen van een notitie waarnaar verwezen wordt:"
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Vragen wat te doen"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Nooit verwijzingen hernoemen"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Altijd verwijzingen hernoemen"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1709,16 +1872,16 @@ msgstr ""
 "Gebruik het nieuwe notitiesjabloon voor het opgeven van de tekst voor nieuwe "
 "notities."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Sjabloon voor nieuwe notities openen"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "_Sneltoetsen gebruiken"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1729,82 +1892,82 @@ msgstr ""
 "N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "_Notitiemenu tonen"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "‘_Begin hier’ openen"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "_Nieuwe notitie"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
-msgstr "Zoekvenster voor _alle notities openen"
+msgstr "Venster ‘_alle notities doorzoeken’ openen"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "_Dienst:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Niet configureerbaar"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 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
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "minuten"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "Ge_avanceerd…"
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "De volgende uitbreidingen zijn geïnstalleerd"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Meer aanvullingen zoeken…"
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Inschakelen"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Uitschakelen"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Niet geïmplementeerd"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0}-voorkeuren"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Notitie-lettertype kiezen"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Overige synchronisatie-instellingen"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1812,23 +1975,23 @@ msgstr ""
 "Als een conflict wordt gevonden tussen de lokale notitie en de notitie op de "
 "synchronisatieserver:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Altijd vragen wat te doen."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Mijn lokale notitie hernoemen."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Lokale notitie vervangen door bijgewerkte versie van de server."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "WAARSCHUWING: Weet u dit zeker?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Weet u het zeker?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1837,322 +2000,128 @@ msgstr ""
 "nodig zijn dat alle notities opnieuw gesynchroniseerd moeten worden wanneer "
 "u nieuwe instellingen opslaat."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Synchronisatie-opties opnieuw instellen"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
-"De geconfigureerde synchronisatieservice is uitgeschakeld. Uw "
-"synchronisatieinstellingen worden nu verwijderd. Het kan nodig zijn dat alle "
-"notities opnieuw gesynchroniseerd moeten worden wanneer u nieuwe "
-"instellingen opslaat."
+"De geconfigureerde synchronisatiedienst is uitgeschakeld. Uw synchronisatie-"
+"instellingen worden nu verwijderd. Het kan nodig zijn dat alle notities "
+"opnieuw gesynchroniseerd moeten worden wanneer u nieuwe instellingen opslaat."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Het is gelukt: u bent verbonden!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Verbinding geslaagd"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomboy is gereed om uw notities te synchroniseren. Wilt u dat nu doen?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Sorry, er is iets misgegaan. Controleer uw instellingen en probeer het "
-"opnieuw. ‘{0}’ kan ook van pas komen."
+"Controleer uw gegevens en probeer het opnieuw. Het logbestand {0} bevat "
+"mogelijk meer informatie over deze fout."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
 msgstr "Fout bij verbinden"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Versie:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Auteur:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Afhankelijkheden van uitbreiding:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Zoeken:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Notitie"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Laatste wijziging"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Resultaten"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Titelovereenkomst"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} resultaat"
 msgstr[1] "{0} resultaten"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Totaal: {0} notitie"
 msgstr[1] "Totaal: {0} notities"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Gevonden: {0} notitie"
 msgstr[1] "Gevonden: {0} notities"
 
-#: ../Tomboy/RecentChanges.cs:696
-msgid "Notes"
-msgstr "Notitie"
-
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Aanmaken van notitie mislukt"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Hoofdontwikkeling:"
-
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Bijdragen van:"
-
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"Wouter Bolsterlee\n"
-"Tino Meinen\n"
-"Daniel van Eeden\n"
-"Sander Brabander\n"
-"Jo Vermeulen\n"
-"Paul Bolle\n"
-"\n"
-"Kijk voor meer informatie op http://nl.gnome.org/"
-
-#: ../Tomboy/Tomboy.cs:410
+#: ../Tomboy/RecentChanges.cs:603
 msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
 msgstr ""
-"Copyright © 2004–2007 Alex Graveley\n"
-"Copyright © 2004–2011 Anderen\n"
+"Geen overeenkomsten gevonden in het geselecteerde notitieboek.\n"
+"Klik hier om alle notities te doorzoeken."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Een eenvoudig en snel notitieboekje."
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Klik hier om alle notitieboeken te doorzoeken"
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Homepage"
+#: ../Tomboy/RecentChanges.cs:775
+msgid "Notes"
+msgstr "Notities"
 
-#: ../Tomboy/Tomboy.cs:540
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
 msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
 msgstr ""
-"Tomboy, een gebruiksvriendelijk notitieboekje.\n"
-"Copyright © 2004–2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
+"Deze synchronisatie-uitbreiding wordt niet ondersteund op uw computer. Zorg "
+"ervoor dat FUSE en {0} juist geïnstalleerd en geconfigureerd zijn."
 
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Gebruik:\n"
-"  --version\t\t\tVersie-informatie tonen\n"
-"  --help\t\t\t\tDeze hulptekst tonen.\n"
-"  --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:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tEen nieuwe notitie aanmaken (en tonen).\n"
-"  --new-note [naam]\t\tEen nieuwe notitie maken met de opgegeven naam.\n"
-"  --open-note [naam/url]\t\tDe notitie met de opgegeven naam openen.\n"
-"  --start-here\t\t\tDe ‘Begin hier’-notitie openen.\n"
-"  --highlight-search [tekst]\tNaar tekst zoeken in de geopende notitie.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versie {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nieuw)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "I_nfo"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"De gebruikershandleiding kon niet gevonden worden. Controleer of uw "
-"installatie correct is."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Hulp niet gevonden"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Locatie kon niet geopend worden"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Vandaag, om {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Vandaag"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Gisteren, om {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Gisteren"
-
-#: ../Tomboy/Utils.cs:249
-#, 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:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} dag geleden"
-msgstr[1] "{0} dagen geleden"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Morgen, om {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Morgen"
-
-#: ../Tomboy/Utils.cs:266
-#, 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:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Over {0} dag"
-msgstr[1] "Over {0} dagen"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, hh:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "MMMM d"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Geen datum"
-
-# Wat doet tt? (Wouter Bolsterlee)
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, hh:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Naamloos {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"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:204
-msgid "Note title taken"
-msgstr "Deze naam is al in gebruik"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "Verwijzing _kopiëren"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "Verwijzing _openen"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Deze synchronisatieuitbreiding wordt niet ondersteund op uw computer. Zorg "
-"ervoor dat FUSE en {0} juist geïnstalleerd en geconfigureerd zijn."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Kon testbestand niet lezen."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Kon testbestand niet lezen."
 
 #: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
 msgid "Write test failed."
@@ -2185,11 +2154,11 @@ msgstr "Status"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:236
 msgid "Acquiring sync lock..."
-msgstr "Synchronisatie-vergrendeling verkrijgen…"
+msgstr "Synchronisatievergrendeling verkrijgen…"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
-msgstr "Veranderingen opslaan…"
+msgstr "Wijzigingen opslaan…"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
@@ -2213,7 +2182,7 @@ msgstr "Verwijderen van notities op de server…"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
-msgstr "Ophalen van nieuwe en veranderde notitities…"
+msgstr "Ophalen van nieuwe en bijgewerkte notities…"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
@@ -2286,7 +2255,7 @@ msgstr "Synchroniseren is afgebroken"
 
 #: ../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."
+msgstr "U heeft de synchronisatie geannuleerd. U kunt het venster nu sluiten."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
@@ -2311,7 +2280,7 @@ msgstr "Service-fout"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
-msgstr "Fout bij verbinden naar synchronisatiedienst. Probeer het nogmaals."
+msgstr "Fout bij verbinden met synchronisatiedienst. Probeer het nogmaals."
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
@@ -2331,7 +2300,7 @@ msgstr "Toegevoegd"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
-msgstr "Veranderingen naar server verstuurd"
+msgstr "Wijzigingen naar server verstuurd"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
@@ -2339,7 +2308,7 @@ msgstr "Nieuwe notitie naar server verstuurd"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
-msgstr "Notitie-conflict"
+msgstr "Notitieconflict"
 
 #. Suggest renaming note by appending " (old)" to the existing title
 #: ../Tomboy/Synchronization/SyncDialog.cs:502
@@ -2348,7 +2317,7 @@ msgstr " (oud)"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
-msgstr "Lokale notitie hernomen:"
+msgstr "Lokale notitie hernoemen:"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
@@ -2376,10 +2345,6 @@ msgstr ""
 "De serverversie ‘{0}’ komt niet overeen met uw lokale notitie. Wat wilt u "
 "doen met uw lokale notitie?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Hulpmiddelen"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2392,7 +2357,7 @@ msgid ""
 "properly and try again."
 msgstr ""
 "De FUSE-module kon niet worden geladen. Controleer of deze juist "
-"geinstalleerd is en probeer opnieuw."
+"geïnstalleerd is en probeer opnieuw."
 
 #: ../Tomboy/Synchronization/SyncUtils.cs:135
 msgid "Enable FUSE?"
@@ -2414,6 +2379,238 @@ msgstr ""
 "starten. Voeg ‘modprobe fuse’ aan /etc/init.d/boot.local toe of ‘fuse’ aan /"
 "etc/modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Aanmaken van notitie mislukt"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Hoofdontwikkeling:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Bijdragen van:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Wouter Bolsterlee\n"
+"Tino Meinen\n"
+"Daniel van Eeden\n"
+"Sander Brabander\n"
+"Jo Vermeulen\n"
+"Paul Bolle\n"
+"\n"
+"Kijk voor meer informatie op http://nl.gnome.org/"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004–2007 Alex Graveley\n"
+"Copyright © 2004–2011 Anderen\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Een eenvoudig en snel notitieboekje."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Homepage"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy, een gebruiksvriendelijk notitieboekje.\n"
+"Copyright © 2004–2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Anderen\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Gebruik:\n"
+"  --version\t\t\tVersie-informatie tonen\n"
+"  --help\t\t\t\tDeze hulptekst tonen.\n"
+"  --note-path [pad]\t\tNotitiegegevens in deze map laden/opslaan.\n"
+"  --search [tekst]\t\tHet venster \"Alle notities doorzoeken\" openen met de "
+"opgegeven tekst.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tEen nieuwe notitie aanmaken (en tonen).\n"
+"  --new-note [naam]\t\tEen nieuwe notitie maken met de opgegeven naam.\n"
+"  --open-note [naam/url]\t\tDe notitie met de opgegeven naam openen.\n"
+"  --start-here\t\t\tDe ‘Begin hier’-notitie openen.\n"
+"  --highlight-search [tekst]\tNaar tekst zoeken in de geopende notitie.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versie {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nieuw)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "I_nfo"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"De gebruikershandleiding kon niet gevonden worden. Controleer of uw "
+"installatie correct is."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Hulp niet gevonden"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Locatie kon niet geopend worden"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Vandaag, om {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Vandaag"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Gisteren, om {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Gisteren"
+
+#: ../Tomboy/Utils.cs:249
+#, 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:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} dag geleden"
+msgstr[1] "{0} dagen geleden"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Morgen, om {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Morgen"
+
+#: ../Tomboy/Utils.cs:266
+#, 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:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Over {0} dag"
+msgstr[1] "Over {0} dagen"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, hh:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "MMMM d"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Geen datum"
+
+# Wat doet tt? (Wouter Bolsterlee)
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, hh:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Naamloos {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"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:204
+msgid "Note title taken"
+msgstr "Deze naam is al in gebruik"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "Verwijzing _kopiëren"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "Verwijzing _openen"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Laatst gebruikte map voor HTML-export"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Wilt u deze notitie echt verwijderen?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Notities doorzoeken (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Het is gelukt: u bent verbonden!"
+
 #~ msgid "_Browse..."
 #~ msgstr "_Zoeken…"
 
diff --git a/po/pl.po b/po/pl.po
index 9e939b8..478fc00 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-11 12:06+0100\n"
-"PO-Revision-Date: 2011-02-11 12:06+0100\n"
+"POT-Creation-Date: 2011-09-08 21:39+0200\n"
+"PO-Revision-Date: 2011-09-08 21:40+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <gnomepl at aviary.pl>\n"
 "Language: pl\n"
@@ -82,45 +82,52 @@ msgid "Custom Font Face"
 msgstr "Własna czcionka"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Określa pionową współrzędną okna wyszukiwania; zachowywane po zakończeniu "
-"programu Tomboy."
+"Określa pionową współrzędną okna \"Przeszukaj wszystkie notatki\"; "
+"zachowywane po zakończeniu programu Tomboy."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Określa poziomą współrzędną okna wyszukiwania; zachowywane po zakończeniu "
-"programu Tomboy."
+"Określa poziomą współrzędną okna \"Przeszukaj wszystkie notatki\"; "
+"zachowywane po zakończeniu programu Tomboy."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Określa wysokość okna wyszukiwania w pikselach; zachowywane po zakończeniu "
-"programu Tomboy."
+"Określa wysokość okna \"Przeszukaj wszystkie notatki\" w pikselach; "
+"zachowywane po zakończeniu programu Tomboy."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Określa szerokość okna wyszukiwania w pikselach; zachowywane po zakończeniu "
-"programu Tomboy."
+"Określa szerokość okna \"Przeszukaj wszystkie notatki\" w pikselach; "
+"zachowywane po zakończeniu programu Tomboy."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Włączenie automatycznego wypunktowania list."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Włączenie wklejania środkowym przyciskiem myszy na ikonie."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Ikona powiadamiania"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Wyróżnianie WikiSłów"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Włączenie automatycznych list wypunktowanych."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Włączenie zamykania notatek klawiszem Escape."
@@ -179,20 +186,16 @@ msgid "HTML Export All Linked Notes"
 msgstr "Eksport HTML wszystkich dowiązanych notatek"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Ostatni katalog eksportu HTML"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Eksport HTML dowiązanych notatek"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Jeśli wyłączone, okno potwierdzenia \"Usunięcie notatki\" zostanie pominięte."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -200,7 +203,7 @@ msgstr ""
 "Jeśli włączone jest enable_custom_font, czcionka ustawiona w tym polu będzie "
 "używana do wyświetlania notatek."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -208,13 +211,13 @@ msgstr ""
 "Jeśli włączone, to wszystkie otwarte przy zamykaniu notatki zostaną przy "
 "następnym uruchomieniu ponownie otwarte."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
 "Jeśli włączone, otwarta notatka może zostać zamknięta naciskając klawisz "
 "Escape."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -224,7 +227,7 @@ msgstr ""
 "wyświetlana w obszarze powiadamiania. Wyłączenie jej może być przydatne, "
 "kiedy inny program dostarcza funkcjonalność ikony powiadamiania."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -233,7 +236,7 @@ msgstr ""
 "czerwono, a podpowiedzi prawidłowej pisowni będą dostępne w menu pod prawym "
 "przyciskiem myszy."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -243,7 +246,7 @@ msgstr ""
 "apps/tomboy/global_keybindings, pozwalając na dostęp do funkcji programu "
 "Tomboy z poziomu dowolnego programu."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -252,7 +255,7 @@ msgstr ""
 "wyświetlania notatek. W przeciwnym wypadku zostanie użyta domyślna czcionka "
 "środowiska."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -261,7 +264,7 @@ msgstr ""
 "związku z czym powinna zostać uruchomiona automatycznie podczas następnego "
 "uruchomienia programu Tomboy."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -269,7 +272,7 @@ msgstr ""
 "Liczba całkowita określająca minimalną liczbę notatek wyświetlanych w menu "
 "programu Tomboy."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -281,7 +284,7 @@ msgstr ""
 "wskazują, że automatyczne synchronizowanie jest wyłączone. Najniższą "
 "akceptowaną dodatnią wartością jest 5. Wartość podawana w minutach."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -293,7 +296,7 @@ msgstr ""
 "wykryciu konfliktu (zamiast pytania użytkownika). Wartość 0 oznacza "
 "proszenie użytkownika o decyzję przy każdym konflikcie."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -312,6 +315,10 @@ msgstr ""
 "odnośniki powinny być aktualizowane do nowej nazwy notatki, co spowoduje "
 "dalsze działanie odnośników do zmienionej notatki."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Ostatnio użyty katalog w eksporcie HTML"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Działanie aktualizowania notatek podczas zmiany nazwy notatki"
@@ -385,20 +392,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "Adres URL serwera synchronizacji SSHFS"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Zapisana wysokość okna wyszukiwania"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Zapisana wysokość okna \"Przeszukaj wszystkie notatki\""
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Zapisane poziome położenie okna wyszukiwania"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Zapisane poziome położenie okna \"Przeszukaj wszystkie notatki\""
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Zapisane pionowe położenie okna wyszukiwania"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Zapisane pionowe położenie okna \"Przeszukaj wszystkie notatki\""
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Zapisana szerokość okna wyszukiwania"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Zapisana szerokość okna \"Przeszukaj wszystkie notatki\""
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -644,7 +651,7 @@ msgstr "_Usuń"
 msgid "Delete the selected note"
 msgstr "Usuwa wybraną notatkę"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Zamknij"
 
@@ -688,7 +695,7 @@ msgstr "Ikona powiadamiania"
 msgid "Create _New Note"
 msgstr "Utwórz _nową notatkę"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "Prze_szukaj notatki"
 
@@ -700,11 +707,23 @@ msgstr "Otwiera okno przeszukiwania wszystkich notatek"
 msgid "Start synchronizing notes"
 msgstr "Uruchamia synchronizację notatek"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr ""
+"Minimalna liczba notatek wyświetlana w liście ostatnich (maksymalnie 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Odnośniki do tej notatki"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(brak)"
 
@@ -758,6 +777,26 @@ msgstr "Na pewno usunąć tę ikonę?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Usunięcie spowoduje bezpowrotną utratę ikony."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Nie można otworzyć wiadomości e-mail"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Miejsce docelowe eksportu HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Eksport dowiązanych notatek"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Dołącz wszystkie inne powiązane notatki"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Wyeksportuj do HTML"
@@ -772,10 +811,14 @@ msgid "Note exported successfully"
 msgstr "Notatka została pomyślnie wyeksportowana"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Brak dostępu."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Katalog nie istnieje."
 
@@ -784,22 +827,6 @@ msgstr "Katalog nie istnieje."
 msgid "Could not save the file \"{0}\""
 msgstr "Nie można zapisać pliku \"{0}\""
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Miejsce docelowe eksportu HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Eksport dowiązanych notatek"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Dołącz wszystkie inne powiązane notatki"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Nie można otworzyć wiadomości e-mail"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "Ścieżka do _katalogu:"
@@ -808,16 +835,16 @@ msgstr "Ścieżka do _katalogu:"
 msgid "Select Synchronization Folder..."
 msgstr "Wybór katalogu synchronizacji..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Pole ścieżki katalogu jest puste."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "Podana ścieżka do katalogu nie istnieje i nie mogła być utworzona."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Katalog lokalny"
 
@@ -880,11 +907,11 @@ msgstr "Spotkania"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
 "Aby zmienić tekst w nowych notatkach Dzisiaj, wystarczy zmienić wzorzec "
-"<span weight=\"bold\">Dzisiaj: Szablon</span>."
+"<b>Dzisiaj: Szablon</b>."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -909,26 +936,31 @@ msgstr "Strona {0} z {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd, d MMMM, H:mm"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Usuwanie błędnych odnośników"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Dodaj szkic"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Ser_wer:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Nazwa użytkownika:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "Ścieżka do _katalogu (opcjonalna):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -936,15 +968,15 @@ msgstr ""
 "Synchronizacja SSH wymaga istniejącego klucza SSH dla tego serwera i klucza, "
 "dodanego do uruchomionej usługi SSH."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Pole serwer lub nazwa użytkownika jest puste."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -971,14 +1003,21 @@ msgstr "Ukończono import notatek"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "Import notatek został ukończony powodzeniem (<b>{0}</b> z <b>{1}</b>)."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] ""
+"Import notatek został ukończony powodzeniem (<b>{0}</b> z <b>{1}</b>)."
+msgstr[1] ""
+"Import notatek został ukończony powodzeniem (<b>{0}</b> z <b>{1}</b>)."
+msgstr[2] ""
+"Import notatek został ukończony powodzeniem (<b>{0}</b> z <b>{1}</b>)."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Notatka: "
 
@@ -1002,23 +1041,23 @@ msgstr "--- Program Tasque jest wyłączony ---"
 msgid "_Underline"
 msgstr "_Podkreślenie"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "Adres _URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "Pole adres URL, nazwa użytkownika lub hasło jest puste."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1031,19 +1070,15 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Zapisanie konfiguracji w bazie kluczy GNOME nie zostało ukończone, wystąpił "
 "następujący komunikat:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Witryna programu Tomboy"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Łączenie z serwerem"
 
@@ -1052,23 +1087,23 @@ msgid "Connected"
 msgstr "Połączono"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Serwer nie odpowiada. Proszę spróbować ponownie."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Upoważnienie się nie powiodło, proszę spróbować ponownie"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Upoważnienie programu Tomboy się powiodło"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1076,25 +1111,123 @@ msgstr ""
 "Proszę wrócić do okna preferencji programu Tomboy i nacisnąć przycisk "
 "Zapisz, aby rozpocząć synchronizowanie."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr ""
 "Połączono. Proszę nacisnąć przycisk Zapisz, aby rozpocząć synchronizowanie"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Upoważnianie w przeglądarce (Proszę nacisnąć, aby ponowić połączenie)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Proszę ustawić domyślną przeglądarkę i spróbować ponownie"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Witryna programu Tomboy"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Eksport wszystkich notatek do {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Rozpocznij eksportowanie notatek do {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Eksport zaznaczonego notatnika do {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Rozpocznij eksportowanie notatnika do {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Narzędzia"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Wyeksportuj"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Eksportuje notatki."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Eksport wszystkich notatek do {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Eksport zaznaczonego notatnika do {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Eksport wszystkich notatek {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Nie można wyeksportować, brak dostępu."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Nie można wyeksportować, katalog nie istnieje."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Nie można wyeksportować: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Nieznany błąd."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Notatki bez kategorii"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Notatki zostały wyeksportowane do \"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Pomyślnie wyeksportowano notatki"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Nie można zapisać plików w \"{0}\""
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Utwórz katalog docelowy do eksportu {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
-msgstr "Przeszukiwanie notatek"
+msgstr "Przeszukiwanie wszystkich notatek"
 
 #. IShellLink new_notebook = CreateShellLink("New Notebook", topmboy_path, "--new-notebook",
 #. icons_path, (int)TomboyIcons.NewNotebook);
@@ -1145,26 +1278,6 @@ msgstr "Nazwa jest już zajęta"
 msgid "C_reate"
 msgstr "_Utwórz"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Szablon notatki {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Wszystkie notatki"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Notatki bez kategorii"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "No_tatniki"
@@ -1204,15 +1317,35 @@ msgid "Delete the selected notebook"
 msgstr "Usuwa zaznaczony notatnik"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Notatniki"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Szablon notatki {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nowa notatka"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Wszystkie notatki"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Na pewno usunąć ten notatnik?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1233,23 +1366,29 @@ msgstr "Brak notatnika"
 msgid "New \"{0}\" Note"
 msgstr "Nowa notatka \"{0}\""
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Umieść tę notatkę w notatniku"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Notatnik"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "Nowy _notatnik..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Ne pewno usunąć tę notatkę?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nowa notatka {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Ne pewno usunąć \"{0}\"?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
@@ -1257,11 +1396,11 @@ msgstr[0] "Ne pewno usunąć tę {0} notatkę?"
 msgstr[1] "Ne pewno usunąć te {0} notatki?"
 msgstr[2] "Ne pewno usunąć tych {0} notatek?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Usunięcie spowoduję bezpowrotną utratę notatki."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1272,13 +1411,13 @@ msgstr ""
 "jest wystarczająca ilość miejsca na dysku i czy użytkownik ma odpowiednie "
 "uprawnienia do katalogu {0}. Szczegóły błędu można znaleźć w pliku {1}."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Wystąpił błąd podczas zapisywania danych notatki."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Wzorzec nowej notatki"
 
@@ -1406,7 +1545,7 @@ msgstr ""
 "content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Start"
 
@@ -1414,14 +1553,9 @@ msgstr "Start"
 msgid "Using Links in Tomboy"
 msgstr "Używanie odnośników"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nowa notatka {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Treść nowej notatki..."
 
@@ -1485,139 +1619,164 @@ msgstr "Bez zmieniania _odnośników w przyszłości"
 msgid "Alwa_ys rename links"
 msgstr "_Stałe zmienianie odnośników"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Znajdź w tej notatce"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "O_dnośnik do nowej notatki"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_kst"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Znajdź w tej notatce"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Za_mknij wszystkie notatki"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Przeszukiwanie notatek (Ctrl+Shift+F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Przeszukiwanie notatek"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Odnośnik"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Tworzy odnośnik do nowej notatki (Ctrl+L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Tworzy odnośnik do nowej notatki"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Tekst"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Ustawia właściwości tekstu"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Narzędzia"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Narzędzia notatki"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Usuwa tę notatkę"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Synchronizacja notatek"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Ta notatka jest szablonem. Określa ona domyślną treść zwykłych notatek, i "
+"nie jest wyświetlana w menu notatek i oknie wyszukiwania."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Zmień na zwykłą notatkę"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "_Zapisz rozmiar"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Zapisz _wybór"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Zapisz _tytuł"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Znajdź..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "_Następne"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Znajdź p_oprzednie"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Nie można utworzyć notatki"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Znajdź:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Poprzednie"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Następne"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Pogrubienie"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "Kursy_wa"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "P_rzekreślenie"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "Wyróżn_ienie"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Rozmiar czcionki"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Zwykły"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "_Ogromny"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Duży"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Mały"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Zwiększenie rozmiaru czcionki"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Zmniejszenie rozmiaru czcionki"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Wypunktowanie"
 
@@ -1638,11 +1797,11 @@ msgstr "Synchronizacja"
 msgid "Add-ins"
 msgstr "Dodatki"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "_Sprawdzanie pisowni podczas pisania"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1651,11 +1810,11 @@ msgstr ""
 "prawidłowej pisowni będą dostępne w menu pod prawym przyciskiem myszy."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "_Wyróżnianie WikiSłów"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1664,31 +1823,31 @@ msgstr ""
 "b>. Kliknięcie takiego słowa utworzy notatkę o takiej właśnie nazwie."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "A_utomatyczne wypunktowanie list"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Własna _czcionka"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Podczas zmieniania nazwy notatki, do której prowadzą odnośniki: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Pytanie co robić"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Bez zmieniania odnośników"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Stałe zmienianie odnośników"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1696,16 +1855,16 @@ msgstr ""
 "Wzorzec nowej notatki pozwala określić domyślną treść dla nowo utworzonych "
 "notatek."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Otwórz wzorzec nowej notatki"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "_Klawisze skrótów"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1716,82 +1875,82 @@ msgstr ""
 "Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Wyświetlanie _menu notatek"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Otwarcie notatki \"_Start\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Utworzenie _nowej notatki"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Otwarcie okna \"_Przeszukiwanie notatek\""
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "_Usługa:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Nie do konfiguracji"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Automatyczn_e synchronizowanie w tle co"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "minut"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "Zaa_wansowane..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Zainstalowano poniższe dodatki"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Więcej dodatków..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Włącz"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "Wyłą_cz"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Niezaimplementowane"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Preferencje: {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Wybór czcionki notatki"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Inne opcje synchronizacji"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1799,23 +1958,23 @@ msgstr ""
 "Kiedy zostanie wykryty konflikt pomiędzy notatką lokalną a notatką na "
 "skonfigurowanym serwerze synchronizacji:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Zawsze pytaj co robić."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Zmień nazwę notatki lokalnej."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Zastąp kopię lokalną aktualizacją z serwera."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "OSTRZEŻENIE: na pewno?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Na pewno?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1823,25 +1982,25 @@ msgstr ""
 "Usunięcie ustawień synchronizacji nie jest zalecane. Może być konieczna "
 "ponowna synchronizacja wszystkich notatek po zapisaniu nowych ustawień."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Usuwanie ustawień synchronizacji"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Skonfigurowana usługa synchronizacji została wyłączona. Ustawienia "
 "synchronizacji zostaną usunięte. Może być konieczna ponowna synchronizacja "
-"wszystkich notatek po zapisaniu nowych ustawień"
+"wszystkich notatek po zapisaniu nowych ustawień."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Sukces - połączono."
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Pomyślnie połączono"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1849,52 +2008,56 @@ msgstr ""
 "Program Tomboy jest gotowy do synchronizacji notatek. Zsynchronizować je "
 "teraz?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Połączenie się nie powiodło. Proszę sprawdzić ustawienia i spróbować "
-"ponownie. Dziennik znajduje się w pliku {0}."
+"Proszę sprawdzić informacje i spróbować ponownie. Plik dziennika {0} może "
+"zawierać więcej informacji o błędzie."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Błąd podczas łączenia."
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Błąd podczas łączenia"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Wersja:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Zależności dodatku:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Szukaj:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Notatka"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Ostatnio zmieniane"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Pasujące"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Dopasowanie tytułu"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
@@ -1902,7 +2065,7 @@ msgstr[0] "{0} dopasowanie"
 msgstr[1] "{0} dopasowania"
 msgstr[2] "{0} dopasowań"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
@@ -1910,7 +2073,7 @@ msgstr[0] "Razem: {0} notatka"
 msgstr[1] "Razem: {0} notatki"
 msgstr[2] "Razem: {0} notatek"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
@@ -1918,252 +2081,59 @@ msgstr[0] "Pasuje: {0} notatka"
 msgstr[1] "Pasują: {0} notatki"
 msgstr[2] "Pasuje: {0} notatek"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Brak wyników w zaznaczonym notatniku.\n"
+"Naciśnięcie tutaj przeszuka wszystkie notatki."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Naciśnięcie tutaj przeszuka wszystkie notatniki"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Notatki"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Nie można utworzyć nowej notatki"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Dodatek synchronizacji nie jest obsługiwany na tym komputerze. Proszę się "
+"upewnić, że programy FUSE i {0} są poprawnie zainstalowane i skonfigurowane"
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Główni programiści:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Nie można odczytać pliku testowego."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Współtwórcy:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Test zapisu się nie powiódł."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr "Aviary.pl <gnomepl at aviary.pl>, 2008, 2009, 2010, 2011"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Przekroczono ograniczenie czasu połączenia z serwerem."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Inni\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Błąd podczas łączenia z serwerem."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Prosty i łatwy w użyciu program do sporządzania notatek."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "Nie można włączyć FUSE."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Strona domowa"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Wystąpił błąd podczas łączenia z podanym serwerem:"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: prosty i łatwy w użyciu program do sporządzania notatek.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Użycie:\n"
-"  --version\t\t\tWypisuje informację o wersji.\n"
-"  --help\t\t\tWyświetla informację o użyciu.\n"
-"  --note-path [ścieżka]\t\tWczytuje/zapisuje dane notatek w podanym "
-"katalogu.\n"
-"  --search [tekst]\t\tOtwiera okno wyszukiwania we wszystkich notatkach z "
-"podaną frazą.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tTworzy i wyświetla nową notatkę.\n"
-"  --new-note [tytuł]\t\tTworzy i wyświetla nową notatkę o podanym tytule.\n"
-"  --open-note [tytuł/url]\tWyświetla istniejącą notatkę o pasującym tytule.\n"
-"  --start-here\t\t\tWyświetla notatkę \"Start\".\n"
-"  --highlight-search [tekst]\tWyszukuje i wyróżnia podany tekst w otwartej "
-"notatce.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Wersja {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nowa)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_O programie Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"\"Podręcznik użytkownika programu Tomboy\" nie został znaleziony. Proszę "
-"sprawdzić, czy instalacja programu się powiodła."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Nie odnaleziono pomocy"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Nie można otworzyć położenia"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Dzisiaj, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Dzisiaj"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Wczoraj, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Wczoraj"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} dzień temu, {1}"
-msgstr[1] "{0} dni temu, {1}"
-msgstr[2] "{0} dni temu, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} dzień temu"
-msgstr[1] "{0} dni temu"
-msgstr[2] "{0} dni temu"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Jutro, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Jutro"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Za {0} dzień, {1}"
-msgstr[1] "Za {0} dni, {1}"
-msgstr[2] "Za {0} dni, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Za {0} dzień"
-msgstr[1] "Za {0} dni"
-msgstr[2] "Za {0} dni"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, H:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Bez daty"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, H:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Bez tytułu {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr "Notatka o tytule <b>{0}</b> już istnieje. Proszę wybrać inną nazwę."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Zapisano tytuł notatki"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "Skopiuj _adres odnośnika"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Otwórz odnośnik"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Dodatek synchronizacji nie jest obsługiwany na tym komputerze. Proszę się "
-"upewnić, że programy FUSE i {0} są poprawnie zainstalowane i skonfigurowane"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Nie można odczytać pliku testowego."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Test zapisu się nie powiódł."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Przekroczono ograniczenie czasu połączenia z serwerem."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Błąd podczas łączenia z serwerem."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "Nie można włączyć FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Wystąpił błąd podczas łączenia z podanym serwerem:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Szczegóły"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Szczegóły"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2363,10 +2333,6 @@ msgstr ""
 "Wersja z serwera notatki \"{0}\" koliduje z lokalną notatką. Co zrobić z "
 "notatką lokalną?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Narzędzia"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2400,3 +2366,211 @@ msgstr ""
 "Aby uniknąć tej wiadomości, należy wczytywać FUSE podczas uruchamiania "
 "systemu. Należy dopisać \"modprobe fuse\" do pliku /etc/init.d/boot.local "
 "lub \"fuse\" do pliku /etc/modules."
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Nie można utworzyć nowej notatki"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Główni programiści:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Współtwórcy:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr "Aviary.pl <gnomepl at aviary.pl>, 2008, 2009, 2010, 2011"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Inni\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Prosty i łatwy w użyciu program do sporządzania notatek."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Strona domowa"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: prosty i łatwy w użyciu program do sporządzania notatek.\n"
+"Copyright (C) 2004-2007 Alex Graveley <alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Inni\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Użycie:\n"
+"  --version\t\t\tWypisuje informację o wersji.\n"
+"  --help\t\t\tWyświetla informację o użyciu.\n"
+"  --note-path [ścieżka]\t\tWczytuje/zapisuje dane notatek w podanym "
+"katalogu.\n"
+"  --search [tekst]\t\tOtwiera okno wyszukiwania we wszystkich notatkach z "
+"podaną frazą.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tTworzy i wyświetla nową notatkę.\n"
+"  --new-note [tytuł]\t\tTworzy i wyświetla nową notatkę o podanym tytule.\n"
+"  --open-note [tytuł/url]\tWyświetla istniejącą notatkę o pasującym tytule.\n"
+"  --start-here\t\t\tWyświetla notatkę \"Start\".\n"
+"  --highlight-search [tekst]\tWyszukuje i wyróżnia podany tekst w otwartej "
+"notatce.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Wersja {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nowa)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_O programie Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"\"Podręcznik użytkownika programu Tomboy\" nie został znaleziony. Proszę "
+"sprawdzić, czy instalacja programu się powiodła."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Nie odnaleziono pomocy"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Nie można otworzyć położenia"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Dzisiaj, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Dzisiaj"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Wczoraj, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Wczoraj"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} dzień temu, {1}"
+msgstr[1] "{0} dni temu, {1}"
+msgstr[2] "{0} dni temu, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} dzień temu"
+msgstr[1] "{0} dni temu"
+msgstr[2] "{0} dni temu"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Jutro, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Jutro"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Za {0} dzień, {1}"
+msgstr[1] "Za {0} dni, {1}"
+msgstr[2] "Za {0} dni, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Za {0} dzień"
+msgstr[1] "Za {0} dni"
+msgstr[2] "Za {0} dni"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, H:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Bez daty"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, H:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Bez tytułu {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr "Notatka o tytule <b>{0}</b> już istnieje. Proszę wybrać inną nazwę."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Zapisano tytuł notatki"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "Skopiuj _adres odnośnika"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Otwórz odnośnik"
diff --git a/po/pt.po b/po/pt.po
index b4addba..a31c0d9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: 3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-12 01:37+0000\n"
-"PO-Revision-Date: 2011-03-12 01:40+0000\n"
+"POT-Creation-Date: 2011-09-10 19:07+0100\n"
+"PO-Revision-Date: 2011-09-10 19:15+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt at hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt at yahoogroups.com>\n"
 "Language: pt\n"
@@ -78,45 +78,52 @@ msgid "Custom Font Face"
 msgstr "Fonte Personalizada"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Determina a coordenada X da janela de Procura; armazenada ao terminar o "
-"Tomboy."
+"Determina a coordenada X da janela \"Procurar Todas as Notas\"; armazenada "
+"ao terminar o Tomboy."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Determina a coordenada Y da janela de Procura; armazenada ao terminar o "
-"Tomboy."
+"Determina a coordenada Y da janela \"Procurar Todas as Notas\"; armazenada "
+"ao terminar o Tomboy."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Determina a altura em pixels da janela de Procura; armazenada ao terminar o "
-"Tomboy."
+"Determina a altura em pixels da janela \"Procurar Todas as Notas\"; armazenada "
+"ao terminar o Tomboy."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Determina a largura em pixels da janela de Procura; armazenada ao terminar o "
-"Tomboy."
+"Determina a largura em pixels da janela \"Procurar Todas as Notas\"; armazenada "
+"ao terminar o Tomboy."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Activar listas por pontos automáticas."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Activar o Clique-do-Meio Cola no Ícone."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Activar o Ícone de Notificação"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Activar realce de palavras Wiki"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Activar listas por pontos automáticas."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Activar o fecho de notas premindo o escape."
@@ -175,21 +182,17 @@ msgid "HTML Export All Linked Notes"
 msgstr "Exportar para HTML Todas as Notas Associadas"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Exportar para HTML o Último Directório"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Exportar para HTML as Notas Associadas"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Se desactivado, o diálogo de confirmação de \"Apagar Nota\" não será "
 "apresentado."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -197,7 +200,7 @@ msgstr ""
 "Se enable_custom_font for \"true\", o nome de fonte aqui definido será "
 "utilizado como a fonte ao apresentar as notas."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -205,11 +208,11 @@ msgstr ""
 "Se activo, todas as notas que se encontravam abertas quando o Tomboy "
 "terminou serão automaticamente reabertas ao iniciar."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "Se activo, uma nota aberta pode ser fechada premindo a tecla escape."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -219,7 +222,7 @@ msgstr ""
 "notificação. Desactivar esta opção poderá ser útil quando outra aplicação "
 "está a disponibilizar a funcionalidade de ícone de notificação."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -227,7 +230,7 @@ msgstr ""
 "Se verdadeiro, erros ortográficos serão sublinhados a vermelho, e sugestões "
 "ortograficamente correctas apresentadas no menu de contexto."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -237,7 +240,7 @@ msgstr ""
 "definidos em /apps/tomboy/global_keybindings estarão activos, permitindo que "
 "uteis acções do Tomboy estejam disponíveis de qualquer aplicação."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -246,7 +249,7 @@ msgstr ""
 "como a fonte ao apresentar as notas. Caso contrário será utilizada a fonte "
 "por omissão da área de trabalho."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -255,7 +258,7 @@ msgstr ""
 "pelo que deverá ser executado automaticamente da próxima vez que o Tomboy "
 "for iniciado."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -263,7 +266,7 @@ msgstr ""
 "Inteiro que determina o número mínimo de notas a apresentar no menu de notas "
 "do Tomboy."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -275,7 +278,7 @@ msgstr ""
 "indica que a sincronização automática está desactivada. O menor valor "
 "positivo aceitável é 5. O valor exprime minutos."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -289,7 +292,7 @@ msgstr ""
 "que o utilizador deseja ser questionado quando ocorre um conflito, para que "
 "possa gerir cada situação caso-a-caso."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -308,6 +311,10 @@ msgstr ""
 "link deverá ser actualizado para o novo nome da nota para que continue a "
 "ligar à nota renomeada."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Último Directório utilizado na Exportação HTML"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Comportamento da Actualização de Links ao Renomear Notas"
@@ -381,20 +388,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "URL do Servidor de Sincronização SSHFS"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Altura gravada da janela de Procura"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Altura gravada da janela \"Procurar Todas as Notas\""
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Posição horizontal gravada da janela de Procura"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Posição horizontal gravada da janela \"Procurar Todas as Notas\""
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Posição vertical gravada da janela de Procura"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Posição vertical gravada da janela \"Procurar Todas as Notas\""
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Largura gravada da janela de Procura"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Largura gravada da janela \"Procurar Todas as Notas\""
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -639,7 +646,7 @@ msgstr "_Apagar"
 msgid "Delete the selected note"
 msgstr "Apagar a nota seleccionada"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Fechar"
 
@@ -683,7 +690,7 @@ msgstr "Ícone de Notificação"
 msgid "Create _New Note"
 msgstr "Criar uma _Nova Nota"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Procurar em Todas as Notas"
 
@@ -695,11 +702,22 @@ msgstr "Abrir a janela de Procurar em Todas as Notas"
 msgid "Start synchronizing notes"
 msgstr "Iniciar a sincronização das notas"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avançado"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Número mínimo de notas a apresentar na lista de Recentes (18 no máximo)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "O que está associado aqui?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(nenhum)"
 
@@ -754,6 +772,26 @@ msgstr "Apagar mesmo este ícone?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Se apagar um ícone, este será definitivamente perdido."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Incapaz de abrir o email"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destino para a Exportação HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Exportar notas associadas"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Incluir todas as outras notas associadas"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Exportar para HTML"
@@ -768,10 +806,14 @@ msgid "Note exported successfully"
 msgstr "Nota exportada com sucesso"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Acesso negado."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Pasta não existe."
 
@@ -780,22 +822,6 @@ msgstr "Pasta não existe."
 msgid "Could not save the file \"{0}\""
 msgstr "Incapaz de gravar o ficheiro \"{0}\""
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destino para a Exportação HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Exportar notas associadas"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Incluir todas as outras notas associadas"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Incapaz de abrir o email"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Caminho da Pasta:"
@@ -804,17 +830,17 @@ msgstr "_Caminho da Pasta:"
 msgid "Select Synchronization Folder..."
 msgstr "Seleccionar a Pasta de Sincronização..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "O campo de caminho da pasta está vazio."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr ""
 "O caminho de pasta especificado não existe e o Tomboy foi incapaz de o criar."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Pasta Local"
 
@@ -877,11 +903,11 @@ msgstr "Compromissos"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Alterar a nota de <span weight=\"bold\">Modelo Hoje:</span> para "
-"personalizar o texto que a nota nova Hoje contém."
+"Alterar a nota de <b>Modelo Hoje:</b> para personalizar o texto que uma nova "
+"nota Hoje contém."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -906,26 +932,31 @@ msgstr "Página {0} de {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd yyyy/MM/dd, HH:mm:ss"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Remover os links inválidos"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Adicionar um esboço"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rvidor:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "Utili_zador:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Caminho da Pasta (opcional):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -933,15 +964,15 @@ msgstr ""
 "A sincronização SSH requer a existência de uma chave SSH para este servidor "
 "e utilizador, adicionada a um daemon SSH que se encontre em execução."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "O campo servidor ou nome de utilizador está vazio."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -968,14 +999,17 @@ msgstr "Terminada a importação das Sticky Notes"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> de <b>{1}</b> Sticky Notes importadas com sucesso."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> de <b>{1}</b> Sticky Note importada com sucesso."
+msgstr[1] "<b>{0}</b> de <b>{1}</b> Sticky Notes importadas com sucesso."
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Sem título"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Sticky Note: "
 
@@ -999,23 +1033,23 @@ msgstr "--- Tasque não se encontra em execução ---"
 msgid "_Underline"
 msgstr "_Sublinhar"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "O campo de URL, nome de utilizador ou senha está vazio."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1028,18 +1062,14 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "A gravação da configuração no chaveiro GNOME falhou com a seguinte mensagem:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Página do Tomboy"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Ligar ao Servidor"
 
@@ -1048,23 +1078,23 @@ msgid "Connected"
 msgstr "Ligado"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Servidor não responde. Tente mais tarde."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "A Autorização Falhou, Tente Novamente"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Autorização Web do Tomboy Com Sucesso"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1072,22 +1102,120 @@ msgstr ""
 "Regresse à janela de Preferências do Tomboy e prima Gravar para iniciar a "
 "sincronização."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Ligado. Prima Gravar para iniciar a sincronização"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Obter autorização no navegador (Prima para reiniciar a ligação)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Defina o navegador por omissão e tente novamente"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Página do Tomboy"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Exportar Todas as Notas para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Iniciar a exportação das notas para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Exportar o livro de notas seleccionado para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Iniciar a exportação do livro de notas para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Ferramentas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exportar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Exportar as suas notas."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Exportar Todas as Notas Para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Exportar o Livro de Notas Seleccionado Para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Exportação para {0} de Todas as Notas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Incapaz de exportar, acesso negado."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Incapaz de exportar, a pasta não existe."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Incapaz de exportar: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Erro desconhecido."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Notas for Arquivar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "As suas notas foram exportadas para \"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Notas exportadas com sucesso"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Incapaz de gravar os ficheiros em \"{0}\""
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Criar a pasta de destino para a exportação {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Procurar em Todas as Notas"
 
@@ -1140,26 +1268,6 @@ msgstr "Nome já utilizado"
 msgid "C_reate"
 msgstr "C_riar"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Modelo do Livro de Notas de {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Todas as Notas"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Notas for Arquivar"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "Li_vros de Notas"
@@ -1199,15 +1307,35 @@ msgid "Delete the selected notebook"
 msgstr "Apagar o livro de notas seleccionado"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Livros de Notas"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Modelo do Livro de Notas de {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nova Nota"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Todas as Notas"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Apagar mesmo este livro de notas?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1228,34 +1356,40 @@ msgstr "Nenhum livro de notas"
 msgid "New \"{0}\" Note"
 msgstr "Nova Nota de \"{0}\""
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Colocar esta nota num livro de notas"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Livro de Notas"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Novo livro de notas..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Apagar mesmo esta nota?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nova Nota {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Apagar mesmo \"{0}\"?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Apagar mesmo esta {0} nota?"
 msgstr[1] "Apagar mesmo estas {0} notas?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Se apagar uma nota, esta será definitivamente perdida."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1266,13 +1400,13 @@ msgstr ""
 "livre suficiente em disco e de que possui as permissões adequadas sobre {0}. "
 "Detalhes do erro poderão ser encontrados em {1}."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Erro ao gravar dados da nota."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Novo Modelo de Nota"
 
@@ -1396,7 +1530,7 @@ msgstr ""
 "automaticamente criada uma associação.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Iniciar Aqui"
 
@@ -1404,14 +1538,9 @@ msgstr "Iniciar Aqui"
 msgid "Using Links in Tomboy"
 msgstr "Utilizar Associações no Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nova Nota {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Descreva aqui a sua nova nota."
 
@@ -1475,139 +1604,164 @@ msgstr "Nunca renomear os _links"
 msgid "Alwa_ys rename links"
 msgstr "Renomear _sempre os links"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Procurar Nesta Nota"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Associação para uma Nova Nota"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_xto"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Procurar Nesta Nota"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Fechar _Todas as Notas"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Procurar"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Procurar nas suas notas (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Procurar nas suas notas"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Atalho"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Associar o texto seleccionado a uma nova nota (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Associar o texto seleccionado a uma nova nota"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Texto"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Definir as propriedades do texto"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "F_erramentas"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Utilizar ferramentas nesta nota"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Apagar esta nota"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Sincronizar as Notas"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Esta nota é um modelo de nota. Determina o conteúdo por omissão de notas "
+"comuns e não irá ser apresentada no menu de notas ou na janela de procura."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Converter em nota comum"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Gravar Taman_ho"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Gravar Se_lecção"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Gravar o _Título"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Procurar..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Procurar a _Seguinte:"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Procurar _Anterior"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Incapaz de criar nota"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Procurar:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Negrito"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Itálico"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "Ri_scar"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Realçar"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Tamanho da Fonte"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "Enor_me"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Grande"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "Pe_quena"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Aumentar o Tamanho da Fonte"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Reduzir o Tamanho da Fonte"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Pontos"
 
@@ -1627,11 +1781,11 @@ msgstr "Sincronização"
 msgid "Add-ins"
 msgstr "Plugins"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "_Verificação ortográfica ao escrever"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1640,11 +1794,11 @@ msgstr ""
 "ortograficamente correctas apresentadas no menu de contexto."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Realçar _PalavrasWiki"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1653,31 +1807,31 @@ msgstr ""
 "na palavra irá criar uma nota com esse nome."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Activar listas por _pontos automáticas"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Utilizar _fonte personalizada"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Ao renomear uma nota linkada: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Perguntar o que fazer"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Nunca renomear os links"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Renomear sempre os links"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1685,16 +1839,16 @@ msgstr ""
 "Utilizar o novo modelo de nota para especificar o texto que deverá ser "
 "utilizado ao criar uma nova nota."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Abrir o Modelo de Nova Nota"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Escutar por _Teclas de Atalho"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1705,82 +1859,82 @@ msgstr ""
 "<b><Control><Shift>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Apresentar o _menu de notas"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Abrir \"_Iniciar Aqui\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Criar uma _nova nota"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Abrir \"Procurar em _Todas as Notas\""
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Ser_viço:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Não é configurável"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Sincronizar Automaticamente em Fundo a _Cada"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "Minutos"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Avançado..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Estão instalados os seguintes plugins"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Obter Mais Add-Ins..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Não Implementado"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Preferências de {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Seleccionar a Fonte da Nota"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Outras Opções de Sincronização"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1788,23 +1942,23 @@ msgstr ""
 "Quando é detectado um conflito entre uma nota local e uma nota no servidor "
 "de sincronização configurado:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Perguntar sempre o que fazer."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Renomear a nota local."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Substituir a nota local pela actualização do servidor."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "AVISO: Tem a certeza?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Tem a certeza?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1813,25 +1967,25 @@ msgstr ""
 "forçado a sincronizar todas as suas notas novamente quando gravar novas "
 "definições."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "A Limpar as Definições de Sincronização"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Desactivou o serviço de sincronização configurado. As suas definições de "
 "sincronização serão agora limpas. Poderá ser forçado a sincronizar novamente "
-"todas as suas notas quando gravar novas definições"
+"todas as suas notas quando gravar novas definições."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Sucesso! Está ligado!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Ligação realizada com sucesso"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1839,317 +1993,129 @@ msgstr ""
 "O Tomboy está pronto a sincronizar as suas notas. Deseja sincronizá-las "
 "agora?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Algo correu mal. Verifique a sua informação e tente novamente. O {0} poderá "
-"conter informação útil."
+"Verifique a sua informação e tente novamente. O ficheiro de registo {0} "
+"poderá conter mais informações sobre o erro."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
 msgstr "Erro ao estabelecer a ligação"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Versão:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Dependências do Plugin:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Procurar:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Nota"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Última Alteração"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Coincidências"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Coincidir o título"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} coincidência"
 msgstr[1] "{0} coincidências"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Total: {0} nota"
 msgstr[1] "Total: {0} notas"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Resultados: {0} nota"
 msgstr[1] "Resultados: {0} notas"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Não foram encontrados resultados no livro de notas seleccionado.\n"
+"Clique aqui para procurar em todas as notas."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Clique aqui para procurar em todos os livros de notas"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Notas"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Incapaz de criar uma nova nota"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Este plugin de sincronização não é suportado pelo seu computador. Certifique-"
+"se de que tem o FUSE e o {0} correctamente instalados e configurados"
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Principais Programadores:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Incapaz de ler o ficheiro de teste."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Colaboradores:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Falha no teste de escrita."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr "Duarte Loreto <happyguy_pt at hotmail.com>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Expirou o tempo se ligar ao servidor."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Outros\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Erro ao se ligar ao servidor."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr ""
-"Uma aplicação simples de utilizar para tomar notas no seu ambiente de "
-"trabalho."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "Incapaz de activar o FUSE."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Página do Projecto"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Ocorreu um erro ao estabelecer ligação com o servidor especificado:"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: Uma aplicação simples para tirar notas no seu ambiente de trabalho.\n"
-"Copyright © 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Utilização:\n"
-"  --version\t\t\tImprimir informação de versão.\n"
-"  --help\t\t\tImprimir esta mensagem de utilização.\n"
-"  --note-path [caminho]\t\tLer/gravar dados de notas neste directório.\n"
-"  --search [text]\t\tAbrir a janela de procurar em todas as notas com o "
-"texto a procurar.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tCriar e apresentar uma nova nota.\n"
-"  --new-note [título]\t\tCriar e apresentar uma nova nota, com um título.\n"
-"  --open-note [título/url]\tApresentar a nota existente cujo título "
-"coincida.\n"
-"  --start-here\t\t\tApresentar a nota 'Iniciar Aqui'.\n"
-"  --highlight-search [texto]\tProcurar e realçar texto na nota aberta.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versão {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (novo)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_Sobre o Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"O \"Manual das Notas Tomboy\" não foi encontrado.  Certifique-se de que a "
-"sua instalação terminou com sucesso."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Não foi encontrada a ajuda"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Incapaz de abrir a localização"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Hoje, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Hoje"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Ontem, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Ontem"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Há {0} dia atrás, {1}"
-msgstr[1] "Há {0} dias atrás, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Há {0} dia atrás"
-msgstr[1] "Há {0} dias atrás"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Amanhã, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Amanhã"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Daqui a {0} dia, {1}"
-msgstr[1] "Daqui a {0} dias, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Daqui a {0} dia"
-msgstr[1] "Daqui a {0} dias"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "MMMM d"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Nenhuma Data"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "MMMM d yyyy, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "MMMM d yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Sem título {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Já existe uma nota com o título <b>{0}</b>. Seleccione outro nome para esta "
-"nota antes de continuar."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "retirado o título da nota"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Copiar o Endereço do Link"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Abrir Link"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Este plugin de sincronização não é suportado pelo seu computador. Certifique-"
-"se de que tem o FUSE e o {0} correctamente instalados e configurados"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Incapaz de ler o ficheiro de teste."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Falha no teste de escrita."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Expirou o tempo se ligar ao servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Erro ao se ligar ao servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "Incapaz de activar o FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Ocorreu um erro ao estabelecer ligação com o servidor especificado:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Detalhes"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Detalhes"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2346,10 +2312,6 @@ msgstr ""
 "A versão no servidor de \"{0}\" está em conflito com a sua nota local. Que "
 "acção deseja realizar com a nota local?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Ferramentas"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2384,6 +2346,232 @@ msgstr ""
 "iniciar. Adicione \"modprobe fuse\" ao ficheiro /etc/init.d/boot.local ou "
 "\"fuse\" a /etc/modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Incapaz de criar uma nova nota"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Principais Programadores:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Colaboradores:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr "Duarte Loreto <happyguy_pt at hotmail.com>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Outros\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr ""
+"Uma aplicação simples de utilizar para tomar notas no seu ambiente de "
+"trabalho."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Página do Projecto"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Uma aplicação simples para tirar notas no seu ambiente de trabalho.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Outros\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Utilização:\n"
+"  --version\t\t\tImprimir informação de versão.\n"
+"  --help\t\t\tImprimir esta mensagem de utilização.\n"
+"  --note-path [caminho]\t\tLer/gravar dados de notas neste directório.\n"
+"  --search [text]\t\tAbrir a janela de procurar em todas as notas com o "
+"texto a procurar.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tCriar e apresentar uma nova nota.\n"
+"  --new-note [título]\t\tCriar e apresentar uma nova nota, com um título.\n"
+"  --open-note [título/url]\tApresentar a nota existente cujo título "
+"coincida.\n"
+"  --start-here\t\t\tApresentar a nota 'Iniciar Aqui'.\n"
+"  --highlight-search [texto]\tProcurar e realçar texto na nota aberta.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versão {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (novo)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Sobre o Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"O \"Manual das Notas Tomboy\" não foi encontrado.  Certifique-se de que a "
+"sua instalação terminou com sucesso."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Não foi encontrada a ajuda"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Incapaz de abrir a localização"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Hoje, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Hoje"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Ontem, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Ontem"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Há {0} dia atrás, {1}"
+msgstr[1] "Há {0} dias atrás, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Há {0} dia atrás"
+msgstr[1] "Há {0} dias atrás"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Amanhã, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Amanhã"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Daqui a {0} dia, {1}"
+msgstr[1] "Daqui a {0} dias, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Daqui a {0} dia"
+msgstr[1] "Daqui a {0} dias"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "MMMM d"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Nenhuma Data"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "MMMM d yyyy, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "MMMM d yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Sem título {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Já existe uma nota com o título <b>{0}</b>. Seleccione outro nome para esta "
+"nota antes de continuar."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "retirado o título da nota"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copiar o Endereço do Link"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Abrir Link"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Exportar para HTML o Último Directório"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Apagar mesmo esta nota?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Procurar nas suas notas (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Sucesso! Está ligado!"
+
 #~ msgid "_Browse..."
 #~ msgstr "_Procurar..."
 
@@ -2633,9 +2821,6 @@ msgstr ""
 #~ msgid "_Search..."
 #~ msgstr "_Procurar..."
 
-#~ msgid "S_earch notes"
-#~ msgstr "_Procurar nas notas"
-
 #~ msgid ""
 #~ "<b>Table of Contents</b> lists all your notes.\n"
 #~ "Double click to open a note."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a451f09..13721be 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,18 +11,20 @@
 # Djavan Fagundes <djavanf at gnome.org>, 2009, 2010.
 # Henrique P Machado <zehrique at gmail.com>, 2009.
 # Gilfran Ribeiro <contato at gilfran.net>, 2010.
+# Antonio Fernandes C. Neto <fernandesn at gnome.org>, 2011.
+#
 # Nota sobre a autoria:
 # Reconheço que a tradução inicial desse pacote não foi feita por mim,
 # Raphael Higino. Como o tradutor original não deixou registrado o seu nome,
 # fica essa nota como reconhecimento ao seu trabalho.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-11 13:36+0000\n"
-"PO-Revision-Date: 2010-09-22 16:30-0200\n"
-"Last-Translator: André Gondim <andregondim at ubuntu.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-09 08:50-0400\n"
+"PO-Revision-Date: 2011-09-08 17:03-0300\n"
+"Last-Translator: Antonio Fernandes C. Neto <fernandesn at gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +32,8 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-Country: Brazil\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -92,48 +96,55 @@ msgid "Custom Font Face"
 msgstr "Fonte personalizada"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Determina a coordenada X da janela \"Pesquisar\"; armazendada na saída do "
-"Tomboy."
+"Determinar a coordenada X da janela \"Pesquisar em todas as notas\"; "
+"armazenar na saída do Tomboy."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Determina a coordenada Y da janela \"Pesquisar\"; armazenada na saída do "
-"Tomboy."
+"Determinar a coordenada Y da janela \"Pesquisar em todas as notas\"; "
+"armazenar na saída do Tomboy."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Determina a altura em pixel da janela \"Pesquisar\"; armazenada na saída do "
-"Tomboy."
+"Determinar a altura em pixel da janela \"Pesquisar em todas as notas\"; "
+"armazenar na saída do Tomboy."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Determina a largura em pixel da janela \"Pesquisar\"; armazenada na saída do "
-"Tomboy."
+"Determinar a largura em pixel da janela \"Pesquisar em todas as notas\"; "
+"armazenar na saída do Tomboy."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Habilita listas marcadas automaticamente."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
-msgstr "Habilita colar com clique de botão do meio no ícone."
+msgstr "Habilitar colar com clique de botão do meio no ícone."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Habilitar ícone da área de notificação"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Habilitar destaque WikiWord"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Habilitar listas com marcadores automaticamente."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
-msgstr "Habilita fechar notas com escape."
+msgstr "Habilitar fechar notas com escape."
 
 #: ../data/tomboy.schemas.in.h:14
 msgid "Enable custom font"
@@ -160,7 +171,7 @@ msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
 msgstr ""
-"Habilite esta opção se você quiser criar listas marcadas automaticamente "
+"Habilitar esta opção se você quiser criar listas com marcadores automaticamente "
 "quando colocar - ou * no começo de uma linha."
 
 #: ../data/tomboy.schemas.in.h:20
@@ -168,7 +179,7 @@ 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 ""
-"Habilite esta opção se você quiser clicar com o botão do meio no ícone do "
+"Habilitar esta opção se você quiser clicar com o botão do meio no ícone do "
 "Tomboy para colar conteúdo com marca de tempo na nota \"Comece Aqui\"."
 
 #: ../data/tomboy.schemas.in.h:21
@@ -176,7 +187,7 @@ msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
 msgstr ""
-"Habilite esta opção para destacar palavras QueSeParecemComEssa. Clicar na "
+"Habilitar esta opção para destacar palavras QueSeParecemComEssa. Clicando na "
 "palavra criará uma nota com aquele nome."
 
 #: ../data/tomboy.schemas.in.h:22
@@ -188,21 +199,17 @@ msgid "HTML Export All Linked Notes"
 msgstr "Exportar para HTML todas as notas vinculadas"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "O último diretório na exportação para HTML"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Exportar para HTML as notas vinculadas"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
-"Se desativado, a caixa de diálogo de confirmação de \"Excluir nota\" será "
-"eliminada."
+"Se desabilitado, a caixa de diálogo de confirmação de \"Excluir nota\" será "
+"supressa."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -210,7 +217,7 @@ msgstr ""
 "Se enable_custom_font for verdadeiro, o nome de fonte definido aqui será "
 "usado como a fonte de exibição das notas."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -218,13 +225,13 @@ msgstr ""
 "Se habilitado, todas as notas que estavam abertas ao sair do Tomboy serão "
 "reabertas automaticamente na inicialização."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
 "Se habilitado, uma nota aberta pode ser fechada ao pressionar a tecla de "
 "escape."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -234,7 +241,7 @@ msgstr ""
 "notificação. Desabilitar isso pode ser útil quando outro aplicativo esteja "
 "fornecendo a funcionalidade de ícone da bandeja."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -242,7 +249,7 @@ msgstr ""
 "Se verdadeiro, erros ortográficos serão sublinhados em vermelho e sugestões "
 "de ortografia serão mostradas no menu de contexto."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -252,7 +259,7 @@ msgstr ""
 "tomboy/global_keybindings serão habilitadas, permitindo que ações úteis do "
 "Tomboy estejam disponíveis a partir de qualquer aplicativo."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -261,7 +268,7 @@ msgstr ""
 "a fonte para exibir notas. Do contrário, a fonte padrão do ambiente será "
 "usada."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -269,7 +276,7 @@ msgstr ""
 "Indica que o Importador do miniaplicativo Notas não foi executado, e que "
 "deve executar automaticamente na próxima vez em que o Tomboy for iniciado."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -277,7 +284,7 @@ msgstr ""
 "Inteiro que determina o número mínimo de notas a serem exibidas no menu de "
 "notas do Tomboy."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -289,7 +296,7 @@ msgstr ""
 "Qualquer valor inferior a 1 indica que a sincronização automática está "
 "desabilitada. O menor valor positivo aceito é 5. O valor é em minutos."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -303,7 +310,7 @@ msgstr ""
 "usuário deseja ser perguntado quando ocorrer um conflito, de forma que ele "
 "possa lidar caso a caso com as situações de conflito."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -322,6 +329,10 @@ msgstr ""
 "atualizado para o nome da nova nota de forma que continuará vinculando à "
 "nota renomeada."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Último diretório usado para exportar HTML"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Comportamento de atualização de link ao renomear nota"
@@ -393,20 +404,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "URL do servidor de sincronização SSHFS"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Altura salva da janela \"Pesquisar\""
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Altura salva da janela \"Pesquisar em todas as notas\""
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Posição horizontal salva da janela \"Pesquisar\""
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Posição horizontal salva da janela \"Pesquisarem todas as notas\""
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Posição vertical salva da janela \"Pesquisar\""
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Posição vertical salva da janela \"Pesquisarem todas as notas\""
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Largura salva da janela \"Pesquisar\""
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Largura salva da janela \"Pesquisarem todas as notas\""
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -650,7 +661,7 @@ msgstr "E_xcluir"
 msgid "Delete the selected note"
 msgstr "Exclui a nota selecionada"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Fechar"
 
@@ -694,23 +705,35 @@ msgstr "Ícone da área de notificação"
 msgid "Create _New Note"
 msgstr "_Criar nova nota"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Pesquisar em todas as notas"
 
 #: ../Tomboy/ActionManager.cs:176
 msgid "Open the Search All Notes window"
-msgstr "Abre a janela \"Pesquisar em todas as notas\""
+msgstr "Abrir a janela \"Pesquisar em todas as notas\""
 
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
-msgstr "Inicia a sincronização de notas"
+msgstr "Iniciar a sincronização de notas"
+
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avançado"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr ""
+"Número mínimo de notas a serem mostradas na lista Recentes (máximo de 18)"
 
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Quais links apontam para cá?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(nenhum)"
 
@@ -764,6 +787,26 @@ msgstr "Remover mesmo esse ícone?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Se você remover um ícone ele estará permanentemente perdido."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Não foi possível abrir e-mail"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destino da Exportação para HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Exportar notas vinculadas"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Incluir todas as notas vinculadas"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Exportar para HTML"
@@ -778,10 +821,14 @@ msgid "Note exported successfully"
 msgstr "Nota exportada com sucesso"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Acesso negado."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Pasta inexistente."
 
@@ -790,22 +837,6 @@ msgstr "Pasta inexistente."
 msgid "Could not save the file \"{0}\""
 msgstr "Não foi possível salvar o arquivo \"{0}\""
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destino da Exportação para HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Exportar notas vinculadas"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Incluir todas as notas vinculadas"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Não foi possível abrir e-mail"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "Caminho da _pasta:"
@@ -814,18 +845,18 @@ msgstr "Caminho da _pasta:"
 msgid "Select Synchronization Folder..."
 msgstr "Selecionar pasta de sincronização..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "O campo de caminho da pasta está vazio."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr ""
 "O caminho da pasta especificada não existe, e o Tomboy não foi capaz de criá-"
 "lo."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Pasta pessoal"
 
@@ -851,7 +882,7 @@ msgstr "Inserir marca de tempo"
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
 #: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
 msgid "dddd, MMMM d, h:mm tt"
-msgstr "dddd, d, MMMM, h:mm"
+msgstr "dddd, d, MMMM, h:mm tt"
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
 msgid "Choose one of the predefined formats or use your own."
@@ -888,11 +919,11 @@ msgstr "Compromissos"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Modificar a nota <span weight=\"bold\">Hoje: Modelo</span> para personalizar "
-"o texto que as novas notas Hoje terão."
+"Modificar a nota <b>Hoje: Modelo</b> para personalizar o texto que as novas "
+"notas Hoje terão."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -915,28 +946,33 @@ msgstr "Página {0} de {1}"
 #. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
 #: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:242
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
-msgstr "dddd dd/MM/yyyy, HH:mm:ss"
+msgstr "dddd dd/MM/yyyy, HH:mm:ss tt"
+
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Remover links quebrados"
 
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Adicionar um esboço"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rvidor:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Nome do usuário:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "Caminho da _pasta (opcional):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -944,15 +980,15 @@ msgstr ""
 "A sincronização de SSH requer uma chave SSH existente para este servidor e "
 "usuário, adicionada a um daemon SSH em execução."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "O campo do servidor ou do nome do usuário está vazio."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -962,7 +998,7 @@ msgstr ""
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
 msgid "Import from Sticky Notes"
-msgstr "Importar do miniaplicativo notas"
+msgstr "Importar das notas"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:133
 msgid "No Sticky Notes found"
@@ -971,22 +1007,26 @@ msgstr "Nenhuma nota localizada"
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
 #, csharp-format
 msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "Nenhum arquivo de nota foi localizado em \"{0}\"."
+msgstr "Nenhum arquivo de notas foi localizado em \"{0}\"."
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
 msgid "Sticky Notes import completed"
-msgstr "Importação do miniaplicativo notas concluída"
+msgstr "Importação de notas concluída"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> de <b>{1}</b> notas importadas com sucesso."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> de <b>{1}</b> nota importada com sucesso."
+msgstr[1] ""
+"<b>{0}</b> de <b>{1}</b> notas importadas com sucesso."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Sem título"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Nota: "
 
@@ -1010,23 +1050,23 @@ msgstr "--- O Tasque não está rodando ---"
 msgid "_Underline"
 msgstr "S_ublinhado"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "O campo da URL, do nome do usuário, ou da senha está vazio."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1039,19 +1079,15 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Falha ao salvar configuração para o chaveiro do GNOME com a seguinte "
 "mensagem:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy Web"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Conectar ao servidor"
 
@@ -1060,23 +1096,23 @@ msgid "Connected"
 msgstr "Conectado"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Servidor não respondendo. Tente novamente depois."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Autorização falhou, tente novamente"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Autorização Web do Tomboy realizada com sucesso"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1084,22 +1120,120 @@ msgstr ""
 "Por favor, volte para a janela de preferências do Tomboy a clique em salvar "
 "para iniciar a sincronização."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Conectado. Clique em salvar para iniciar a sincronização"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Autorizando no navegador (Clique para reiniciar a conexão)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Defina o navegador padrão e tente novamente"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy Web"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Exportar todas as notas para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Inicia a exportação de notas para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Exportar o catálogo selecionado para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Iniciar a exportação do catálogo para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Ferramentas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exportar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Exportar suas notas."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Exportar todas as notas para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Exportar o catálogo selecionado para {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Exportar todas as notas {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Não foi possível exportar, acesso negado."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Não foi possível exportar, pasta inexistente."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Não foi possível exportar: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Erro desconhecido."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Notas não arquivadas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Suas notas foram exportada para \"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Notas exportadas com sucesso"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Não foi possível salvar o arquivo em \"{0}\""
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Criar uma pasta destino para exportação {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Pesquisar em todas as notas"
 
@@ -1152,26 +1286,6 @@ msgstr "Nome já existente"
 msgid "C_reate"
 msgstr "C_riar"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Modelo do catálogo \"{0}\""
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Todas as notas"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Notas não arquivadas"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "Ca_tálogos"
@@ -1211,15 +1325,35 @@ msgid "Delete the selected notebook"
 msgstr "Exclui o catálogo selecionado"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Catálogos"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Modelo do catálogo \"{0}\""
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nova nota"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Todas as notas"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Você deseja mesmo excluir este catálogo?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1240,34 +1374,40 @@ msgstr "Nenhum catálogo"
 msgid "New \"{0}\" Note"
 msgstr "Nova nota \"{0}\""
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Coloca esta nota dentro de um catálogo"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Catálogo"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Novo catálogo..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Você deseja mesmo excluir esta nota?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nova nota \"{0}\""
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Você realmente deseja excluir \"{0}\"?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Você deseja mesmo excluir esta {0} nota?"
 msgstr[1] "Você deseja mesmo excluir estas {0} notas?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Se você excluir uma nota ela estará permanentemente perdida."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1278,13 +1418,13 @@ msgstr ""
 "espaço suficiente em disco e se tem as devidas permissões em {0}. Detalhes "
 "do erro podem ser localizados em {1}."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Erro salvando dados da nota."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Modelo de nova nota"
 
@@ -1373,7 +1513,7 @@ msgstr ""
 "\"Criar nova nota\" a partir do menu de Notas Tomboy no Painel do GNOME. Sua "
 "nota será salva automaticamente.\n"
 "\n"
-"Então organize as notas criadas, conectando notas relacionadas e idéias "
+"Então organize as notas criadas, conectando notas relacionadas e idéas "
 "entre si!\n"
 "\n"
 "Nós criamos uma nota chamada <link:internal>Utilizando links no Tomboy</link:"
@@ -1410,7 +1550,7 @@ msgstr ""
 "será automaticamente estabelecido para você.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Comece aqui"
 
@@ -1418,14 +1558,9 @@ msgstr "Comece aqui"
 msgid "Using Links in Tomboy"
 msgstr "Utilizando links no Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nova nota \"{0}\""
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Descreva sua nova nota aqui."
 
@@ -1489,139 +1624,164 @@ msgstr "Nunca renomear os _links"
 msgid "Alwa_ys rename links"
 msgstr "Sem_pre renomear os links"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Localizar nesta nota"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Link para nova nota"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_xto"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Localizar nesta nota"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "_Fechar todas as notas"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Pesquisa em suas notas (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Pesquisar suas notas"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Link"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Vincula o texto selecionado a uma nova nota (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Vincula o texto selecionado a uma nova nota"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Texto"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Define propriedades do texto"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Ferramentas"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Usa ferramentas nesta nota"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Exclui esta nota"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Sincronizar notas"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Esta nota é um exemplo de nota. Isso determina o conteúdo padrão de notas "
+"regulares, e não será exibido no menu da nota ou na janela de pesquisa."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Converter para nota regular"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Salvar ta_manho"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Salvar seleção"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Salvar _título"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Localizar..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Localizar _próxima"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Localizar _anterior"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Não foi possível criar nota"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Localizar:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "P_róxima"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "N_egrito"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Itálico"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Tachado"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Destacar"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Tamanho da fonte"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "_Enorme"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Grande"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Pequeno"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Aumentar tamanho da fonte"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Diminuir tamanho da fonte"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Marcadores"
 
@@ -1641,11 +1801,11 @@ msgstr "Sincronização"
 msgid "Add-ins"
 msgstr "Plug-ins"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "_Verificação ortográfica ao digitar"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1654,11 +1814,11 @@ msgstr ""
 "ortografia mostradas no menu de contexto."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Destacar _WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1667,31 +1827,31 @@ msgstr ""
 "Clicar na palavra criará uma nota com aquele nome."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Habilitar listas _marcadas automaticamente"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Usar _fonte personalizada"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Quando renomear uma nota vinculada: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Perguntar o que fazer"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Nunca renomear os links"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Sempre renomear os links"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1699,16 +1859,16 @@ msgstr ""
 "Usar o modelo de nova nota para especificar o texto que deve ser usado ao "
 "criar uma nota nota."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Abrir modelo de nova nota"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Capturar t_eclas de atalho"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1719,82 +1879,82 @@ msgstr ""
 "Control><Shift>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Mostrar _menu de notas"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Abrir \"_Comece aqui\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "_Criar nova nota"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Abrir \"Pesquisar em _todas as notas\""
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Ser_viço:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Não configurável"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Sincroni_zar cada um em plano de fundo"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
-msgstr "minutos"
+msgstr "Minutos"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Avançado..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Os seguintes plug-ins estão instalados"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Obter mais complementos..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Desabilitar"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Não implementado"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Preferências de {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Escolha a fonte das notas"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Outras opções de sincronização"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1802,23 +1962,23 @@ msgstr ""
 "Quando um conflito for detectado entre uma nota local e uma nota no servidor "
 "de sincronização configurado:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Sempre me perguntar o que fazer."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Renomear minha nota local."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Substituir minha nota local com a atualização do servidor."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "AVISO: Você tem certeza?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Você tem certeza?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1827,25 +1987,25 @@ msgstr ""
 "forçado a sincronizar todas as suas notas novamente quando salvar "
 "configurações novas."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Restaurando configurações de sincronização"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Você desabilitou o serviço de sincronização configurado. Suas configurações "
 "de sincronização serão apagadas agora. Você pode ser forçado a sincronizar "
-"todas as suas notas novamente quando salvar novas configurações"
+"todas as suas notas novamente quando salvar novas configurações."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Sucesso! Você está conectado!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Conectado com sucesso"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1853,326 +2013,130 @@ msgstr ""
 "O Tomboy está pronto para sincronizar suas notas. Você gostaria de "
 "sincronizá-las agora?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Desculpe, mas alguma coisa deu errada. Por favor verifique suas informações "
-"e tente novamente. O {0} também pode ser útil."
+"Por favor, verifique suas informações e tente novamente. O arquivo de log "
+"{0} pode conter mais informações sobre o erro."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Erro ao conectar :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Erro ao conectar"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Versão:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Dependências do plug-in:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Pesquisar:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Nota"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Última alteração"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Ocorrências"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Título da ocorrência"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} ocorrência"
 msgstr[1] "{0} ocorrências"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Total: {0} nota"
 msgstr[1] "Total: {0} notas"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Ocorrências: {0} nota"
 msgstr[1] "Ocorrências: {0} notas"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Nenhum resultado encontrado no catálogo selecionado.\n"
+"Clique aqui para pesquisar em todos os catálogos."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Clique aqui para pesquisar em todos os catálogos"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Notas"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Não foi possível criar nova nota"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Não há suporte a este plug-in de sincronização no seu computador. Por favor, "
+"certifique-se de que você tem o FUSE e {0} corretamente instalados e "
+"configurados"
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Desenvolvimento principal:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Não foi possível ler o arquivo de teste."
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Contribuições:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Falha no teste de escrita."
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"Tradutor original desconhecido\n"
-"Raphael Higino <In Memoriam>\n"
-"Vinicius Pinheiro <vinnie.gp at gmail.com>\n"
-"Og Maciel <ogmaciel at ubuntu.com>\n"
-"Washington Lins <washington-lins at uol.com.br>\n"
-"Vladimir Melo <vmelo at gnome.org>\n"
-"Fábio Nogueira <deb-user-ba at ubuntu.com>\n"
-"César Veiga <tombs at linuxmail.org>\n"
-"Djavan Fagundes <djavanf at gnome.org>\n"
-"Henrique P Machado <zehrique at gmail.com>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Tempo esgotado ao conectar ao servidor."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Outros\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Erro ao conectar ao servidor."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Um aplicativo para tomar notas simples e fácil de usar."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "Não foi possível habilitar FUSE."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Página inicial"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Ocorreu um erro ao se conectar ao servidor especificado:"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: Um aplicativo para tomar notas, simples e fácil de usar.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Uso:\n"
-"  --version\t\t\tMostra informações sobre a versão.\n"
-"  --help\t\t\tMostra essa mensagem de uso.\n"
-"  --note-path [caminho]\t\tCarrega/armazena dados das notas neste "
-"diretório.\n"
-"  --search [texto]\t\tAbre a janela de pesquisar em todas as notas com o "
-"texto como busca.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tCria e mostra uma nova nota.\n"
-"  --new-note [título]\t\tCria e mostra uma nova nota, com um título.\n"
-"  --open-note [título/url]\tMostra a nota que corresponde ao título.\n"
-"  --start-here\t\t\tMostra a nota 'Comece aqui'.\n"
-"  --highlight-search [texto]\tPesquisa e destaca um texto na nota aberta.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versão {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nova)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_Sobre o Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"O \"Manual de notas do Tomboy\" não foi localizado. Por favor, verifique se "
-"a instalação foi encerrada com sucesso."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Ajuda não localizada"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Não é possível abrir o local"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Hoje, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Hoje"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Ontem, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Ontem"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} dia atrás, {1}"
-msgstr[1] "{0} dias atrás, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} dia atrás"
-msgstr[1] "{0} dias atrás"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Amanhã, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Amanhã"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Em {0} dia, {1}"
-msgstr[1] "Em {0} dias, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Em {0} dia"
-msgstr[1] "Em {0} dias"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d, MMMM, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Sem data"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d, MMMM, yyyy, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Sem título {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Já existe uma nota com o título <b>{0}</b>. Por favor, escolha um outro nome "
-"para esta nota antes de continuar."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Título de nota já existente"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Copiar endereço do link"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Abrir link"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Não há suporte a este plug-in de sincronização no seu computador. Por favor, "
-"certifique-se de que você tem o FUSE e {0} corretamente instalados e "
-"configurados"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Não foi possível ler o arquivo de teste."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Falha no teste de escrita."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Tempo esgotado ao conectar ao servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Erro ao conectar ao servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "Não foi possível habilitar FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Ocorreu um erro ao se conectar ao servidor especificado:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Detalhes"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Detalhes"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2371,10 +2335,6 @@ msgstr ""
 "A versão do servidor de \"{0}\" está em conflito com sua nota local. O que "
 "quer fazer com sua nota local?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Ferramentas"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2409,3 +2369,237 @@ msgstr ""
 "Adicione \"modprobe fuse\" ao /etc/init.d/boot.local ou \"fuse\" ao /etc/"
 "modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Não foi possível criar nova nota"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Desenvolvimento principal:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Contribuições:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Tradutor original desconhecido\n"
+"Raphael Higino <In Memoriam>\n"
+"Vinicius Pinheiro <vinnie.gp at gmail.com>\n"
+"Og Maciel <ogmaciel at ubuntu.com>\n"
+"Washington Lins <washington-lins at uol.com.br>\n"
+"Vladimir Melo <vmelo at gnome.org>\n"
+"Fábio Nogueira <deb-user-ba at ubuntu.com>\n"
+"César Veiga <tombs at linuxmail.org>\n"
+"Djavan Fagundes <djavanf at gnome.org>\n"
+"Henrique P Machado <zehrique at gmail.com>\n"
+"Antonio Fernandes C. Neto <fernandesn at gnome.org>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Outros\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Um aplicativo para tomar notas simples e fácil de usar."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Página inicial"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Um aplicativo para tomar notas, simples e fácil de usar.\n"
+"Copyright (C) 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Outros\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Uso:\n"
+"  --version\t\t\tMostra informações sobre a versão.\n"
+"  --help\t\t\tMostra essa mensagem de uso.\n"
+"  --note-path [caminho]\t\tCarrega/armazena dados das notas neste "
+"diretório.\n"
+"  --search [texto]\t\tAbre a janela de pesquisar em todas as notas com o "
+"texto como busca.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tCria e mostra uma nova nota.\n"
+"  --new-note [título]\t\tCria e mostra uma nova nota, com um título.\n"
+"  --open-note [título/url]\tMostra a nota que corresponde ao título.\n"
+"  --start-here\t\t\tMostra a nota 'Comece aqui'.\n"
+"  --highlight-search [texto]\tPesquisa e destaca um texto na nota aberta.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versão {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nova)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Sobre o Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"O \"Manual de notas do Tomboy\" não foi localizado. Por favor, verifique se "
+"a instalação foi encerrada com sucesso."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Ajuda não localizada"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Não é possível abrir o local"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Hoje, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Hoje"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Ontem, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Ontem"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} dia atrás, {1}"
+msgstr[1] "{0} dias atrás, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} dia atrás"
+msgstr[1] "{0} dias atrás"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Amanhã, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Amanhã"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Em {0} dia, {1}"
+msgstr[1] "Em {0} dias, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Em {0} dia"
+msgstr[1] "Em {0} dias"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d, MMMM, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Sem data"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d, MMMM, yyyy, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Sem título {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Já existe uma nota com o título <b>{0}</b>. Por favor, escolha um outro nome "
+"para esta nota antes de continuar."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Título de nota já existente"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copiar endereço do link"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Abrir link"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "O último diretório na exportação para HTML"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Você deseja mesmo excluir esta nota?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Pesquisa em suas notas (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Sucesso! Você está conectado!"
diff --git a/po/sk.po b/po/sk.po
index 1846ef3..a48a71c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,15 +1,15 @@
 # Slovak translation for tomboy.
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007-2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the tomboy package.
-# Pavol Klačanský <pavol at klacansky.com>, 2007, 2008, 2009, 2010.
+# Pavol Klačanský <pavol at klacansky.com>, 2007-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-11 13:36+0000\n"
-"PO-Revision-Date: 2010-12-27 12:09+0100\n"
+"POT-Creation-Date: 2011-08-30 20:22+0000\n"
+"PO-Revision-Date: 2011-05-03 15:43+0200\n"
 "Last-Translator: Pavol Klačanský <pavol at klacansky.com>\n"
 "Language-Team: Slovak <gnome-sk-list at gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,11 +34,10 @@ msgstr "Vytváracie rozhranie apletu Tomboy"
 msgid "Tomboy Notes"
 msgstr "Tomboy - poznámky"
 
-# PŠ: nevhodne zvolený akcelerátor
 #: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
 #: ../Tomboy/Tray.cs:274
 msgid "S_ynchronize Notes"
-msgstr "S_ynchronizovať poznámky"
+msgstr "_Synchronizovať poznámky"
 
 #: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
@@ -66,64 +65,54 @@ msgstr "Píšte poznámky, spájajte nápady, a zostaňte zorganizovaný"
 msgid "Accept SSL Certificates"
 msgstr "Akceptovať SSL certifikáty"
 
-# PŠ: a čo s tým limitom? Asi vypršal, že?
 #: ../data/tomboy.schemas.in.h:2
 msgid "Automatic Background Synchronization Timeout"
-msgstr "Časový limit pre automatickú synchronizáciu na pozadí"
+msgstr "Časový limit pre automatickú synchronizáciu na pozadí vypršal"
 
 #: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
 msgstr "Vytvoriť novú poznámku"
 
-# PŠ: "druh písma" je presnejšie
 #: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
-msgstr "Vlastný štýl písma"
+msgstr "Vlastný druh písma"
 
-# okna Hľadanie
-# PK: Preco? okno s takym nazvom neexistuje podla mna
-# Peter: Ide o okno Hľadať vo všetkých poznámkach- V originále je termín Search window s veľkým S z toho sa dá usudzovať že ide o názov okna - Vyžiadaj TC
-# * https://bugzilla.gnome.org/show_bug.cgi?id=631000
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Určuje súradnicu X okna hľadania; ukladá sa pri ukončení programu Tomboy."
+"Určuje súradnicu X okna „Hľadať vo všetkých poznámkach“; ukladá sa pri "
+"ukončení programu Tomboy."
 
-# okna Hľadanie
-# PK: Preco? okno s takym nazvom neexistuje podla mna
-# * https://bugzilla.gnome.org/show_bug.cgi?id=631000
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Určuje súradnicu Y okna hľadania; ukladá sa pri ukončení programu Tomboy."
+"Určuje súradnicu Y okna „Hľadať vo všetkých poznámkach“; ukladá sa pri "
+"ukončení programu Tomboy."
 
-# výšku okna Hľadanie v pixeloch
-# PK: Preco? okno s takym nazvom neexistuje podla mna
-# * https://bugzilla.gnome.org/show_bug.cgi?id=631000
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Určuje výšku v pixeloch okna hľadania; ukladá sa pri ukončení programu "
-"Tomboy."
+"Určuje výšku okna „Hľadať vo všetkých poznámkach“ v pixeloch; ukladá sa pri "
+"ukončení programu Tomboy."
 
-# šírku okna Hľadanie v pixeloch
-# PK: Preco? okno s takym nazvom neexistuje podla mna
-# * https://bugzilla.gnome.org/show_bug.cgi?id=631000
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Určuje šírku v pixeloch okna hľadania; ukladá sa pri ukončení programu "
-"Tomboy."
+"Určuje šírku okna „Hľadať vo všetkých poznámkach“ v pixeloch; ukladá sa pri "
+"ukončení programu Tomboy."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Povoliť automaticky odrážkované zoznamy."
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Povoliť vloženie kliknutím prostredného tlačidla na ikonu."
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "Povoliť ikonu v oblasti upozornení"
 
@@ -131,10 +120,16 @@ msgstr "Povoliť ikonu v oblasti upozornení"
 # PK: slova, ktore sa zvyraznia, napr. PavolKlacansky
 # Peter: ja si pod wikislovom predstavujem slovo z wikipedie. Vyžiadaj si  prosím TC
 # * https://bugzilla.gnome.org/show_bug.cgi?id=631002
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Povoliť zvýrazňovanie WikiSlov"
 
+#: ../data/tomboy.schemas.in.h:12
+#, fuzzy
+#| msgid "Enable Auto bulleted lists."
+msgid "Enable automatic bulleted lists."
+msgstr "Povoliť automaticky odrážkované zoznamy."
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "Povoliť zatváranie poznámok klávesom Esc."
@@ -198,30 +193,25 @@ msgid "HTML Export All Linked Notes"
 msgstr "Exportovať do HTML všetky previazané poznámky"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Exportovať do HTML posledný adresár"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "Exportovať do HTML previazané poznámky"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
-"Ak je zakázané, potvrdzovacie dialógové okno \"Odstrániť poznámku\" bude "
+"Ak je zakázané, potvrdzovacie dialógové okno „Odstrániť poznámku“ bude "
 "potlačené."
 
-# PŠ: príliš kostrbatý preklad - skús preformulovať s menším počtom vedľajších viet
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
 msgstr ""
-"Ak je hodnota enable_custom_font nastavená na pravda, tak nastavený názov "
-"písma bude použitý ako písmo, v ktorom sa zobrazia poznámky."
+"Ak je hodnota enable_custom_font nastavená na true, tak tu nastavený názov "
+"písma sa použije pri zobrazovaní poznámok."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -229,13 +219,13 @@ msgstr ""
 "Ak je povolené, tak všetky poznámky, ktoré boli otvorené pri ukončení "
 "programu Tomboy, budú automaticky znovu otvorené pri spustení."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
 "Ak je povolené, tak môže byť otvorená poznámka zatvorená stlačením klávesu "
 "Esc."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -245,7 +235,7 @@ msgstr ""
 "zobrazená v oblasti upozornení. Zakázanie tohto môže byť užitočné, keď iná "
 "aplikácia poskytuje funkčnosť systémovej ikony."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -254,7 +244,7 @@ msgstr ""
 "podčiarknuté a pravopisne správne návrhy budú zobrazené v ponuke, ktorá sa "
 "otvorí po kliknutí pravým tlačidlom."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -264,7 +254,7 @@ msgstr ""
 "tomboy/global_keybindings budú dostupné aj v ostatných aplikáciach, kde "
 "sprístupnia užitočné akcie pre program Tomboy."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -273,7 +263,7 @@ msgstr ""
 "custom_font_face bude použitý ako písmo pri zobrazovaní poznámok. Inak bude "
 "použité písmo pracovného prostredia."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -281,7 +271,7 @@ msgstr ""
 "Indikuje to, že zásuvný modul Importér zo Sticky Notes nebol spustený, mal "
 "by sa spustiť automaticky pri ďalšom štarte programu Tomboy."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -289,7 +279,7 @@ msgstr ""
 "Celé číslo určujúce minimálny počet poznámok, ktoré sa zobrazia v ponuke "
 "poznámok programu Tomboy."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -301,7 +291,7 @@ msgstr ""
 "vyjadruje, že automatická synchronizácia je zakázaná. Najnižšia prijateľná "
 "kladná hodnota je 5. Hodnota je v minútach."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -315,7 +305,7 @@ msgstr ""
 "používateľ pri výskyte konfliktu želá zobraziť výzvu aby mohol rozhodovať v "
 "konfliktnej situácii prípad od prípadu."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -333,6 +323,10 @@ msgstr ""
 "znamená, že text odkazu by mal byť aktualizovaný podľa nového názvu "
 "poznámky, takže bude stále odkazovať na premenovanú poznámku."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr ""
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Spôsob aktualizácie odkazov pri premenovaní poznámky"
@@ -366,6 +360,8 @@ msgstr "Uložené správanie pre konflikt pri synchronizácií poznámok"
 # PK: preco?
 # Mám pocit ze ide o názov okna - Vyziadaj TC
 # * https://bugzilla.gnome.org/show_bug.cgi?id=631007
+# peter: keď je to starý názov tak by to asi mali zmeniť nie?
+# PK: to zavisi od dev, ci to spravia, ja nemam commit access
 #: ../data/tomboy.schemas.in.h:45
 msgid "Open Recent Changes"
 msgstr "Otvoriť nedávne zmeny"
@@ -396,7 +392,7 @@ msgstr "Vzdialený synchronizačný priečinok SSHFS"
 
 #: ../data/tomboy.schemas.in.h:51
 msgid "SSHFS Remote Synchronization User Name"
-msgstr "Použivateľské meno vzdialenej synchronizácie SSHFS"
+msgstr "Používateľské meno vzdialenej synchronizácie SSHFS"
 
 #: ../data/tomboy.schemas.in.h:52
 msgid "SSHFS Synchronization Server Port"
@@ -406,26 +402,21 @@ msgstr "Port servera pre synchronizáciu SSHFS"
 msgid "SSHFS Synchronization Server URL"
 msgstr "URL servera pre synchronizáciu SSHFS"
 
-# okna Hľadanie
-# oprav to prosím všade
-# PK: preco? take okno aj existuje?
-# Peter: opat kapitálka tak podla mna ide o názov okna
-# PK: ale akeho? ked take neexistuje
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Uložená výška okna hľadania"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Uložená výška okna „Hľadať vo všetkých poznámkach“"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Uložená vodorovná pozícia okna hľadania"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Uložená vodorovná pozícia okna „Hľadať vo všetkých poznámkach“"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Uložená zvislá pozícia okna hľadania"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Uložená zvislá pozícia okna „Hľadať vo všetkých poznámkach“"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Uložená šírka okna hľadania"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Uložená šírka okna „Hľadať vo všetkých poznámkach“"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -468,12 +459,12 @@ msgid ""
 "option to the special string \"disabled\", then there will be no keybinding "
 "for this action."
 msgstr ""
-"Globálna klávesová skratkn na vytvorenie a zobrazenie novej poznámky. Formát "
-"vyzerá takto: \"<Control>a\" alebo \"<Shift><Alt>F1\". "
+"Globálna klávesová skratka na vytvorenie a zobrazenie novej poznámky. Formát "
+"vyzerá takto: „<Control>a“ alebo „<Shift><Alt>F1“. "
 "Syntaktický analyzátor je značne tolerantný a povoľuje veľké aj malé "
-"písmená, a tiež skratky ako \"<Ctl>\" a \"<Ctrl>\". Ak nastavíte "
-"možnosť na špeciálny reťazec \"disabled\", tak táto akcia nebude mať "
-"priradenú žiadnu klávesovú skratku."
+"písmená, a tiež skratky ako „<Ctl>“ a „<Ctrl>“. Ak nastavíte "
+"možnosť na špeciálny reťazec „disabled“, tak táto akcia nebude mať priradenú "
+"žiadnu klávesovú skratku."
 
 #: ../data/tomboy.schemas.in.h:67
 msgid ""
@@ -484,12 +475,12 @@ msgid ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 msgstr ""
-"Globálna klávesová skratka na otvorenie poznámky \"Začnite tu\". Formát "
-"vyzerá takto: \"<Control>a\" alebo \"<Shift><Alt>F1\". "
-"Syntaktický analyzátor je značne tolerantný a povoľuje veľké aj malé "
-"písmená, a tiež skratky ako \"<Ctl>\" a \"<Ctrl>\". Ak nastavíte "
-"možnosť na špeciálny reťazec \"disabled\", tak táto akcia nebude mať "
-"priradenú žiadnu klávesovú skratku."
+"Globálna klávesová skratka na otvorenie poznámky „Začnite tu“. Formát vyzerá "
+"takto: „<Control>a“ alebo „<Shift><Alt>F1“. Syntaktický "
+"analyzátor je značne tolerantný a povoľuje veľké aj malé písmená, a tiež "
+"skratky ako „<Ctl>“ a „<Ctrl>“. Ak nastavíte možnosť na "
+"špeciálny reťazec „disabled“, tak táto akcia nebude mať priradenú žiadnu "
+"klávesovú skratku."
 
 #: ../data/tomboy.schemas.in.h:68
 msgid ""
@@ -501,11 +492,11 @@ msgid ""
 "action."
 msgstr ""
 "Globálna klávesová skratka na otvorenie dialógového okna hľadania poznámok. "
-"Formát vyzerá takto \"<Control>a\" alebo \"<Shift><Alt>F1"
-"\". Syntaktický analyzátor je značne tolerantný a povoľuje veľké aj malé "
-"písmená, a tiež skratky ako \"<Ctl>\" a \"<Ctrl>\". Ak nastavíte "
-"možnosť na špeciálny reťazec \"disabled\", tak táto akcia nebude mať "
-"priradenú žiadnu klávesovú skratku."
+"Formát vyzerá takto „<Control>a“ alebo „<Shift><Alt>F1“. "
+"Syntaktický analyzátor je značne tolerantný a povoľuje veľké aj malé "
+"písmená, a tiež skratky ako „<Ctl>“ a „<Ctrl>“. Ak nastavíte "
+"možnosť na špeciálny reťazec „disabled“, tak táto akcia nebude mať priradenú "
+"žiadnu klávesovú skratku."
 
 #: ../data/tomboy.schemas.in.h:69
 msgid ""
@@ -517,10 +508,10 @@ msgid ""
 "for this action."
 msgstr ""
 "Globálna klávesová skratka na otvorenie dialógu Nedávne zmeny.Formát vyzerá "
-"takto \"<Control>a\" alebo \"<Shift><Alt>F1\".Syntaktický "
+"takto „<Control>a“ alebo „<Shift><Alt>F1“.Syntaktický "
 "analyzátor je značne tolerantný a povoľuje veľké aj malé písmená, a tiež "
-"skratky ako \"<Ctl>\" a \"<Ctrl>\", Ak nastavíte možnosť na "
-"špeciálny reťazec \"disabled\", tak táto akcia nebude mať priradenú žiadnu "
+"skratky ako „<Ctl>“ a „<Ctrl>“, Ak nastavíte možnosť na "
+"špeciálny reťazec „disabled“, tak táto akcia nebude mať priradenú žiadnu "
 "klávesovú skratku."
 
 #: ../data/tomboy.schemas.in.h:70
@@ -533,15 +524,15 @@ msgid ""
 "action."
 msgstr ""
 "Globálna klávesová skratka na zobrazenie ponuky apletu Tomboy. Formát vyzerá "
-"takto: \"<Control>a\" alebo \"<Shift><Alt>F1\".Syntaktický "
+"takto: „<Control>a“ alebo „<Shift><Alt>F1“.Syntaktický "
 "analyzátor je značne tolerantný a povoľuje veľké a malé písmená,a zvyčajne "
-"skratky ako \"<Ctl>\" a \"<Ctrl>\", Ak nastavíte možnosť na "
-"špeciálny reťazec \"disabled\", tak tu nebude žiadna klávesová skratka pre "
+"skratky ako „<Ctl>“ a „<Ctrl>“, Ak nastavíte možnosť na "
+"špeciálny reťazec „disabled“, tak tu nebude žiadna klávesová skratka pre "
 "túto akciu."
 
 #: ../data/tomboy.schemas.in.h:71
 msgid "The handler for \"note://\" URLs"
-msgstr "Program na otváranie URL adries v tvare \"note://\""
+msgstr "Program na otváranie URL adries v tvare „note://“"
 
 #: ../data/tomboy.schemas.in.h:72
 msgid ""
@@ -577,9 +568,8 @@ msgid ""
 "which is always placed at the bottom of the Tomboy note menu and also "
 "accessible by hotkey."
 msgstr ""
-"URI poznámky, považovaná za poznámku \"Začnite tu\", ktorá je vždy "
-"umiestnená dole v ponuke programu Tomboy, a tiež prístupná klávesovou "
-"skratkou."
+"URI poznámky, považovaná za poznámku „Začnite tu“, ktorá je vždy umiestnená "
+"dole v ponuke programu Tomboy, a tiež prístupná klávesovou skratkou."
 
 #: ../data/tomboy.schemas.in.h:76
 msgid ""
@@ -628,8 +618,8 @@ msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr ""
-"Použiť voľby \"-ac\" pre wdfs, aby sa SSL certifikáty akceptovali bez "
-"pýtania sa používateľa."
+"Použiť voľby „-ac“ pre wdfs, aby sa SSL certifikáty akceptovali bez opýtania "
+"sa používateľa."
 
 #: ../data/tomboy.schemas.in.h:83
 msgid "User name to use when connecting to the synchronization server via SSH."
@@ -673,7 +663,7 @@ msgstr "O_dstrániť"
 msgid "Delete the selected note"
 msgstr "Odstrániť označenú poznámku"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "Za_vrieť"
 
@@ -717,7 +707,7 @@ msgstr "Ikona v oblasti upozornení"
 msgid "Create _New Note"
 msgstr "Vytvoriť _novú poznámku"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Hľadať vo všetkých poznámkach"
 
@@ -729,11 +719,26 @@ msgstr "Otvoriť okno Hľadať vo všetkých poznámkach"
 msgid "Start synchronizing notes"
 msgstr "Spustiť synchronizáciu poznámok"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+#, fuzzy
+#| msgid "Ad_vanced"
+msgid "Advanced"
+msgstr "_Pokročilé"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+#, fuzzy
+#| msgid "Minimum number of notes to show in menu"
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Minimálny počet poznámok, ktoré sa zobrazia v ponuke"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Čo sem odkazuje?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(nič)"
 
@@ -789,6 +794,26 @@ msgstr "Naozaj odstrániť túto ikonu?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Ak ikonu zmažete, tak bude navždy stratená."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Nedá sa otvoriť email"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr ""
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Cieľ pre HTML export"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Exportovať previazané poznámky"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Zahrnúť všetky ostatné previazané poznámky"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "Exportovať do HTML"
@@ -796,40 +821,28 @@ msgstr "Exportovať do HTML"
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
-msgstr "Vaša poznámka bola vyexportovaná do \"{0}\"."
+msgstr "Vaša poznámka bola vyexportovaná do „{0}“."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
 msgid "Note exported successfully"
 msgstr "Poznámky boli úspešne vyexportované"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Prístup odmietnutý."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Priečinok neexistuje."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
 #, csharp-format
 msgid "Could not save the file \"{0}\""
-msgstr "Nemohol byť uložený súbor \"{0}\""
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Cieľ pre HTML export"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Exportovať previazané poznámky"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Zahrnúť všetky ostatné previazané poznámky"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Nedá sa otvoriť email"
+msgstr "Nemohol byť uložený súbor „{0}“"
 
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
@@ -839,16 +852,16 @@ msgstr "Ces_ta k priečinku:"
 msgid "Select Synchronization Folder..."
 msgstr "Vybrať synchronizačný priečinok..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Cesta k priečinku je prázdna."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "Zadaná cesta k priečinku neexistuje, a Tomboy ju nedokázal vytvoriť."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Miestny priečinok"
 
@@ -909,14 +922,16 @@ msgstr "Úlohy"
 msgid "Appointments"
 msgstr "Schôdzky"
 
-# PŠ: toto hovorí asi o niečom inom
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
+#| msgid ""
+#| "Change the <span weight=\"bold\">Today: Template</span> note to customize "
+#| "the text that new Today notes have."
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Zmeňte poznámku <span weight=\"bold\">Dnes: Šablóna</span> ak si chcete "
-"prispôsobiť text novej poznámky, ktorú dnes vytvoríte."
+"Zmeňte poznámku <b>Dnes: Šablóna</b>, ak si chcete prispôsobiť text, ktorý "
+"budú obsahovať nové poznámky Dnes."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -941,26 +956,33 @@ msgstr "Strana {0}. z {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "hh:mm:ss, dddd dd.MM.yyyy"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+#, fuzzy
+#| msgid "Never rename links"
+msgid "Remove broken links"
+msgstr "Nikdy nepremenovať odkazy"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Pridať náčrt"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rver:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "Používateľské me_no:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "Ces_ta k priečinku (nepovinné):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -968,15 +990,15 @@ msgstr ""
 "SSH synchronizácia vyžaduje existujúci SSH kľúč pre tento server a "
 "používateľa, pridané do bežiaceho SSH démona."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Pole server alebo používateľské meno je prázdne."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -995,23 +1017,30 @@ msgstr "Neboli nájdené žiadne poznámky Sticky Notes"
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
 #, csharp-format
 msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "Nebol nájdený žiadny vhodný súbor pre poznámky Sticky Notes v \"{0}\"."
+msgstr "Nebol nájdený žiadny vhodný súbor pre poznámky Sticky Notes v „{0}“."
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
 msgid "Sticky Notes import completed"
 msgstr "Poznámky zo Sticky Notes boli importované"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
-#, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr ""
+#, fuzzy, csharp-format
+#| msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] ""
+"<b>{0}</b> z <b>{1}</b> poznámok zo Sticky Notes bolo úspešne importovaných."
+msgstr[1] ""
+"<b>{0}</b> z <b>{1}</b> poznámok zo Sticky Notes bolo úspešne importovaných."
+msgstr[2] ""
 "<b>{0}</b> z <b>{1}</b> poznámok zo Sticky Notes bolo úspešne importovaných."
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Nepomenovaná"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Poznámka Sticky Notes:"
 
@@ -1039,23 +1068,23 @@ msgstr "--- Tasque nebeží ---"
 msgid "_Underline"
 msgstr "Podtrhn_uté"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "Pole URL, používateľské meno alebo heslo je prázdne."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1068,18 +1097,14 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Ukladanie nastavení do zväzku kľúčov GNOME zlyhalo s nasledujúcou správou:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Web programu Tomboy"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Pripojiť sa k serveru"
 
@@ -1089,23 +1114,23 @@ msgid "Connected"
 msgstr "Pripojený"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Server neodpovedá. Neskôr to skúste znovu."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Overenie totožnosti zlyhalo, skúste to znovu"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Webové overenie totožnosti pre program Tomboy bolo úspešné"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -1113,24 +1138,141 @@ msgstr ""
 "Prosím, vráťte sa do okna nastavení Tomboy a kliknite na Uložiť, aby sa "
 "začala synchronizácia."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Pripojený. Na začatie synchronizácie kliknite na Uložiť"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr ""
 "Prebieha overenie totožnosti v prehliadači (kliknite pre resetovanie "
 "pripojenia)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Nastavte predvolený prehliadač a skúste to znovu"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Web programu Tomboy"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, fuzzy, csharp-format
+#| msgid "HTML Export All Linked Notes"
+msgid "Export All Notes to {0}"
+msgstr "Exportovať do HTML všetky previazané poznámky"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, fuzzy, csharp-format
+#| msgid "Start synchronizing notes"
+msgid "Start exporting notes to {0}"
+msgstr "Spustiť synchronizáciu poznámok"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, fuzzy, csharp-format
+#| msgid "Delete the selected notebook"
+msgid "Export selected notebook to {0}"
+msgstr "Odstrániť označený zápisník"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr ""
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "Nás_troje"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+#, fuzzy
+#| msgid "Export to HTML"
+msgid "Export"
+msgstr "Exportovať do HTML"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+#, fuzzy
+#| msgid "Export linked notes"
+msgid "Export your notes."
+msgstr "Exportovať previazané poznámky"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, fuzzy, csharp-format
+#| msgid "HTML Export All Linked Notes"
+msgid "Export All Notes To {0}"
+msgstr "Exportovať do HTML všetky previazané poznámky"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr ""
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, fuzzy, csharp-format
+#| msgid "All Notes"
+msgid "All Notes {0} Export"
+msgstr "Všetky poznámky"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+#, fuzzy
+#| msgid "Could not read testfile."
+msgid "Could not export, access denied."
+msgstr "Nepodarilo sa prečítať testovací súbor."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+#, fuzzy
+#| msgid "Folder does not exist."
+msgid "Could not export, folder does not exist."
+msgstr "Priečinok neexistuje."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, fuzzy, csharp-format
+#| msgid "Your note was exported to \"{0}\"."
+msgid "Could not export: {0}"
+msgstr "Vaša poznámka bola vyexportovaná do „{0}“."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr ""
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Nezaradené poznámky"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, fuzzy, csharp-format
+#| msgid "Your note was exported to \"{0}\"."
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Vaša poznámka bola vyexportovaná do „{0}“."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+#, fuzzy
+#| msgid "Note exported successfully"
+msgid "Notes exported successfully"
+msgstr "Poznámky boli úspešne vyexportované"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, fuzzy, csharp-format
+#| msgid "Could not save the file \"{0}\""
+msgid "Could not save the files in \"{0}\""
+msgstr "Nemohol byť uložený súbor „{0}“"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, fuzzy, csharp-format
+#| msgid "Destination for HTML Export"
+msgid "Create destination folder for {0} export"
+msgstr "Cieľ pre HTML export"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Hľadať vo všetkých poznámkach"
 
@@ -1183,26 +1325,6 @@ msgstr "Názov je už zadaný"
 msgid "C_reate"
 msgstr "Vy_tvoriť"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} šablóna zápisníka"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Všetky poznámky"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Nezaradené poznámky"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "Zá_pisníky"
@@ -1242,15 +1364,37 @@ msgid "Delete the selected notebook"
 msgstr "Odstrániť označený zápisník"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Zapisníky"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} šablóna zápisníka"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+#, fuzzy
+#| msgid "_New Note"
+msgid "New Note"
+msgstr "_Nová poznámka"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Všetky poznámky"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Naozaj odstrániť tento zápisník?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1269,25 +1413,33 @@ msgstr "Žiadny zápisník"
 #: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
 #, csharp-format
 msgid "New \"{0}\" Note"
-msgstr "Nová poznámka v \"{0}\""
+msgstr "Nová poznámka v „{0}“"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Vložte túto poznámku do zápisníka"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Zápisník"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Nový zápisník..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Skutočne odstrániť túto poznámku?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nová poznámka {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, fuzzy, csharp-format
+#| msgid "Really delete this {0} note?"
+#| msgid_plural "Really delete these {0} notes?"
+msgid "Really delete \"{0}\"?"
+msgstr "Skutočne odstrániť týchto {0} poznámok?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
@@ -1295,11 +1447,11 @@ msgstr[0] "Skutočne odstrániť týchto {0} poznámok?"
 msgstr[1] "Skutočne odstrániť túto poznámku?"
 msgstr[2] "Skutočne odstrániť tieto {0} poznámky?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Ak odstránite poznámku, bude navždy stratená."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1310,13 +1462,13 @@ msgstr ""
 "máte dostatok miesta na disku, a či máte vhodné práva v {0}. Podrobnosti o "
 "chybe môžete nájsť v {1}."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Chyba pri ukladaní údajov poznámky."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Šablóna novej poznámky"
 
@@ -1399,10 +1551,10 @@ msgstr ""
 "\n"
 "<bold>Vitajte v programe Tomboy!</bold>\n"
 "\n"
-"Poznámku \"Začnite tu\" použite na začiatku organizovania vašich nápadov a "
+"Poznámku „Začnite tu“ použite na začiatku organizovania vašich nápadov a "
 "myšlienok.\n"
 "\n"
-"Pomocou položky \"Vytvoriť novú poznámku\" môžete vytvoriť nové poznámky v "
+"Pomocou položky „Vytvoriť novú poznámku“ môžete vytvoriť nové poznámky v "
 "ponuke poznámok programu Tomboy vo vašom GNOME paneli. Vaša poznámka bude "
 "uložená automaticky.\n"
 "\n"
@@ -1444,7 +1596,7 @@ msgstr ""
 "automaticky previazaná.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Začnite tu"
 
@@ -1452,14 +1604,9 @@ msgstr "Začnite tu"
 msgid "Using Links in Tomboy"
 msgstr "Používanie odkazov v programe Tomboy"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nová poznámka {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Sem napíšte obsah novej poznámky."
 
@@ -1483,8 +1630,8 @@ msgid ""
 "\n"
 "If you do not rename the links, they will no longer link to anything."
 msgstr ""
-"Premenovať odkazy v ostatných poznámkach z \"<span underline=\"single\">{0}</"
-"span>\" na \"<span underline=\"single\">{1}</span>\"?\n"
+"Premenovať odkazy v ostatných poznámkach z „<span underline=\"single\">{0}</"
+"span>“ na „<span underline=\"single\">{1}</span>“?\n"
 "Ak nepremenujete odkazy, tak potom už viac nebudú odkazovať na nič."
 
 #: ../Tomboy/NoteRenameDialog.cs:83
@@ -1522,145 +1669,172 @@ msgstr "_Nikdy nepremenovať odkazy"
 msgid "Alwa_ys rename links"
 msgstr "Vžd_y premenovať odkazy"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Nájsť v tejto poznámke"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "O_dkaz na novú poznámku"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_xt"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Nájsť v tejto poznámke"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Z_avrieť všetky poznámky"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Hľadať vo vašich poznámkach (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+#, fuzzy
+#| msgid "Search All Notes"
+msgid "Search your notes"
+msgstr "Hľadať vo všetkých poznámkach"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Odkaz"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+#, fuzzy
+#| msgid "Link selected text to a new note (Ctrl-L)"
+msgid "Link selected text to a new note"
 msgstr "Vytvoriť novú poznámku odkazujúcu na vybraný text (Ctrl-L)"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Text"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Nastaviť vlastnosti textu"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "Nástr_oje"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Použiť nástroje na tejto poznámke"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Odstrániť túto poznámku"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Synchronizovať poznámky"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+
+#: ../Tomboy/NoteWindow.cs:571
+#, fuzzy
+#| msgid "Connect to Server"
+msgid "Convert to regular note"
+msgstr "Pripojiť sa k serveru"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr ""
+
+#: ../Tomboy/NoteWindow.cs:585
+#, fuzzy
+#| msgid "Select None"
+msgid "Save Se_lection"
+msgstr "Odznačiť všetky"
+
+#: ../Tomboy/NoteWindow.cs:594
+#, fuzzy
+#| msgid "Note Title"
+msgid "Save _Title"
+msgstr "Názov poznámky"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Nájsť..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "_Hľadať ďalšie"
 
-# je tu správny rod?
-# PK: ano
-# Peter: podľa mna next a previou sú opozitá a v preklade ďalej a predchádzajúce nie sú opozitá a podla mna by mali byt ak tam má byť "ďalej" tak tu nemá byť skôr?
-# PK: chcem to takto, je to tak aj inde
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Nájsť pre_dchádzajúce"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Nedá sa vytvoriť poznámka"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Nájsť:"
 
-# je tu správny rod
-# PK: ano, aj v inych programoch je to tak prelozene
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Predchádzajúce"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "Ď_aľšie"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Tučné"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Kurzíva"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "_Preškrtnuté"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Zvýraznené"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Veľkosť písma"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "Normá_lne"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "Ob_rovské"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "V_eľké"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Malé"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Zväčšiť veľkosť písma"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Zmenšiť veľkosť písma"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Odrážky"
 
@@ -1680,11 +1854,11 @@ msgstr "Synchronizácia"
 msgid "Add-ins"
 msgstr "Doplnky"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "Kontrolovať pravopi_s počas písania"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1693,11 +1867,11 @@ msgstr ""
 "kontextovej ponuke."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Zvýrazňovať _WikiSlová"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1706,31 +1880,31 @@ msgstr ""
 "Kliknutím na to slovo vytvoríte poznámku s takým názvom."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Povoliť automaticky o_drážkované zoznamy"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Použiť vlastné písm_o"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Keď sa premenúva previazaná poznámka: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Opýtať sa ma čo spraviť"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Nikdy nepremenovať odkazy"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Vždy premenovať odkazy"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1738,16 +1912,16 @@ msgstr ""
 "Použite šablónu novej poznámky na určenie textu, ktorý by mal byť použitý "
 "pri vytváraní novej poznámky."
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Otvoriť šablónu novej poznámky"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Očakávať klávesové _skratky"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1758,82 +1932,82 @@ msgstr ""
 "Shift>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Zobraziť ponuku k _poznámkam"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
-msgstr "Otvoriť \"_Začnite tu\""
+msgstr "Otvoriť „_Začnite tu“"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Vytvoriť _novú poznámku"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
-msgstr "Otvoriť \"_Hľadať vo všetkých poznámkach\""
+msgstr "Otvoriť „_Hľadať vo všetkých poznámkach“"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Služ_ba:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Nekonfigurovateľné"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Automatick_y synchronizovať na pozadí každých"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "Minút"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Pokročilé..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Nasledujúce doplnky sú nainštalované"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Získať viac doplnkov..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Povoliť"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "Z_akázať"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Nenaimplementované"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Nastavenia {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Zvoľte písmo poznámky"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Ostatné možnosti synchronizácie"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1841,23 +2015,23 @@ msgstr ""
 "Keď je zistený rozpor medzi miestnou poznámkou a poznámkou na nastavenom "
 "synchronizačnom serveri:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Vždy sa opýtať čo spraviť."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Premenovať miestnu poznámku."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Nahradiť miestnu poznámku aktuálnejšou zo servera."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "UPOZORNENIE: Ste si istý?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Ste si istý?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1866,25 +2040,30 @@ msgstr ""
 "znovu vynútiť synchronizáciu všetkých vašich poznámok, keď uložíte nové "
 "nastavenia."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Nulovanie synchronizačných nastavení"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
+#, fuzzy
+#| msgid ""
+#| "You have disabled the configured synchronization service.  Your "
+#| "synchronization settings will now be cleared.  You may be forced to "
+#| "synchronize all of your notes again when you save new settings"
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Zakázali ste nastavený synchronizačný server.  Vaše nastavenia "
 "synchronizácie budú vymazané.  Mali by ste znovu vynútiť synchronizáciu "
 "všetkých vašich poznámok, keď uložíte nové nastavenia"
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Hotovo! Ste pripojený!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Úspešne pripojený"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1892,52 +2071,56 @@ msgstr ""
 "Tomboy je pripravený na synchronizáciu vašich poznámok. Prajete si ich "
 "synchronizovať teraz?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Prepáčte, ale niečo bolo nesprávne.  Skontrolujte, prosím, vami zadané "
-"informácie a skúste to znovu.  Nápomocný by mohol byť tiež {0}."
+"Skontrolujte, prosím, vami zadané informácie a skúste to znovu. Súbor so "
+"záznamom {0} by mal obsahovať viac informácií o chybe."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Chyba pri pripájaní :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Chyba pri pripájaní"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Verzia:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Autorské práva:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Závislosti doplnku"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_Hľadať:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Poznámka"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Naposledy zmenené"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Zhody"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Zhoda v názve"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
@@ -1945,7 +2128,7 @@ msgstr[0] "{0} zhôd"
 msgstr[1] "{0} zhoda"
 msgstr[2] "{0} zhody"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
@@ -1953,7 +2136,7 @@ msgstr[0] "Spolu: {0} poznámok"
 msgstr[1] "Spolu: {0} poznámka"
 msgstr[2] "Spolu: {0} poznámky"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
@@ -1961,231 +2144,28 @@ msgstr[0] "Zhoduje sa: {0} poznámok"
 msgstr[1] "Zhoduje sa: {0} poznámka"
 msgstr[2] "Zhodujú sa: {0} poznámky"
 
-#: ../Tomboy/RecentChanges.cs:696
-msgid "Notes"
-msgstr "Poznámky"
-
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Nie je možné vytvoriť novú poznámku"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Primárny vývoj:"
-
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Prispievatelia:"
-
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr "Pavol Klačanský <pavol at klacansky.com>"
-
-#: ../Tomboy/Tomboy.cs:410
+#: ../Tomboy/RecentChanges.cs:603
 msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
 msgstr ""
-"Autorské právo © 2004-2007 Alex Graveley\n"
-"Autorské právo © 2004-2010 ostatní\n"
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
 msgstr ""
-"Jednoduchá a ľahko používateľná\n"
-"aplikácia na vytváranie poznámok na pracovnej ploche."
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Domovská stránka"
+#: ../Tomboy/RecentChanges.cs:775
+msgid "Notes"
+msgstr "Poznámky"
 
-#: ../Tomboy/Tomboy.cs:540
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
 msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
 msgstr ""
-"Tomboy: Jednoduchá, ľahko používateľná aplikácia na prácu s poznámkami.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Použitie:\n"
-"  --version\t\t\tZobraziť informácie o verzii.\n"
-"  --help\t\t\tZobraziť túto správu o používaní.\n"
-"  --note-path [cesta k adresáru]\t\tNahrať/uskladniť údaje poznámok v tomto "
-"adresári.\n"
-"  --search [text]\t\tOtvoriť okno hľadania vo všetkých poznámkach s textom "
-"na hľadanie.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tVytvoriť a zobraziť novú poznámku.\n"
-"  --new-note [názov]\t\tVytvoriť a zobraziť novú poznámku s názvom.\n"
-"  --open-note [názov/url]\tZobraziť existujúcu poznámku zodpovedajúcu "
-"názvu.\n"
-"  --start-here\t\t\tZobraziť poznámku 'Začnite tu'.\n"
-"  --highlight-search [text]\tHľadať a zvýrazniť text v otvorenej poznámke.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Verzia {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nová)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_O programe Tomboy"
-
-# príručka k porgramu Tomboy (-poznámky)
-# tu som to myslel tak ze Tomboy - poznámky alebo iba Tomboy a dal by som príručku ... sa nepodarilo nájsť
-# PK: takto sa mi to zda najlepsie
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"Príručku k programu \"Tomboy - poznámky\" sa nepodarilo nájsť. Skontrolujte, "
-"prosím, či bola inštalácia úspešne dokončená."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Pomocník nebol nájdený"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Nedá sa otvoriť umiestnenie"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Dnes, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Dnes"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Včera, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Včera"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Pred {0} dňami, {1}"
-msgstr[1] "Včera, {1}"
-msgstr[2] "Pred {0} dňami, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Pred {0} dňami"
-msgstr[1] "Včera"
-msgstr[2] "Pred {0} dňami"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Zajtra, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Zajtra"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "O {0} dní, {1}"
-msgstr[1] "O {0} deň, {1}"
-msgstr[2] "O {0} dni, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "O {0} dní"
-msgstr[1] "O {0} deň"
-msgstr[2] "O {0} dni"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "hh:mm, d. MMMM"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d. MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Žiadny dátum"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "hh:mm, d. MMMM yyyy"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d. MMMM yyyy"
-
-# je tu správny rod?
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Nepomenované {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Poznámka s názvom <b>{0}</b> už existuje. Pred pokračovaním vyberte, prosím, "
-"iný názov pre túto poznámku."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Zadaný názov poznámky"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Kopírovať adresu odkazu"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Otvoriť odkaz"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Tento synchronizačný doplnok nie je na vašom počítači podporovaný. Preverte, "
-"prosím, či máte správne nainštalované a nastavené FUSE a {0}"
+"Tento synchronizačný doplnok nie je na vašom počítači podporovaný. Preverte, "
+"prosím, či máte správne nainštalované a nastavené FUSE a {0}"
 
 #: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
 msgid "Could not read testfile."
@@ -2415,12 +2395,8 @@ msgid ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
 "want to do with your local note?"
 msgstr ""
-"Verzia na serveri \"{0}\" je v rozpore s miestnou poznámkou. Čo chcete "
-"spraviť s miestnou poznámkou?"
-
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "Nás_troje"
+"Verzia na serveri „{0}“ je v rozpore s miestnou poznámkou. Čo chcete spraviť "
+"s miestnou poznámkou?"
 
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
@@ -2453,5 +2429,235 @@ msgstr ""
 "Vami zvolená ynchronizácia vyžaduje, aby ste mali nahratý modul FUSE.\n"
 "\n"
 "Ak nechcete dostávať túto výzvu, mali by ste pri štarte nahrať FUSE. "
-"Pridajte \"modprobe fuse\" do /etc/init.d/boot.local alebo \"fuse\" do /etc/"
+"Pridajte „modprobe fuse“ do /etc/init.d/boot.local alebo „fuse“ do /etc/"
 "modules."
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Nie je možné vytvoriť novú poznámku"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Primárny vývoj:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Prispievatelia:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr "Pavol Klačanský <pavol at klacansky.com>"
+
+#: ../Tomboy/Tomboy.cs:424
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2004-2007 Alex Graveley\n"
+#| "Copyright © 2004-2010 Others\n"
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Autorské právo © 2004-2007 Alex Graveley\n"
+"Autorské právo © 2004-2010 ostatní\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr ""
+"Jednoduchá a ľahko používateľná\n"
+"aplikácia na vytváranie poznámok na pracovnej ploche."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Domovská stránka"
+
+#: ../Tomboy/Tomboy.cs:554
+#, fuzzy
+#| msgid ""
+#| "Tomboy: A simple, easy to use desktop note-taking application.\n"
+#| "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+#| "\n"
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Jednoduchá, ľahko používateľná aplikácia na prácu s poznámkami.\n"
+"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Použitie:\n"
+"  --version\t\t\tZobraziť informácie o verzii.\n"
+"  --help\t\t\tZobraziť túto správu o používaní.\n"
+"  --note-path [cesta k adresáru]\t\tNahrať/uskladniť údaje poznámok v tomto "
+"adresári.\n"
+"  --search [text]\t\tOtvoriť okno hľadania vo všetkých poznámkach s textom "
+"na hľadanie.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tVytvoriť a zobraziť novú poznámku.\n"
+"  --new-note [názov]\t\tVytvoriť a zobraziť novú poznámku s názvom.\n"
+"  --open-note [názov/url]\tZobraziť existujúcu poznámku zodpovedajúcu "
+"názvu.\n"
+"  --start-here\t\t\tZobraziť poznámku 'Začnite tu'.\n"
+"  --highlight-search [text]\tHľadať a zvýrazniť text v otvorenej poznámke.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Verzia {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nová)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_O programe Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"Príručku k programu „Tomboy - poznámky“ sa nepodarilo nájsť. Skontrolujte, "
+"prosím, či bola inštalácia úspešne dokončená."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Pomocník nebol nájdený"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Nedá sa otvoriť umiestnenie"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Dnes, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Dnes"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Včera, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Včera"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Pred {0} dňami, {1}"
+msgstr[1] "Včera, {1}"
+msgstr[2] "Pred {0} dňami, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Pred {0} dňami"
+msgstr[1] "Včera"
+msgstr[2] "Pred {0} dňami"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Zajtra, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Zajtra"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "O {0} dní, {1}"
+msgstr[1] "O {0} deň, {1}"
+msgstr[2] "O {0} dni, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "O {0} dní"
+msgstr[1] "O {0} deň"
+msgstr[2] "O {0} dni"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "hh:mm, d. MMMM"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d. MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Žiadny dátum"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "hh:mm, d. MMMM yyyy"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d. MMMM yyyy"
+
+# poznámka
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Nepomenovaná {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Poznámka s názvom <b>{0}</b> už existuje. Pred pokračovaním vyberte, prosím, "
+"iný názov pre túto poznámku."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Zadaný názov poznámky"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Kopírovať adresu odkazu"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Otvoriť odkaz"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Exportovať do HTML posledný adresár"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Skutočne odstrániť túto poznámku?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Hľadať vo vašich poznámkach (Ctrl-Shift-F)"
diff --git a/po/sl.po b/po/sl.po
index a4f2813..d0080b2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-07-13 19:01+0000\n"
-"PO-Revision-Date: 2011-07-14 08:10+0100\n"
+"POT-Creation-Date: 2011-09-07 15:47+0000\n"
+"PO-Revision-Date: 2011-09-07 19:23+0100\n"
 "Last-Translator: Matej Urbančič <mateju at svn.gnome.org>\n"
 "Language-Team: Slovenian <gnome-si at googlegroups.com>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\\n\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: Slovenia\n"
@@ -438,7 +438,7 @@ msgid "Delete the selected note"
 msgstr "Izbriše izbrano sporočilce"
 
 #: ../Tomboy/ActionManager.cs:142
-#: ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Zapri"
 
@@ -486,7 +486,7 @@ msgid "Create _New Note"
 msgstr "Ustvari _novo sporočilce"
 
 #: ../Tomboy/ActionManager.cs:175
-#: ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Išči v vseh sporočilcih"
 
@@ -620,15 +620,15 @@ msgstr "_Pot mape:"
 msgid "Select Synchronization Folder..."
 msgstr "Izbor mape usklajevanja ..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Polje poti mape je prazno."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "Navedena pot mape ne obstaja. Program Tomboy je ne more ustvariti."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Krajevna mapa"
 
@@ -726,34 +726,34 @@ msgstr "Odstrani pokvarjene povezave"
 msgid "Add a sketch"
 msgstr "Dodajanje shem"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "_Strežnik:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "Uporab_niško ime:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Pot do mape (izbirno):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid "SSH synchronization requires an existing SSH key for this server and user, added to a running SSH daemon."
 msgstr "Usklajevanje SSH zahteva obstoječ ključ SSH za ta strežnik in uporabnika dodanega k zagnanemu ozadnjem programu SSH."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Polje strežnika ali pa uporabniškega imena je prazno."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
 msgid "SSH"
 msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid "Timeout connecting to server. Please ensure that your SSH key has been added to a running SSH daemon."
 msgstr "Povezava s strežnikom je bila zakasnjena. Prepričajte se, da je bil vaš ključ SSH pravilno dodan in da ozadnji program SSH teče."
 
@@ -811,23 +811,23 @@ msgstr "--- Tasque ni zagnan ---"
 msgid "_Underline"
 msgstr "_Podčrtaj"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Geslo:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "Polje URL-ja, uporabniškega imena ali gesla je prazno."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid "There was an error connecting to the server.  This may be caused by using an incorrect user name and/or password."
 msgstr "Prišlo je do napake med povezovanjem s strežnikom. Morda ste vnesli napačno uporabniško ime in/ali geslo."
 
@@ -836,12 +836,12 @@ msgstr "Prišlo je do napake med povezovanjem s strežnikom. Morda ste vnesli na
 #. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "Neuspešno shranjevanje nastavitev v zbirko ključev GNOME:"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "Povezava s strežnikom"
 
@@ -850,38 +850,38 @@ msgid "Connected"
 msgstr "Povezano"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Strežnik se ne odziva, poskusite znova kasneje."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Overitev ni uspela, poskusite znova"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Spletna overitev s strežnikom Tomboy je uspela."
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid "Please return to the Tomboy Preferences window and press Save to start synchronizing."
 msgstr "Vrnite se na okno možnosti programa in pritisnite tipko shrani za začetek usklajevanja."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Povezano. Pritisnite tipko shrani za začetek usklajevanja"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Overjanje v brskalniku (Pritisnite za ponastavitev povezave)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Določite privzeti brskalnik in poskusite znova"
 
@@ -890,20 +890,24 @@ msgid "Tomboy Web"
 msgstr "Tomboy spletišče"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "Izvozi vsa sporočilca v"
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Izvozi vsa sporočilca v {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "Začni izvažanje sporočilc na"
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Začni izvoz sporočilc v {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "Izvozi izbrano beležko na"
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Izvozi izbrano beležko v {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Začni izvažanje beležke na"
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Začni izvoz beležke v {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:65
 #: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -919,12 +923,19 @@ msgid "Export your notes."
 msgstr "Izvozi sporočilca."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "Izvozi vsa sporočilca na"
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Izvozi vsa sporočilca v {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "Izvozi izbrano beležko na"
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Izvozi izbrano beležko v {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Izvozi vseh sporočilc {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:193
 #: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -948,7 +959,7 @@ msgid "Unknown error."
 msgstr "neznana napaka."
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
 msgid "Unfiled Notes"
 msgstr "Nezapolnjena sporočilca"
 
@@ -966,9 +977,11 @@ msgstr "Sporočilca so uspešno izvožena"
 msgid "Could not save the files in \"{0}\""
 msgstr "Ni mogoče shraniti datotek v \"{0}\""
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Ustvari ciljno mapo za"
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Ustvari ciljno mapo za izvoz {0}"
 
 #: ../Tomboy/JumpListManager.cs:96
 #: ../Tomboy/RecentChanges.cs:85
@@ -1079,15 +1092,19 @@ msgstr "Beležke"
 msgid "{0} Notebook Template"
 msgstr "{0} Predloga sporočilca"
 
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Novo sporočilce"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
 msgid "All Notes"
 msgstr "Vsa sporočilca"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "Ali naj bo beležka zares izbrisana?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid "The notes that belong to this notebook will not be deleted, but they will no longer be associated with this notebook.  This action cannot be undone."
 msgstr "Sporočilca, ki pripadajo tej beležki ne bodo odstranjena, vendar ne bodo več povezana s to beležko. Dejanja ni mogoče razveljaviti."
 
@@ -1104,29 +1121,30 @@ msgstr "Ni beležke"
 msgid "New \"{0}\" Note"
 msgstr "Novo \"{0}\" sporočilce"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Postavi to sporočilce v beležko"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Beležka"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "Nova _beležka ..."
 
-#: ../Tomboy/Note.cs:497
+#: ../Tomboy/Note.cs:515
 #: ../Tomboy/NoteManager.cs:475
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Novo sporočilce {0}"
 
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Ali želite izbrisati to sporočilce?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Ali naj se \"{0}\" res izbriše?"
 
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
@@ -1135,16 +1153,16 @@ msgstr[1] "Ali želite izbrisati {0} sporočilce?"
 msgstr[2] "Ali želite izbrisati {0} sporočilci?"
 msgstr[3] "Ali želite izbrisati {0} sporočilca?"
 
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "V primeru da sporočilce izbrišete, bo trajno izgubljeno."
 
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
 #, 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 {1}."
 msgstr "Prišlo je do napake med shranjevanjem sporočilc. Preverite, da je dovolj prostora na disku in da imate ustrezna dovoljenja v {0}. Podrobnosti o napaki je mogoče najti v {1}."
 
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Napaka med shranjevanjem podatkov."
 
@@ -1247,8 +1265,8 @@ msgstr "Uporaba povezav v programu Tomboy"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548
-#: ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543
+#: ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Tukaj opišite svoje novo sporočilce."
 
@@ -1310,141 +1328,161 @@ msgstr "Niikoli ne preimenuj _povezav"
 msgid "Alwa_ys rename links"
 msgstr "Vedno _preimenuj povezave"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Najdi v tem sporočilcu"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Povezava do novega sporočilca"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Be_sedilo"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Najdi v tem sporočilcu"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "_Zapri vsa sporočilca"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Išči"
 
 #. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
 msgid "Search your notes"
 msgstr "Iskanje vseh sporočilc"
 
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Poveži"
 
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
 msgid "Link selected text to a new note"
 msgstr "Poveže izbrano besedilo z novim sporočilcem"
 
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "_Besedilo"
 
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Nastavi lastnosti besedila"
 
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "_Orodja"
 
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Uporabi orodja za to sporočilce"
 
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Izbriši to sporočilce"
 
-#: ../Tomboy/NoteWindow.cs:502
+#: ../Tomboy/NoteWindow.cs:507
 #: ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Uskladi sporočilca"
 
-#: ../Tomboy/NoteWindow.cs:564
+#: ../Tomboy/NoteWindow.cs:565
+msgid "This note is a template note. It determines the default content of regular notes, and will not show up in the note menu or search window."
+msgstr "To sporočilce je predloga sporočilc. Določa privzeto vsebino običajnih sporočilc in ne bo prikazano v meniju sporočilc oziroma v iskalnem oknu."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Pretvori v običajno sporočilce"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Shrani _velikost"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Shrani _izbor"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Shrani _naslov"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "_Poišči ..."
 
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Najdi _naslednje"
 
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Najdi _predhodno"
 
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Ni mogoče ustvariti sporočilca"
 
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "_Najdi:"
 
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Predhodnje"
 
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Naslednje"
 
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Krepko"
 
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Ležeče"
 
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "P_rečrtano"
 
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Poudari"
 
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Velikost pisave"
 
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Običajno"
 
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "O_gromno"
 
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "_Veliko"
 
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Majhno"
 
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Povečaj velikost pisave"
 
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Pomanjšaj velikost pisave"
 
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Vrstične oznake"
 
@@ -1649,19 +1687,19 @@ msgstr "Preverite svoje podatke in poskusite znova. Več podrobnosti je mogoče
 msgid "Error connecting"
 msgstr "Napaka med povezovanjem"
 
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Različica:"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Avtor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Avtorske pravice:"
 
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Odvisnosti vstavkov:"
 
@@ -1673,19 +1711,19 @@ msgstr "_Išči:"
 msgid "Note"
 msgstr "Sporočilce"
 
-#: ../Tomboy/RecentChanges.cs:372
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Zadnjič spremenjeno"
 
-#: ../Tomboy/RecentChanges.cs:511
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Zadetki"
 
-#: ../Tomboy/RecentChanges.cs:562
+#: ../Tomboy/RecentChanges.cs:563
 msgid "Title match"
 msgstr "Zadetki naslova"
 
-#: ../Tomboy/RecentChanges.cs:565
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
@@ -1694,7 +1732,7 @@ msgstr[1] "{0} zadetek"
 msgstr[2] "{0} zadetka"
 msgstr[3] "{0} zadetki"
 
-#: ../Tomboy/RecentChanges.cs:579
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
@@ -1703,7 +1741,7 @@ msgstr[1] "Skupaj: {0} sporočilce"
 msgstr[2] "Skupaj: {0} sporočilci"
 msgstr[3] "Skupaj: {0} sporočilca"
 
-#: ../Tomboy/RecentChanges.cs:590
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
@@ -1712,7 +1750,7 @@ msgstr[1] "Skupaj: {0} sporočilce"
 msgstr[2] "Skupaj: {0} sporočilci"
 msgstr[3] "Skupaj: {0} sporočilca"
 
-#: ../Tomboy/RecentChanges.cs:602
+#: ../Tomboy/RecentChanges.cs:603
 msgid ""
 "No results found in the selected notebook.\n"
 "Click here to search across all notes."
@@ -1720,11 +1758,11 @@ msgstr ""
 "Ni najdenih zadetkov v izbrani beležnici.\n"
 "Kliknite tu za iskanje med vsemi beležkami."
 
-#: ../Tomboy/RecentChanges.cs:608
+#: ../Tomboy/RecentChanges.cs:609
 msgid "Click here to search across all notebooks"
 msgstr "Kliknite tu za iskanje med vsemi beležkami."
 
-#: ../Tomboy/RecentChanges.cs:774
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Sporočilca"
 
@@ -2182,6 +2220,9 @@ msgstr "_Kopiraj naslov povezave"
 msgid "_Open Link"
 msgstr "_Odpri povezavo"
 
+#~ msgid "Really delete this note?"
+#~ msgstr "Ali želite izbrisati to sporočilce?"
+
 #~ msgid "HTML Export Last Directory"
 #~ msgstr "Zadnja mapa izvoza v HTML"
 
diff --git a/po/sr.po b/po/sr.po
index 1caad1b..0e3743c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,16 +9,18 @@ msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-05-29 17:08+0000\n"
-"PO-Revision-Date: 2011-06-13 09:15+0200\n"
+"POT-Creation-Date: 2011-09-16 20:03+0000\n"
+"PO-Revision-Date: 2011-09-17 08:51+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic at rocketmail.com>\n"
 "Language-Team: Serbian <gnom at prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Serbian (sr)\n"
-"Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
+"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Virtaal 0.6.1\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -54,7 +56,7 @@ msgstr "_Помоћ"
 #: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
 #: ../Tomboy/Tray.cs:283
 msgid "_Preferences"
-msgstr "_Поставке..."
+msgstr "_Поставке"
 
 #: ../data/tomboy.desktop.in.h:1
 msgid "Note-taker"
@@ -66,79 +68,86 @@ msgstr "Хватајте белешке, повезујте идеје и ост
 
 #: ../data/tomboy.schemas.in.h:1
 msgid "Accept SSL Certificates"
-msgstr "Прихватање SSL сертификата"
+msgstr "Прихватање ССЛ уверења"
 
 #: ../data/tomboy.schemas.in.h:2
 msgid "Automatic Background Synchronization Timeout"
-msgstr "Временско ограничење аутоматске позадинске синхронизације"
+msgstr "Временско ограничење самосталног позадинског усаглашавања"
 
 #: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
-msgstr "Направи нову белешку"
+msgstr "Направите нову белешку"
 
 #: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
 msgstr "Посебан словни лик"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Одређује X координату прозора за претрагу, чува се приликом изласка из "
-"програма."
+"Одређује X координату прозора „Тражи кроз све белешке“, чува се приликом "
+"изласка из програма."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Одређује Y координату прозора за претрагу, чува се приликом изласка из "
-"програма."
+"Одређује Y координату прозора „Тражи кроз све белешке“, чува се приликом "
+"изласка из програма."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Одређује висину у пикселима прозора за претрагу, чува се приликом изласка из "
-"програма."
+"Одређује у тачкама висину прозора „Тражи кроз све белешке“, чува се приликом "
+"изласка из програма."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Одређује ширину у пикселима прозора за претрагу, чува се приликом изласка из "
-"програма."
+"Одређује у тачкама ширину прозора „Тражи кроз све белешке“, чува се приликом "
+"изласка из програма."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Омогући аутоматске листе."
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "Омогућава убацивање средњим кликом на иконицу."
 
 #: ../data/tomboy.schemas.in.h:10
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "Омогући убацивање средњим кликом на икону."
+msgid "Enable Tray Icon"
+msgstr "Поставља иконицу у обавештајну зону"
 
 #: ../data/tomboy.schemas.in.h:11
-msgid "Enable Tray Icon"
-msgstr "Постави иконицу у обавештајну зону"
+msgid "Enable WikiWord highlighting"
+msgstr "Омогућава обележавање ВикиРечи"
 
 #: ../data/tomboy.schemas.in.h:12
-msgid "Enable WikiWord highlighting"
-msgstr "Омогући обележавање ВикиРечи"
+msgid "Enable automatic bulleted lists."
+msgstr "Омогућава самостално означене спискове."
 
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
-msgstr "Омогући затварање белешке тастером Esc."
+msgstr "Омогућава затварање белешке тастером Esc."
 
 #: ../data/tomboy.schemas.in.h:14
 msgid "Enable custom font"
-msgstr "Омогући посебан словни лик"
+msgstr "Омогућава посебан словни лик"
 
 #: ../data/tomboy.schemas.in.h:15
 msgid "Enable global keybindings"
-msgstr "Омогући пречице са тастатуре"
+msgstr "Омогућава пречице са тастатуре"
 
 #: ../data/tomboy.schemas.in.h:16
 msgid "Enable spellchecking"
-msgstr "Омогући проверу правописа"
+msgstr "Омогућава проверу правописа"
 
 #: ../data/tomboy.schemas.in.h:17
 msgid "Enable startup notes"
-msgstr "Омогући белешке при покретању"
+msgstr "Омогућава белешке при покретању"
 
 #: ../data/tomboy.schemas.in.h:18
 msgid "Enable the Delete Note confirmation dialog"
@@ -149,49 +158,45 @@ 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:20
 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 ""
-"Укључите опцију да би омогући да средњи клик на иконицу Томице убаци садржај "
-"обележен текућим временом у белешку за почетну страницу."
+"Укључите ову опцију ако желите да средњим кликом на иконицу Томице убаците "
+"садржај обележен текућим временом у белешку за почетну страницу."
 
 #: ../data/tomboy.schemas.in.h:21
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
 msgstr ""
-"Омогући ову опцију за обележавање речи КојеИзгледајуОвако. Клик изнад речи "
-"ће тада направити нову белешку са тим именом."
+"Укључите ову опцију за обележавање речи КојеИзгледајуОвако. Клик на реч ће "
+"направити нову белешку са тим називом."
 
 #: ../data/tomboy.schemas.in.h:22
 msgid "FUSE Mounting Timeout (ms)"
-msgstr "Време истека FUSE монтирања (ms)"
+msgstr "Време истека ФУСЕ монтирања (ms)"
 
 #: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export All Linked Notes"
-msgstr "ХТМЛ извози повезане белешке"
+msgstr "ХТМЛ извоз свих повезаних белешки"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Последњи директоријум за ХТМЛ извоз"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
-msgstr "Повезане белешке у ХТМЛ извозу"
+msgstr "Повезане белешке ХТМЛ извоза"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Уколико искључите ову опцију, прозорче за потврду брисања белешке неће бити "
 "приказано."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -199,7 +204,7 @@ msgstr ""
 "Ако је „enable_custom_font“ укључено, биће коришћен овде одабран скуп "
 "словних ликова при приказу белешки."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -207,12 +212,12 @@ msgstr ""
 "Ако је укључено, све отворене белешке у тренутку гашења Томице ће бити "
 "поново отворене при покретању."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
-"Ако је укључено отворена белешка може бити затворена притиском на типку Esc."
+"Ако је укључено отворена белешка може бити затворена притиском на тастер Esc."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -220,27 +225,27 @@ msgid ""
 msgstr ""
 "Уколико је укључено, приказаће се Томичина иконица у обавештајној зони "
 "панела. Искључивање ове опције је корисно уколико неки други програм "
-"обезбеди обавештајну иконицу."
+"обезбеђује обавештајну иконицу."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
 msgstr ""
-"Ако је укључено, неисправно написане речи ће бити црвено подвучене, са "
-"предлозима који се појављују у менију по десном клику на реч."
+"Ако је укључено, неисправно написане речи ће бити подвучене црвеном бојом, а "
+"предлози исправно написане речи се приказују у изборнику десног клика."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
 "available from any application."
 msgstr ""
-"Ако је укључено, глобалне пречице постављене у „/apps/tomboy“ ће бити "
-"омогућене, што даје могућност да се неким корисним акцијама Томичиних "
-"белешки приступа из других програма."
+"Ако је укључено, глобалне пречице постављене у „/apps/"
+"tomboyglobal_keybindings“ ће бити омогућене, што даје могућност да се неким "
+"корисним акцијама Томичиних белешки приступа из других програма."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -249,35 +254,35 @@ msgstr ""
 "„custom_font_face“ при приказу белешки, иначе подразумевани словни лик ће "
 "бити коришћен."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
 msgstr ""
-"Указује да увоз гномових белешки није покренут, и да треба бити покренут при "
-"следећем Томичином покретању."
+"Указује да додатак Увозник Гномових белешки није покренут, и да треба бити "
+"самостално покренут при следећем покретању Томице."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr ""
-"Цео број који одређује минимални број белешки које ће бити приказане у "
-"менију."
+"Цео број који одређује најмањи број белешки које ће бити приказане у "
+"изборнику белешки."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
 "autosync is disabled. The lowest acceptable positive value is 5. Value is in "
 "minutes."
 msgstr ""
-"Цео број који одређује колико често да се извршава синхронизација ваших "
-"белешки у позадини (ако се она користи). Свака вредност мања од 1 значи да "
-"је синхронизација искључена. Најмања прихватљива вредност је 5. Вредност је "
-"у минутима."
+"Цео број који одређује колико често ће се извршавати усклађивање ваших "
+"белешки у позадини (ако се користи). Свака вредност мања од 1 значи да је "
+"усклађивање искључено. Најмања прихватљива вредност је 5. Вредност је у "
+"минутима."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -285,12 +290,12 @@ msgid ""
 "wishes to be prompted when a conflict occurs, so that they may handle each "
 "conflict situation on a case-by-case basis."
 msgstr ""
-"Цео број који одређује понашање при детектованом сукобу уместо да се о томе "
-"пита корисник. Вредности се пресликавају на интерну нумерацију понашања. "
-"Вредност „0“ одређује да треба питати корисника тако да се проблеми решавају "
-"од случаја до случаја."
+"Цео број који одређује понашање при откривеном сукобу уместо да се о томе "
+"пита корисник. Вредности се пресликавају на унутрашње нумерисање. Вредност "
+"„0“ одређује да треба питати корисника тако да се проблеми решавају од "
+"случаја до случаја."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -302,15 +307,19 @@ msgid ""
 msgstr ""
 "Цео број који одређује да ли је пожељно да се увек примењује неко одређено "
 "ажурирање веза када се белешка преименује, уместо да се пита корисник. "
-"Бројеви имају своју интерну представу. 0 — значи да корисник жели да буде "
-"питан када се преименује белешка која има друге белешке које имају везе ка "
-"њој. 1 — значи да се све везе аутоматски уклањају. 2 — значи да текст везе "
-"треба ажурирати на ново име белешке тако да веза ка преименованој белешци "
-"настави да постоји."
+"Вредности се пресликавају на унутрашње нумерисање. 0 — значи да корисник "
+"жели да буде питан када преименовање белешке може да утиче на везе које "
+"постоје у осталим белешкама. 1 — значи да се све везе аутоматски уклањају. 2 "
+"— значи да текст везе треба ажурирати на ново име белешке тако да веза ка "
+"преименованој белешци настави да постоји."
+
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Последњи директоријум коришћен у ХТМЛ извозу"
 
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
-msgstr "Понашање за ажурирање веза при преименовању белешке"
+msgstr "Понашање ажурирања веза при преименовању белешке"
 
 #: ../data/tomboy.schemas.in.h:40
 msgid "List of pinned notes."
@@ -321,16 +330,16 @@ msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
 msgstr ""
-"Максимални број карактера из наслова белешке који се приказују у иконици "
-"панела или у менију панела."
+"Највећи број знакова наслова белешке који се приказују у иконици панела или "
+"у изборнику програмчета панела."
 
 #: ../data/tomboy.schemas.in.h:42
 msgid "Maximum note title length to show in tray menu."
-msgstr "Минимална дужина наслова белешке за приказивање у менију панела."
+msgstr "Најмања дужина наслова белешке за приказивање у изборнику панела."
 
 #: ../data/tomboy.schemas.in.h:43
 msgid "Minimum number of notes to show in menu"
-msgstr "Минималан број белешки за приказ у менију"
+msgstr "Најмањи број белешки за приказ у изборнику"
 
 #: ../data/tomboy.schemas.in.h:44
 msgid "Note Synchronization Conflict Saved Behavior"
@@ -338,20 +347,20 @@ msgstr "Понашање у случају сукоба при усклађив
 
 #: ../data/tomboy.schemas.in.h:45
 msgid "Open Recent Changes"
-msgstr "Отвори скорашње измене"
+msgstr "Отварање скорашњих измена"
 
 #: ../data/tomboy.schemas.in.h:46
 msgid "Open Search Dialog"
-msgstr "Отвори прозорче за претрагу"
+msgstr "Отварање прозорчета за претрагу"
 
 #: ../data/tomboy.schemas.in.h:47
 msgid "Open Start Here"
-msgstr "Отвори почетну станицу"
+msgstr "Отварање почетне станице"
 
 #: ../data/tomboy.schemas.in.h:48
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr ""
-"Путања на SSH серверу за фасциклу усклађивања Томичиних белешки (опционо)."
+"Путања на ССХ серверу за фасциклу усклађивања Томичиних белешки (опционо)."
 
 #: ../data/tomboy.schemas.in.h:49
 msgid ""
@@ -378,20 +387,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS адреса за удаљено усклађивање"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Сачувана висина прозора за претрагу"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Сачувана висина прозора „Тражи кроз све белешке“"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Сачувана хоризонтална позиција прозора за претрагу"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Сачуван водоравни положај прозора „Тражи кроз све белешке“"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Сачувана вертикална позиција прозора за претрагу"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Сачуван усправни положај прозора „Тражи кроз све белешке“"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Сачувана ширина прозора за претрагу"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Сачувана ширина прозора „Тражи кроз све белешке“"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -403,7 +412,7 @@ msgstr "Изаберите да би било укључено"
 
 #: ../data/tomboy.schemas.in.h:60
 msgid "Show applet menu"
-msgstr "Прикажи мени програмчета"
+msgstr "Приказивање изборника програмчета"
 
 #: ../data/tomboy.schemas.in.h:61
 msgid "Start Here Note"
@@ -411,19 +420,19 @@ msgstr "Белешка за почетну станицу"
 
 #: ../data/tomboy.schemas.in.h:62
 msgid "Sticky Note Importer First Run"
-msgstr "Увоз гномових белешки"
+msgstr "Прво покретање Увоза Гномових белешки"
 
 #: ../data/tomboy.schemas.in.h:63
 msgid "Synchronization Client ID"
-msgstr "ИД клијента за сервис усклађивања"
+msgstr "ИБ клијента усклађивања"
 
 #: ../data/tomboy.schemas.in.h:64
 msgid "Synchronization Local Server Path"
-msgstr "Локална путања до сервера за усклађивање"
+msgstr "Локална путања до сервера усклађивања"
 
 #: ../data/tomboy.schemas.in.h:65
 msgid "The date format that is used for the timestamp."
-msgstr "Формат датума за ознаку времена."
+msgstr "Облик датума коришћеног за ознаку времена."
 
 #: ../data/tomboy.schemas.in.h:66
 msgid ""
@@ -437,8 +446,8 @@ msgstr ""
 "Глобална пречица за отварање и приказ нове белешке. Формат поља је као „<"
 "Control>a“ или „<Shift><Alt>F1“. Формат је доста слободан и "
 "дозвољава мала или велика слова као и скраћенице попут „<Ctl>\"и \"<"
-"Ctrl>“. Ако поставите ову опцију на посебну вредност „disabled“,тада неће "
-"постојати пречица за ову акцију."
+"Ctrl>“. Ако поставите ову опцију на посебну вредност „disabled“ — "
+"искључено,тада неће постојати пречица за ову акцију."
 
 #: ../data/tomboy.schemas.in.h:67
 msgid ""
@@ -453,7 +462,7 @@ msgstr ""
 "„<Control>a“ или „<Shift><Alt>F1“. Формат је доста "
 "слободан и дозвољава мала или велика слова као и скраћенице попут „<"
 "Ctl>“ и „<Ctrl>“. Ако поставите ову опцију на посебну вредност "
-"„disabled“,тада неће постојати пречица за ову акцију."
+"„disabled“ — искључено,тада неће постојати пречица за ову акцију."
 
 #: ../data/tomboy.schemas.in.h:68
 msgid ""
@@ -468,7 +477,7 @@ msgstr ""
 "„<Control>a“ или „<Shift><Alt>F1“. Формат је доста "
 "слободан и дозвољава мала или велика слова као и скраћенице попут „<"
 "Ctl>“и „<Ctrl>“. Ако поставите ову опцију на посебну вредност "
-"„disabled“,тада неће постојати пречица за ову акцију."
+"„disabled“ — искључено,тада неће постојати пречица за ову акцију."
 
 #: ../data/tomboy.schemas.in.h:69
 msgid ""
@@ -483,7 +492,7 @@ msgstr ""
 "је као „<Control>a“ или „<Shift><Alt>F1“. Формат је доста "
 "слободан и дозвољава мала или велика слова као и скраћенице попут „<"
 "Ctl>“ и „<Ctrl>“. Ако поставите ову опцију на посебну вредност "
-"„disabled“,тада неће постојати пречица за ову акцију."
+"„disabled“ — искључено,тада неће постојати пречица за ову акцију."
 
 #: ../data/tomboy.schemas.in.h:70
 msgid ""
@@ -497,19 +506,19 @@ msgstr ""
 "Глобална пречица за приказ менија програмчета. Формат поља је као „<"
 "Control>a“ или „<Shift><Alt>F1“. Формат је доста слободан и "
 "дозвољава мала или велика слова као и скраћенице попут „<Ctl>“ и „<"
-"Ctrl>“. Ако поставите ову опцију на посебну вредност „disabled“,тада неће "
-"постојати пречица за ову акцију."
+"Ctrl>“. Ако поставите ову опцију на посебну вредност „disabled“ — "
+"искључено,тада неће постојати пречица за ову акцију."
 
 #: ../data/tomboy.schemas.in.h:71
 msgid "The handler for \"note://\" URLs"
-msgstr "Програм за прихватање „note://“ УРЛ адреса"
+msgstr "Руковалац „note://“ адреса"
 
 #: ../data/tomboy.schemas.in.h:72
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
-"Последњи директоријум у који је белешка извезена кроз додатак за извоз у "
-"ХТМЛ."
+"Последњи директоријум у који је белешка извезена користећи додатак за извоз "
+"у ХТМЛ."
 
 #: ../data/tomboy.schemas.in.h:73
 msgid ""
@@ -536,8 +545,9 @@ msgid ""
 "which is always placed at the bottom of the Tomboy note menu and also "
 "accessible by hotkey."
 msgstr ""
-"УРИ белешке која ће бити сматрана белешком за „Почетну станицу“, која се "
-"увек налази на дну менија у Томици и доступна је преко пречице са тастатуре."
+"Адреса белешке која ће бити сматрана белешком за „Почетну станицу“, која се "
+"увек налази на дну изборника у Томици и доступна је преко пречице са "
+"тастатуре."
 
 #: ../data/tomboy.schemas.in.h:76
 msgid ""
@@ -554,7 +564,7 @@ msgid ""
 "mount a sync share."
 msgstr ""
 "Време (у милисекундама) које Томичине белешке чекају на одговор када се "
-"користи FUSE да се монтира дељена фасцикла.за усклађивање."
+"користи FUSE за монтирање дељена фасцикла за усклађивање."
 
 #: ../data/tomboy.schemas.in.h:78
 msgid "Timestamp format"
@@ -611,7 +621,7 @@ msgstr "_Нова"
 
 #: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
 msgid "Create a new note"
-msgstr "Направи нову белешку"
+msgstr "Направите нову белешку"
 
 #: ../Tomboy/ActionManager.cs:134
 msgid "_Open..."
@@ -619,7 +629,7 @@ msgstr "_Отвори..."
 
 #: ../Tomboy/ActionManager.cs:135
 msgid "Open the selected note"
-msgstr "Отвори одабрану белешку"
+msgstr "Отворите одабрану белешку"
 
 #: ../Tomboy/ActionManager.cs:138
 msgid "_Delete"
@@ -627,15 +637,15 @@ msgstr "_Обриши"
 
 #: ../Tomboy/ActionManager.cs:139
 msgid "Delete the selected note"
-msgstr "Обриши одабрану белешку"
+msgstr "Обришите одабрану белешку"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Затвори"
 
 #: ../Tomboy/ActionManager.cs:143
 msgid "Close this window"
-msgstr "Затвори овај прозор"
+msgstr "Затворите овај прозор"
 
 #: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
 msgid "_Quit"
@@ -673,7 +683,7 @@ msgstr "Иконица у панелу"
 msgid "Create _New Note"
 msgstr "Направи _нову белешку"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Тражи кроз све белешке"
 
@@ -685,11 +695,22 @@ msgstr "Отвори прозор за претрагу кроз све беле
 msgid "Start synchronizing notes"
 msgstr "Започни усклађивање белешки"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Напредно"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Најмањи број белешки за приказивање у списку скорашњих (највише 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Шта води овамо?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(ништа)"
 
@@ -698,8 +719,9 @@ msgid ""
 "You can use any bugzilla just by dragging links into notes.  If you want a "
 "special icon for certain hosts, add them here."
 msgstr ""
-"Можеш користити било коју бубаждају превлачењем везе ка страници у белешку. "
-"Ако желиш посебну иконицу за одређене адресе, додај их овде."
+"Можете користити било коју бубаждају једноставним превлачењем везе ка "
+"страници у белешку. Ако желите посебну иконицу за одређене адресе, додајте "
+"их овде."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
 msgid "Host Name"
@@ -724,7 +746,8 @@ msgstr "Није наведена адреса рачунара"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
 msgid "You must specify the Bugzilla host name to use with this icon."
-msgstr "Мораш навести адресу рачунара Бубаждаје за коришћење са овом иконицом."
+msgstr ""
+"Морате навести адресу рачунара Бубаждаје за коришћење са овом иконицом."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
 msgid "Error saving icon"
@@ -736,11 +759,31 @@ msgstr "Не могу да сачувам датотеку са иконицом
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
-msgstr "Заиста желиш да обришеш ову иконицу?"
+msgstr "Заиста желите да обришете ову иконицу?"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
 msgid "If you remove an icon it is permanently lost."
-msgstr "Ако је обришеш она ће заувек бити изгубљена."
+msgstr "Ако је обришете она ће заувек бити изгубљена."
+
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Не могу да отворим е-пошту"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "ХТМЛ"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Одредиште извоза у ХТМЛ"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Извези повезане белешке"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Укључи све друге повезане белешке"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
@@ -749,17 +792,21 @@ msgstr "Извези у ХТМЛ"
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
-msgstr "Твоја белешка је извезена у „{0}“."
+msgstr "Ваша белешка је извезена у „{0}“."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
 msgid "Note exported successfully"
 msgstr "Белешка је успешно извезена"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Приступ није дозвољен."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Фасцикла не постоји."
 
@@ -768,22 +815,6 @@ msgstr "Фасцикла не постоји."
 msgid "Could not save the file \"{0}\""
 msgstr "Не могу да сачувам датотеку „{0}“"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Одредиште извоза у ХТМЛ"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Извези повезане белешке"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Укључи све друге повезане белешке"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Не могу да отворим е-пошту"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Путања фасцикле:"
@@ -792,22 +823,22 @@ msgstr "_Путања фасцикле:"
 msgid "Select Synchronization Folder..."
 msgstr "Одабери фасциклу за усклађивање..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Поље за путању фасцикле је празно."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "Наведена путања фасцикле не постоји, а Томица не може да је направи."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Локална фасцикла"
 
 #: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
 msgid "Fixed Wid_th"
-msgstr "_Фиксна ширина"
+msgstr "Стална _ширина"
 
 #: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
 #, csharp-format
@@ -864,11 +895,11 @@ msgstr "Састанци"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Промени белешку „<span weight=\"bold\">Данас: шаблон</span>“ да прилагодиш "
-"текст који имају нове белешке дана."
+"Измените белешку „<b>Данас: шаблон</b>“ да прилагодите текст који имају нове "
+"белешке дана."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -893,26 +924,31 @@ msgstr "Страница {0} од {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd dd.MM.yyyy, hh:mm:ss tt"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Уклони оштећене везе"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Додај цртеж"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Се_рвер:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Корисничко име:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Путања фасцикле (необавезно):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -920,49 +956,54 @@ msgstr ""
 "SSH усклађивање захтева постојећи кључ за сервер и да корисник буде придодат "
 "покренутом SSH демону."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Сервер или корисничко име су празни."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs кроз FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "ССХ"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
 msgstr ""
-"Временски рок за повезивање са сервером. Увери се да је твој SSH кључ "
+"Временски рок за повезивање са сервером. Уверите се да је ваш SSH кључ "
 "придодат покренутом SSH демону."
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
 msgid "Import from Sticky Notes"
-msgstr "Увези гномове белешке"
+msgstr "Увези Гномове белешке"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:133
 msgid "No Sticky Notes found"
-msgstr "Нису пронађене гномове белешке"
+msgstr "Нису пронађене Гномове белешке"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
 #, csharp-format
 msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "Није пронађена погодна датотека гномових белешки у „{0}“."
+msgstr "Није пронађена погодна датотека Гномових белешки у „{0}“."
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
 msgid "Sticky Notes import completed"
-msgstr "Увоз гномових белешки је завршен"
+msgstr "Увоз Гномових белешки је завршен"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "Успешно увезене гномове белешке: <b>{0}</b> од <b>{1}</b>"
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "Успешно увезене Гномове белешке: <b>{0}</b> од <b>{1}</b>"
+msgstr[1] "Успешно увезене Гномове белешке: <b>{0}</b> од <b>{1}</b>"
+msgstr[2] "Успешно увезене Гномове белешке: <b>{0}</b> од <b>{1}</b>"
+msgstr[3] "Успешно увезене гномове белешке: <b>{0}</b> од <b>{1}</b>"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Без наслова"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Гномова белешка: "
 
@@ -986,23 +1027,23 @@ msgstr "--- Програм Задачићи није покренут ---"
 msgid "_Underline"
 msgstr "Подв_учено"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
-msgstr "_УРЛ:"
+msgstr "_Адреса:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
-msgstr "УРЛ, корисничко име или лозинка су празни."
+msgstr "Адреса, корисничко име или лозинка су празни."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "Веб фасцикла (wdfs кроз FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "ВебДАВ"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1015,65 +1056,159 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Снимање поставки у Гномов привезак за кључеве није успело, уз следећу поруку:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Веб Томица"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
-msgstr "Повезујем се са сервером"
+msgstr "Повежи се са сервером"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
 msgid "Connected"
 msgstr "Повезан"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Сервер не одговора. Покушајте касније."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Није успело пријављивање, покушајте поново"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Веб Томица је пријављен"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
 msgstr ""
 "Вратите се у прозор „Поставке“ и кликните „Сними“ да започнете усклађивање."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Повезан. Кликните „Сними“ да започнете усклађивање"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Пријава из Интернет прегледника (кликните да ресетујете везу)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Поставите подразумевани интернет прегледник и покушајте поново"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Веб Томица"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Извези све белешке у {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Започни извоз белешки у {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Извези одабрану свеску у {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Започни извоз свеске у {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "Ала_ти"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Извези"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Извезите ваше белешке."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Извези све белешке у {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Извези одабрану свеску у {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Извоз свих {0} белешки"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Не могу да извезем, приступ је одбијен."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Не могу да извезем, фасцикла не постоји."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Не могу да извезем: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Непозната грешка."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Непопуњене белешке"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Ваше белешке су извежене у „{0}“."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Белешка је успешно извежена"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Не могу да сачувам датотеку у „{0}“"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Направи одредишну фасциклу за {0} извоз"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Тражи кроз све белешке"
 
@@ -1126,26 +1261,6 @@ msgstr "Име је већ заузето"
 msgid "C_reate"
 msgstr "_Нова"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Шаблон за свеску „{0}“"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Све белешке"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Непопуњене белешке"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "_Свеске"
@@ -1185,15 +1300,35 @@ msgid "Delete the selected notebook"
 msgstr "Обриши одабрану свеску"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Свеске"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Шаблон за свеску „{0}“"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Нова белешка"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Све белешке"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
-msgstr "Заиста желиш да обришеш ову свеску?"
+msgstr "Заиста желите да обришете ову свеску?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1212,25 +1347,31 @@ msgstr "Нема свески"
 #: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
 #, csharp-format
 msgid "New \"{0}\" Note"
-msgstr "„{0}“: нова белешка"
+msgstr "{0} — нова белешка"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Спреми белешку у свеску"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Свеска"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Нова свеска..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Заиста желиш да обришеш ову белешку?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "{0}. белешка"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Стварно да обришем „{0}“?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
@@ -1239,11 +1380,11 @@ msgstr[1] "Заиста желите да обришете ове {0} белеш
 msgstr[2] "Заиста желите да обришете ових {0} белешки?"
 msgstr[3] "Заиста желите да обришете ову {0} белешку?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Ако је обришете она ће заувек бити изгубљена."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1254,13 +1395,13 @@ msgstr ""
 "простора на диску и да имате права уписа у фасциклу {0}. Детаљи о грешци су "
 "записани у {1}."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Грешка при чувању података белешке."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Шаблон нове белешке"
 
@@ -1383,7 +1524,7 @@ msgstr ""
 "њој ће аутоматски бити направљена.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Почетна станица"
 
@@ -1391,14 +1532,9 @@ msgstr "Почетна станица"
 msgid "Using Links in Tomboy"
 msgstr "Коришћење веза у Томици"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "{0}. белешка"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Овде опишите вашу мисао."
 
@@ -1462,139 +1598,164 @@ msgstr "_Никад не преименуј везе"
 msgid "Alwa_ys rename links"
 msgstr "_Увек преименуј везе"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Тражи унутар белешке"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Веза на нову белешку"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Те_кст"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Тражи унутар белешке"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Затвори св_е белешке"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Претрага"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Тражи у белешкама (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Потражите ваше белешке"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Веза"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Повежи одабрани текст на нову белешку (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Повежи одабрани текст на нову белешку"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "Те_кст"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Постави особине текста"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "Ала_ти"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Користи алате"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Обриши ову белешку"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Усклади белешке"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Ова белешка је белешка шаблона. Она ондређује основни садржај обичних "
+"белешки, и неће бити приказана у изборнику белешки или у прозору за претрагу."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Претвори у обичну белешку"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Величина _чувања"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Сачувај _избор"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Наслов белешке"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
-msgstr "Тра_жи...:"
+msgstr "_Тражи...:"
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Тражи _наредно"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Тражи _претходно"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Не могу да направим белешку"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "Претра_жи:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Претходна"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Следећа"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Подебљано"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Искошено"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "Пре_цртано"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Подвучено"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Величина слова"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Нормална"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "О_громна"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "Ве_лика"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Мала"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Повећај величину фонта"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Смањи величину фонта"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Листа са тачкицама"
 
@@ -1614,73 +1775,73 @@ msgstr "Усклађивање"
 msgid "Add-ins"
 msgstr "Додаци"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "Провери правопи_с током куцања"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr ""
-"Неисправно написане речи ће бити црвено подвучене, са предлозима који се "
-"појављују у менију по десном клику на реч."
+"Неисправно написане речи ће бити подвучене црвеном бојом, са предлозима "
+"исправног писања приказаних у приручном изборнику."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Означи _ВикиРечи"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
 msgstr ""
-"Омогући опцију за обележавање речи <b>КојеИзгледајуОвако</b>. Клик изнад "
+"Омогућите опцију за обележавање речи <b>КојеИзгледајуОвако</b>. Клик изнад "
 "речи ће тада направити нову белешку са тим именом."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Омогући аутоматске _листе"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Користи посебан _словни лик"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Када се преименује белешка на коју друге белешке имају везу:"
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Питај ме шта да радим"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Никад не преименуј везе"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Увек преименуј везе"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr ""
 "Користи шаблон нове белешке за одређивање почетног текста у новим белешкама"
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Отвори шаблон нове белешке"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Реагуј на _пречице"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1690,82 +1851,82 @@ msgstr ""
 "пречица: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Приказ _менија са белешкама"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Отвори „Почетну _страницу“"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Направи _нову белешку"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "З_апочни претрагу кроз све белешке"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Сер_вис:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Није подесиво"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Аутоматски усагласи белешке сваких"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "минута"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Напредно..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Следећи додаци су инсталирани"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Набави још додатака..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Укључи"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Искључи"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Још није направљено"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Поставке за {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Одабери словни лик за белешке"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Остале опције усклађивања"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1773,23 +1934,23 @@ msgstr ""
 "Када се догоди сукоб између локални белешке и белешке на одабраном серверу "
 "за усклађивање:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Увек ме питај шта да урадиш."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Преименуј моју локалну белешку."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Замени моју локалну белешку оном са сервера."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "УПОЗОРЕЊЕ: Сигурно ово желите?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Да ли сте сигурни?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1797,76 +1958,80 @@ msgstr ""
 "Уклањање поставки за усклађивање није препоручено. Може се догодити да мораш "
 "поново да ускладите све ваше белешке када сачувате нове поставке."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Поново постави поставке за усклађивање"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Подешени сервис за усклађивање је онемогућен. Ваше поставке за усклађивање "
 "ће сада бити обрисане. Може се догодити да ћете морати поново да ускладите "
 "све ваше белешке када сачувате нове поставке."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Успех! Повезани смо!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Веза је успостављена"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Томица је спреман да усклади белешке. Желите ли да их ускладите сада?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Нажалост нешто је пошло наопако. Проверите информације и покушајте поново. "
-"Садржај из {0} такође може бити користан."
+"Проверите ваше податке и покушајте поново.  Датотека дневника {0} може да "
+"садржи више података о грешци."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Грешка при повезивању :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Грешка у повезивању"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Верзија:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Аутор:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Права:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Међузависности додатка:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "Претра_жи:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Белешка"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Последња измена"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Поклапања"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Поклапање наслова"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
@@ -1875,7 +2040,7 @@ msgstr[1] "({0} поклапања)"
 msgstr[2] "({0} поклапања)"
 msgstr[3] "({0} поклапање)"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
@@ -1884,7 +2049,7 @@ msgstr[1] "Укупно: {0} белешке"
 msgstr[2] "Укупно: {0} белешки"
 msgstr[3] "Укупно: {0} белешка"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
@@ -1893,270 +2058,59 @@ msgstr[1] "Пронађено: {0} белешке"
 msgstr[2] "Пронађено: {0} белешки"
 msgstr[3] "Укупно: {0} белешка"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Нису пронађени резултати у изабраној свесци.\n"
+"Кликните овде да потражите у свим белешкама."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Кликните овде да потражите у свим свескама"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Белешке"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Не могу да направим нову белешку"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Овај додатак за усклађивање није подржан на вашем рачунару. Проверите да ли "
+"су FUSE и {0} исправно инсталирани и подешени."
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Главни развој:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Не могу да читам датотеку теста."
 
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "Доприносиоци:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Тест писања није успео."
 
-#: ../Tomboy/Tomboy.cs:405
-msgid "translator-credits"
-msgstr ""
-"Горан Ракић <grakic at devbase.net>\n"
-"Бранко Кокановић <branko.kokanovic at gmail.com>\n"
-"\n"
-"http://prevod.org — превод на српски језик."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Истекло је време за повезивање са сервером."
 
-#: ../Tomboy/Tomboy.cs:414
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Ауторска права © 2004-2007 Alex Graveley\n"
-"Ауторска права © 2004-2010 Остали\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Грешка при повезивању са сервером."
 
-#: ../Tomboy/Tomboy.cs:416
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Једноставан и згодан програмчић за хватање белешки"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "FUSE не може бити омогућен."
 
-#: ../Tomboy/Tomboy.cs:426
-msgid "Homepage"
-msgstr "Веб страница"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Догодила се грешка при повезивању са наведеним сервером:"
 
-#: ../Tomboy/Tomboy.cs:544
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Томица: Једноставно програмче за хватање белешки.\n"
-"Ауторска права (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:556
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Употреба:\n"
-"  --version\t\t\tПрикажи информације о верзији.\n"
-"  --help\t\t\tПрикажи овај текст помоћи.\n"
-"  --note-path [путања]\t\tУчитај/сними податке о белешкама из/у "
-"директоријум.\n"
-"  --search [текст]\t\tТражи унети текст кроз све белешке у прозору за "
-"претрагу.\n"
-
-#: ../Tomboy/Tomboy.cs:566
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tНаправи и прикажи нову белешку.\n"
-"  --new-note [наслов]\t\tНаправи и прикажи нову белешку, уз наслов.\n"
-"  --open-note [наслов/урл]\tПрикажи постојећу белешку која се поклапа са "
-"насловом.\n"
-"  --start-here\t\t\tПрикажи белешку „Почетна станица“.\n"
-"  --highlight-search [текст]\tПронађи и обележи текст у отвореној белешки.\n"
-
-#: ../Tomboy/Tomboy.cs:580
-#, csharp-format
-msgid "Version {0}"
-msgstr "Верзија {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (нова)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_О Томици"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"„Упутство за Томичине белешке“ није пронађено.  Проверите да ли је "
-"инсталација програма прошла успешно."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Помоћ није пронађена"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Не могу да отворим локацију"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Данас, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Данас"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Јуче, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Јуче"
-
-# bug(goran): plural!
-# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Пре {0} дана, {1}"
-msgstr[1] "Пре {0} дана, {1}"
-msgstr[2] "Пре {0} дана, {1}"
-msgstr[3] "Пре {0} дана, {1}"
-
-# bug(goran): plural!
-# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Пре {0} дан"
-msgstr[1] "Пре {0} дана"
-msgstr[2] "Пре {0} дана"
-msgstr[3] "Пре {0} дан"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Сутра, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Сутра"
-
-# bug(goran): plural!
-# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Кроз {0} дан, {1}"
-msgstr[1] "Кроз {0} дана, {1}"
-msgstr[2] "Кроз {0} дана, {1}"
-msgstr[3] "Кроз {0} дан, {1}"
-
-# bug(goran): plural!
-# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Кроз {0} дан"
-msgstr[1] "Кроз {0} дана"
-msgstr[2] "Кроз {0} дана"
-msgstr[3] "Кроз {0} дан"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d. MMMM, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d. MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Без датума"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d. MMMM yyyy, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d. MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Без наслова {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Белешка <b>{0}</b> већ постоји. Одаберите друго име за ову белешку пре него "
-"што наставите даље."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Наслов белешке је заузет"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Умножи адресу везе"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Отвори везу"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Овај додатак за усклађивање није подржан на вашем рачунару. Проверите да ли "
-"су FUSE и {0} исправно инсталирани и подешени."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Не могу да читам датотеку теста."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Тест писања није успео."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Истекло је време за повезивање са сервером."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Грешка при повезивању са сервером."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "FUSE не може бити омогућен."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Догодила се грешка при повезивању са наведеним сервером:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Детаљи"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Детаљи"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2356,10 +2310,6 @@ msgstr ""
 "Верзија белешке „{0}“ са сервера је у сукобу са локалном белешком. Шта "
 "желите да учините са вашом локалном белешком?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "Ала_ти"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2393,6 +2343,250 @@ msgstr ""
 "Да избегнете ово прозорче у будућности, треба да учитате FUSE при покретању. "
 "Додајте „modprobe fuse“ у /etc/init.d/boot.local или „fuse“ у /etc/modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Не могу да направим нову белешку"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Главни развој:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Доприносиоци:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Горан Ракић <grakic at devbase.net>\n"
+"Бранко Кокановић <branko.kokanovic at gmail.com>\n"
+"\n"
+"http://prevod.org — превод на српски језик."
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Ауторска права © 2004-2007 Alex Graveley\n"
+"Ауторска права © 2004-2011 Остали\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Једноставан и згодан програмчић за хватање белешки"
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Веб страница"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Томица: Једноставно програмче за хватање белешки.\n"
+"Ауторска права (C) 2004-2007 Alex Graveley <alex at beatniksoftware.com>\n"
+"\n"
+"Ауторска права © 2004-2011 Остали\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Употреба:\n"
+"  --version\t\t\tПрикажи информације о верзији.\n"
+"  --help\t\t\tПрикажи овај текст помоћи.\n"
+"  --note-path [путања]\t\tУчитај/сними податке о белешкама из/у "
+"директоријум.\n"
+"  --search [текст]\t\tТражи унети текст кроз све белешке у прозору за "
+"претрагу.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tНаправи и прикажи нову белешку.\n"
+"  --new-note [наслов]\t\tНаправи и прикажи нову белешку, уз наслов.\n"
+"  --open-note [наслов/урл]\tПрикажи постојећу белешку која се поклапа са "
+"насловом.\n"
+"  --start-here\t\t\tПрикажи белешку „Почетна станица“.\n"
+"  --highlight-search [текст]\tПронађи и обележи текст у отвореној белешки.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Верзија {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (нова)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_О Томици"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"„Упутство за Томичине белешке“ није пронађено.  Проверите да ли је "
+"инсталација програма прошла успешно."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Помоћ није пронађена"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Не могу да отворим локацију"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Данас, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Данас"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Јуче, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Јуче"
+
+# bug(goran): plural!
+# http://bugzilla.gnome.org/show_bug.cgi?id=476061
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Пре {0} дана, {1}"
+msgstr[1] "Пре {0} дана, {1}"
+msgstr[2] "Пре {0} дана, {1}"
+msgstr[3] "Пре {0} дана, {1}"
+
+# bug(goran): plural!
+# http://bugzilla.gnome.org/show_bug.cgi?id=476061
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Пре {0} дан"
+msgstr[1] "Пре {0} дана"
+msgstr[2] "Пре {0} дана"
+msgstr[3] "Пре {0} дан"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Сутра, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Сутра"
+
+# bug(goran): plural!
+# http://bugzilla.gnome.org/show_bug.cgi?id=476061
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Кроз {0} дан, {1}"
+msgstr[1] "Кроз {0} дана, {1}"
+msgstr[2] "Кроз {0} дана, {1}"
+msgstr[3] "Кроз {0} дан, {1}"
+
+# bug(goran): plural!
+# http://bugzilla.gnome.org/show_bug.cgi?id=476061
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Кроз {0} дан"
+msgstr[1] "Кроз {0} дана"
+msgstr[2] "Кроз {0} дана"
+msgstr[3] "Кроз {0} дан"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d. MMMM, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d. MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Без датума"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d. MMMM yyyy, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d. MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Без наслова {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Белешка <b>{0}</b> већ постоји. Одаберите друго име за ову белешку пре него "
+"што наставите даље."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Наслов белешке је заузет"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Умножи адресу везе"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Отвори везу"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Последњи директоријум за ХТМЛ извоз"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs кроз FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "Веб фасцикла (wdfs кроз FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Заиста желиш да обришеш ову белешку?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Тражи у белешкама (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Успех! Повезани смо!"
+
 #~ msgid "_Browse..."
 #~ msgstr "_Разгледај..."
 
@@ -2619,9 +2813,6 @@ msgstr ""
 #~ msgid "_Search..."
 #~ msgstr "Претра_жи"
 
-#~ msgid "S_earch notes"
-#~ msgstr "Претра_жи белешке"
-
 #~ msgid "Table of Contents"
 #~ msgstr "Садржај"
 
diff --git a/po/sr at latin.po b/po/sr at latin.po
index 1b1212f..df8f97c 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -9,16 +9,18 @@ msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-05-29 17:08+0000\n"
-"PO-Revision-Date: 2011-06-13 09:15+0200\n"
+"POT-Creation-Date: 2011-09-16 20:03+0000\n"
+"PO-Revision-Date: 2011-09-17 08:51+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic at rocketmail.com>\n"
 "Language-Team: Serbian <gnom at prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Serbian (sr)\n"
-"Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
+"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Virtaal 0.6.1\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -54,7 +56,7 @@ msgstr "_Pomoć"
 #: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
 #: ../Tomboy/Tray.cs:283
 msgid "_Preferences"
-msgstr "_Postavke..."
+msgstr "_Postavke"
 
 #: ../data/tomboy.desktop.in.h:1
 msgid "Note-taker"
@@ -66,79 +68,86 @@ msgstr "Hvatajte beleške, povezujte ideje i ostanite organizovani"
 
 #: ../data/tomboy.schemas.in.h:1
 msgid "Accept SSL Certificates"
-msgstr "Prihvatanje SSL sertifikata"
+msgstr "Prihvatanje SSL uverenja"
 
 #: ../data/tomboy.schemas.in.h:2
 msgid "Automatic Background Synchronization Timeout"
-msgstr "Vremensko ograničenje automatske pozadinske sinhronizacije"
+msgstr "Vremensko ograničenje samostalnog pozadinskog usaglašavanja"
 
 #: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
-msgstr "Napravi novu belešku"
+msgstr "Napravite novu belešku"
 
 #: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
 msgstr "Poseban slovni lik"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Određuje X koordinatu prozora za pretragu, čuva se prilikom izlaska iz "
-"programa."
+"Određuje X koordinatu prozora „Traži kroz sve beleške“, čuva se prilikom "
+"izlaska iz programa."
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Određuje Y koordinatu prozora za pretragu, čuva se prilikom izlaska iz "
-"programa."
+"Određuje Y koordinatu prozora „Traži kroz sve beleške“, čuva se prilikom "
+"izlaska iz programa."
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Određuje visinu u pikselima prozora za pretragu, čuva se prilikom izlaska iz "
-"programa."
+"Određuje u tačkama visinu prozora „Traži kroz sve beleške“, čuva se prilikom "
+"izlaska iz programa."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
-"Određuje širinu u pikselima prozora za pretragu, čuva se prilikom izlaska iz "
-"programa."
+"Određuje u tačkama širinu prozora „Traži kroz sve beleške“, čuva se prilikom "
+"izlaska iz programa."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Omogući automatske liste."
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "Omogućava ubacivanje srednjim klikom na ikonicu."
 
 #: ../data/tomboy.schemas.in.h:10
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "Omogući ubacivanje srednjim klikom na ikonu."
+msgid "Enable Tray Icon"
+msgstr "Postavlja ikonicu u obaveštajnu zonu"
 
 #: ../data/tomboy.schemas.in.h:11
-msgid "Enable Tray Icon"
-msgstr "Postavi ikonicu u obaveštajnu zonu"
+msgid "Enable WikiWord highlighting"
+msgstr "Omogućava obeležavanje VikiReči"
 
 #: ../data/tomboy.schemas.in.h:12
-msgid "Enable WikiWord highlighting"
-msgstr "Omogući obeležavanje VikiReči"
+msgid "Enable automatic bulleted lists."
+msgstr "Omogućava samostalno označene spiskove."
 
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
-msgstr "Omogući zatvaranje beleške tasterom Esc."
+msgstr "Omogućava zatvaranje beleške tasterom Esc."
 
 #: ../data/tomboy.schemas.in.h:14
 msgid "Enable custom font"
-msgstr "Omogući poseban slovni lik"
+msgstr "Omogućava poseban slovni lik"
 
 #: ../data/tomboy.schemas.in.h:15
 msgid "Enable global keybindings"
-msgstr "Omogući prečice sa tastature"
+msgstr "Omogućava prečice sa tastature"
 
 #: ../data/tomboy.schemas.in.h:16
 msgid "Enable spellchecking"
-msgstr "Omogući proveru pravopisa"
+msgstr "Omogućava proveru pravopisa"
 
 #: ../data/tomboy.schemas.in.h:17
 msgid "Enable startup notes"
-msgstr "Omogući beleške pri pokretanju"
+msgstr "Omogućava beleške pri pokretanju"
 
 #: ../data/tomboy.schemas.in.h:18
 msgid "Enable the Delete Note confirmation dialog"
@@ -149,24 +158,24 @@ msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
 msgstr ""
-"Uključite opciju da bi omogućili automatsko pravljenje listi kada se ukuca „-“ "
-"ili „*“ na početku reda."
+"Uključite ovu opciju ako želite samostalno postavljanje označenih spiskova kada "
+"upišete - ili * na početku reda."
 
 #: ../data/tomboy.schemas.in.h:20
 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 ""
-"Uključite opciju da bi omogući da srednji klik na ikonicu Tomice ubaci sadržaj "
-"obeležen tekućim vremenom u belešku za početnu stranicu."
+"Uključite ovu opciju ako želite da srednjim klikom na ikonicu Tomice ubacite "
+"sadržaj obeležen tekućim vremenom u belešku za početnu stranicu."
 
 #: ../data/tomboy.schemas.in.h:21
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
 msgstr ""
-"Omogući ovu opciju za obeležavanje reči KojeIzgledajuOvako. Klik iznad reči "
-"će tada napraviti novu belešku sa tim imenom."
+"Uključite ovu opciju za obeležavanje reči KojeIzgledajuOvako. Klik na reč će "
+"napraviti novu belešku sa tim nazivom."
 
 #: ../data/tomboy.schemas.in.h:22
 msgid "FUSE Mounting Timeout (ms)"
@@ -174,24 +183,20 @@ msgstr "Vreme isteka FUSE montiranja (ms)"
 
 #: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export All Linked Notes"
-msgstr "HTML izvozi povezane beleške"
+msgstr "HTML izvoz svih povezanih beleški"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Poslednji direktorijum za HTML izvoz"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
-msgstr "Povezane beleške u HTML izvozu"
+msgstr "Povezane beleške HTML izvoza"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
 "Ukoliko isključite ovu opciju, prozorče za potvrdu brisanja beleške neće biti "
 "prikazano."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -199,7 +204,7 @@ msgstr ""
 "Ako je „enable_custom_font“ uključeno, biće korišćen ovde odabran skup "
 "slovnih likova pri prikazu beleški."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -207,12 +212,12 @@ msgstr ""
 "Ako je uključeno, sve otvorene beleške u trenutku gašenja Tomice će biti "
 "ponovo otvorene pri pokretanju."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
-"Ako je uključeno otvorena beleška može biti zatvorena pritiskom na tipku Esc."
+"Ako je uključeno otvorena beleška može biti zatvorena pritiskom na taster Esc."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -220,27 +225,27 @@ msgid ""
 msgstr ""
 "Ukoliko je uključeno, prikazaće se Tomičina ikonica u obaveštajnoj zoni "
 "panela. Isključivanje ove opcije je korisno ukoliko neki drugi program "
-"obezbedi obaveštajnu ikonicu."
+"obezbeđuje obaveštajnu ikonicu."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
 msgstr ""
-"Ako je uključeno, neispravno napisane reči će biti crveno podvučene, sa "
-"predlozima koji se pojavljuju u meniju po desnom kliku na reč."
+"Ako je uključeno, neispravno napisane reči će biti podvučene crvenom bojom, a "
+"predlozi ispravno napisane reči se prikazuju u izborniku desnog klika."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
 "available from any application."
 msgstr ""
-"Ako je uključeno, globalne prečice postavljene u „/apps/tomboy“ će biti "
-"omogućene, što daje mogućnost da se nekim korisnim akcijama Tomičinih "
-"beleški pristupa iz drugih programa."
+"Ako je uključeno, globalne prečice postavljene u „/apps/"
+"tomboyglobal_keybindings“ će biti omogućene, što daje mogućnost da se nekim "
+"korisnim akcijama Tomičinih beleški pristupa iz drugih programa."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -249,35 +254,35 @@ msgstr ""
 "„custom_font_face“ pri prikazu beleški, inače podrazumevani slovni lik će "
 "biti korišćen."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
 msgstr ""
-"Ukazuje da uvoz gnomovih beleški nije pokrenut, i da treba biti pokrenut pri "
-"sledećem Tomičinom pokretanju."
+"Ukazuje da dodatak Uvoznik Gnomovih beleški nije pokrenut, i da treba biti "
+"samostalno pokrenut pri sledećem pokretanju Tomice."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr ""
-"Ceo broj koji određuje minimalni broj beleški koje će biti prikazane u "
-"meniju."
+"Ceo broj koji određuje najmanji broj beleški koje će biti prikazane u "
+"izborniku beleški."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
 "autosync is disabled. The lowest acceptable positive value is 5. Value is in "
 "minutes."
 msgstr ""
-"Ceo broj koji određuje koliko često da se izvršava sinhronizacija vaših "
-"beleški u pozadini (ako se ona koristi). Svaka vrednost manja od 1 znači da "
-"je sinhronizacija isključena. Najmanja prihvatljiva vrednost je 5. Vrednost je "
-"u minutima."
+"Ceo broj koji određuje koliko često će se izvršavati usklađivanje vaših "
+"beleški u pozadini (ako se koristi). Svaka vrednost manja od 1 znači da je "
+"usklađivanje isključeno. Najmanja prihvatljiva vrednost je 5. Vrednost je u "
+"minutima."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -285,12 +290,12 @@ msgid ""
 "wishes to be prompted when a conflict occurs, so that they may handle each "
 "conflict situation on a case-by-case basis."
 msgstr ""
-"Ceo broj koji određuje ponašanje pri detektovanom sukobu umesto da se o tome "
-"pita korisnik. Vrednosti se preslikavaju na internu numeraciju ponašanja. "
-"Vrednost „0“ određuje da treba pitati korisnika tako da se problemi rešavaju "
-"od slučaja do slučaja."
+"Ceo broj koji određuje ponašanje pri otkrivenom sukobu umesto da se o tome "
+"pita korisnik. Vrednosti se preslikavaju na unutrašnje numerisanje. Vrednost "
+"„0“ određuje da treba pitati korisnika tako da se problemi rešavaju od "
+"slučaja do slučaja."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -302,15 +307,19 @@ msgid ""
 msgstr ""
 "Ceo broj koji određuje da li je poželjno da se uvek primenjuje neko određeno "
 "ažuriranje veza kada se beleška preimenuje, umesto da se pita korisnik. "
-"Brojevi imaju svoju internu predstavu. 0 — znači da korisnik želi da bude "
-"pitan kada se preimenuje beleška koja ima druge beleške koje imaju veze ka "
-"njoj. 1 — znači da se sve veze automatski uklanjaju. 2 — znači da tekst veze "
-"treba ažurirati na novo ime beleške tako da veza ka preimenovanoj belešci "
-"nastavi da postoji."
+"Vrednosti se preslikavaju na unutrašnje numerisanje. 0 — znači da korisnik "
+"želi da bude pitan kada preimenovanje beleške može da utiče na veze koje "
+"postoje u ostalim beleškama. 1 — znači da se sve veze automatski uklanjaju. 2 "
+"— znači da tekst veze treba ažurirati na novo ime beleške tako da veza ka "
+"preimenovanoj belešci nastavi da postoji."
+
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Poslednji direktorijum korišćen u HTML izvozu"
 
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
-msgstr "Ponašanje za ažuriranje veza pri preimenovanju beleške"
+msgstr "Ponašanje ažuriranja veza pri preimenovanju beleške"
 
 #: ../data/tomboy.schemas.in.h:40
 msgid "List of pinned notes."
@@ -321,16 +330,16 @@ msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
 msgstr ""
-"Maksimalni broj karaktera iz naslova beleške koji se prikazuju u ikonici "
-"panela ili u meniju panela."
+"Najveći broj znakova naslova beleške koji se prikazuju u ikonici panela ili "
+"u izborniku programčeta panela."
 
 #: ../data/tomboy.schemas.in.h:42
 msgid "Maximum note title length to show in tray menu."
-msgstr "Minimalna dužina naslova beleške za prikazivanje u meniju panela."
+msgstr "Najmanja dužina naslova beleške za prikazivanje u izborniku panela."
 
 #: ../data/tomboy.schemas.in.h:43
 msgid "Minimum number of notes to show in menu"
-msgstr "Minimalan broj beleški za prikaz u meniju"
+msgstr "Najmanji broj beleški za prikaz u izborniku"
 
 #: ../data/tomboy.schemas.in.h:44
 msgid "Note Synchronization Conflict Saved Behavior"
@@ -338,15 +347,15 @@ msgstr "Ponašanje u slučaju sukoba pri usklađivanju beleški"
 
 #: ../data/tomboy.schemas.in.h:45
 msgid "Open Recent Changes"
-msgstr "Otvori skorašnje izmene"
+msgstr "Otvaranje skorašnjih izmena"
 
 #: ../data/tomboy.schemas.in.h:46
 msgid "Open Search Dialog"
-msgstr "Otvori prozorče za pretragu"
+msgstr "Otvaranje prozorčeta za pretragu"
 
 #: ../data/tomboy.schemas.in.h:47
 msgid "Open Start Here"
-msgstr "Otvori početnu stanicu"
+msgstr "Otvaranje početne stanice"
 
 #: ../data/tomboy.schemas.in.h:48
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
@@ -378,20 +387,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS adresa za udaljeno usklađivanje"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Sačuvana visina prozora za pretragu"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Sačuvana visina prozora „Traži kroz sve beleške“"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Sačuvana horizontalna pozicija prozora za pretragu"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Sačuvan vodoravni položaj prozora „Traži kroz sve beleške“"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Sačuvana vertikalna pozicija prozora za pretragu"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Sačuvan uspravni položaj prozora „Traži kroz sve beleške“"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Sačuvana širina prozora za pretragu"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Sačuvana širina prozora „Traži kroz sve beleške“"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -403,7 +412,7 @@ msgstr "Izaberite da bi bilo uključeno"
 
 #: ../data/tomboy.schemas.in.h:60
 msgid "Show applet menu"
-msgstr "Prikaži meni programčeta"
+msgstr "Prikazivanje izbornika programčeta"
 
 #: ../data/tomboy.schemas.in.h:61
 msgid "Start Here Note"
@@ -411,19 +420,19 @@ msgstr "Beleška za početnu stanicu"
 
 #: ../data/tomboy.schemas.in.h:62
 msgid "Sticky Note Importer First Run"
-msgstr "Uvoz gnomovih beleški"
+msgstr "Prvo pokretanje Uvoza Gnomovih beleški"
 
 #: ../data/tomboy.schemas.in.h:63
 msgid "Synchronization Client ID"
-msgstr "ID klijenta za servis usklađivanja"
+msgstr "IB klijenta usklađivanja"
 
 #: ../data/tomboy.schemas.in.h:64
 msgid "Synchronization Local Server Path"
-msgstr "Lokalna putanja do servera za usklađivanje"
+msgstr "Lokalna putanja do servera usklađivanja"
 
 #: ../data/tomboy.schemas.in.h:65
 msgid "The date format that is used for the timestamp."
-msgstr "Format datuma za oznaku vremena."
+msgstr "Oblik datuma korišćenog za oznaku vremena."
 
 #: ../data/tomboy.schemas.in.h:66
 msgid ""
@@ -437,8 +446,8 @@ msgstr ""
 "Globalna prečica za otvaranje i prikaz nove beleške. Format polja je kao „<"
 "Control>a“ ili „<Shift><Alt>F1“. Format je dosta slobodan i "
 "dozvoljava mala ili velika slova kao i skraćenice poput „<Ctl>\"i \"<"
-"Ctrl>“. Ako postavite ovu opciju na posebnu vrednost „disabled“,tada neće "
-"postojati prečica za ovu akciju."
+"Ctrl>“. Ako postavite ovu opciju na posebnu vrednost „disabled“ — "
+"isključeno,tada neće postojati prečica za ovu akciju."
 
 #: ../data/tomboy.schemas.in.h:67
 msgid ""
@@ -453,7 +462,7 @@ msgstr ""
 "„<Control>a“ ili „<Shift><Alt>F1“. Format je dosta "
 "slobodan i dozvoljava mala ili velika slova kao i skraćenice poput „<"
 "Ctl>“ i „<Ctrl>“. Ako postavite ovu opciju na posebnu vrednost "
-"„disabled“,tada neće postojati prečica za ovu akciju."
+"„disabled“ — isključeno,tada neće postojati prečica za ovu akciju."
 
 #: ../data/tomboy.schemas.in.h:68
 msgid ""
@@ -468,7 +477,7 @@ msgstr ""
 "„<Control>a“ ili „<Shift><Alt>F1“. Format je dosta "
 "slobodan i dozvoljava mala ili velika slova kao i skraćenice poput „<"
 "Ctl>“i „<Ctrl>“. Ako postavite ovu opciju na posebnu vrednost "
-"„disabled“,tada neće postojati prečica za ovu akciju."
+"„disabled“ — isključeno,tada neće postojati prečica za ovu akciju."
 
 #: ../data/tomboy.schemas.in.h:69
 msgid ""
@@ -483,7 +492,7 @@ msgstr ""
 "je kao „<Control>a“ ili „<Shift><Alt>F1“. Format je dosta "
 "slobodan i dozvoljava mala ili velika slova kao i skraćenice poput „<"
 "Ctl>“ i „<Ctrl>“. Ako postavite ovu opciju na posebnu vrednost "
-"„disabled“,tada neće postojati prečica za ovu akciju."
+"„disabled“ — isključeno,tada neće postojati prečica za ovu akciju."
 
 #: ../data/tomboy.schemas.in.h:70
 msgid ""
@@ -497,19 +506,19 @@ msgstr ""
 "Globalna prečica za prikaz menija programčeta. Format polja je kao „<"
 "Control>a“ ili „<Shift><Alt>F1“. Format je dosta slobodan i "
 "dozvoljava mala ili velika slova kao i skraćenice poput „<Ctl>“ i „<"
-"Ctrl>“. Ako postavite ovu opciju na posebnu vrednost „disabled“,tada neće "
-"postojati prečica za ovu akciju."
+"Ctrl>“. Ako postavite ovu opciju na posebnu vrednost „disabled“ — "
+"isključeno,tada neće postojati prečica za ovu akciju."
 
 #: ../data/tomboy.schemas.in.h:71
 msgid "The handler for \"note://\" URLs"
-msgstr "Program za prihvatanje „note://“ URL adresa"
+msgstr "Rukovalac „note://“ adresa"
 
 #: ../data/tomboy.schemas.in.h:72
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
-"Poslednji direktorijum u koji je beleška izvezena kroz dodatak za izvoz u "
-"HTML."
+"Poslednji direktorijum u koji je beleška izvezena koristeći dodatak za izvoz "
+"u HTML."
 
 #: ../data/tomboy.schemas.in.h:73
 msgid ""
@@ -536,8 +545,9 @@ msgid ""
 "which is always placed at the bottom of the Tomboy note menu and also "
 "accessible by hotkey."
 msgstr ""
-"URI beleške koja će biti smatrana beleškom za „Početnu stanicu“, koja se "
-"uvek nalazi na dnu menija u Tomici i dostupna je preko prečice sa tastature."
+"Adresa beleške koja će biti smatrana beleškom za „Početnu stanicu“, koja se "
+"uvek nalazi na dnu izbornika u Tomici i dostupna je preko prečice sa "
+"tastature."
 
 #: ../data/tomboy.schemas.in.h:76
 msgid ""
@@ -554,7 +564,7 @@ msgid ""
 "mount a sync share."
 msgstr ""
 "Vreme (u milisekundama) koje Tomičine beleške čekaju na odgovor kada se "
-"koristi FUSE da se montira deljena fascikla.za usklađivanje."
+"koristi FUSE za montiranje deljena fascikla za usklađivanje."
 
 #: ../data/tomboy.schemas.in.h:78
 msgid "Timestamp format"
@@ -611,7 +621,7 @@ msgstr "_Nova"
 
 #: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
 msgid "Create a new note"
-msgstr "Napravi novu belešku"
+msgstr "Napravite novu belešku"
 
 #: ../Tomboy/ActionManager.cs:134
 msgid "_Open..."
@@ -619,7 +629,7 @@ msgstr "_Otvori..."
 
 #: ../Tomboy/ActionManager.cs:135
 msgid "Open the selected note"
-msgstr "Otvori odabranu belešku"
+msgstr "Otvorite odabranu belešku"
 
 #: ../Tomboy/ActionManager.cs:138
 msgid "_Delete"
@@ -627,15 +637,15 @@ msgstr "_Obriši"
 
 #: ../Tomboy/ActionManager.cs:139
 msgid "Delete the selected note"
-msgstr "Obriši odabranu belešku"
+msgstr "Obrišite odabranu belešku"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "_Zatvori"
 
 #: ../Tomboy/ActionManager.cs:143
 msgid "Close this window"
-msgstr "Zatvori ovaj prozor"
+msgstr "Zatvorite ovaj prozor"
 
 #: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
 msgid "_Quit"
@@ -673,7 +683,7 @@ msgstr "Ikonica u panelu"
 msgid "Create _New Note"
 msgstr "Napravi _novu belešku"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_Traži kroz sve beleške"
 
@@ -685,11 +695,22 @@ msgstr "Otvori prozor za pretragu kroz sve beleške"
 msgid "Start synchronizing notes"
 msgstr "Započni usklađivanje beleški"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Napredno"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Najmanji broj beleški za prikazivanje u spisku skorašnjih (najviše 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "Šta vodi ovamo?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(ništa)"
 
@@ -698,8 +719,9 @@ msgid ""
 "You can use any bugzilla just by dragging links into notes.  If you want a "
 "special icon for certain hosts, add them here."
 msgstr ""
-"Možeš koristiti bilo koju bubaždaju prevlačenjem veze ka stranici u belešku. "
-"Ako želiš posebnu ikonicu za određene adrese, dodaj ih ovde."
+"Možete koristiti bilo koju bubaždaju jednostavnim prevlačenjem veze ka "
+"stranici u belešku. Ako želite posebnu ikonicu za određene adrese, dodajte "
+"ih ovde."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
 msgid "Host Name"
@@ -724,7 +746,8 @@ msgstr "Nije navedena adresa računara"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
 msgid "You must specify the Bugzilla host name to use with this icon."
-msgstr "Moraš navesti adresu računara Bubaždaje za korišćenje sa ovom ikonicom."
+msgstr ""
+"Morate navesti adresu računara Bubaždaje za korišćenje sa ovom ikonicom."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
 msgid "Error saving icon"
@@ -736,11 +759,31 @@ msgstr "Ne mogu da sačuvam datoteku sa ikonicom."
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
-msgstr "Zaista želiš da obrišeš ovu ikonicu?"
+msgstr "Zaista želite da obrišete ovu ikonicu?"
 
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
 msgid "If you remove an icon it is permanently lost."
-msgstr "Ako je obrišeš ona će zauvek biti izgubljena."
+msgstr "Ako je obrišete ona će zauvek biti izgubljena."
+
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Ne mogu da otvorim e-poštu"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Odredište izvoza u HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Izvezi povezane beleške"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Uključi sve druge povezane beleške"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
@@ -749,17 +792,21 @@ msgstr "Izvezi u HTML"
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
-msgstr "Tvoja beleška je izvezena u „{0}“."
+msgstr "Vaša beleška je izvezena u „{0}“."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
 msgid "Note exported successfully"
 msgstr "Beleška je uspešno izvezena"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "Pristup nije dozvoljen."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "Fascikla ne postoji."
 
@@ -768,22 +815,6 @@ msgstr "Fascikla ne postoji."
 msgid "Could not save the file \"{0}\""
 msgstr "Ne mogu da sačuvam datoteku „{0}“"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Odredište izvoza u HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Izvezi povezane beleške"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Uključi sve druge povezane beleške"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Ne mogu da otvorim e-poštu"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Putanja fascikle:"
@@ -792,22 +823,22 @@ msgstr "_Putanja fascikle:"
 msgid "Select Synchronization Folder..."
 msgstr "Odaberi fasciklu za usklađivanje..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "Polje za putanju fascikle je prazno."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "Navedena putanja fascikle ne postoji, a Tomica ne može da je napravi."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "Lokalna fascikla"
 
 #: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
 msgid "Fixed Wid_th"
-msgstr "_Fiksna širina"
+msgstr "Stalna _širina"
 
 #: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
 #, csharp-format
@@ -864,11 +895,11 @@ msgstr "Sastanci"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"Promeni belešku „<span weight=\"bold\">Danas: šablon</span>“ da prilagodiš "
-"tekst koji imaju nove beleške dana."
+"Izmenite belešku „<b>Danas: šablon</b>“ da prilagodite tekst koji imaju nove "
+"beleške dana."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -893,26 +924,31 @@ msgstr "Stranica {0} od {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd dd.MM.yyyy, hh:mm:ss tt"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Ukloni oštećene veze"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Dodaj crtež"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rver:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "_Korisničko ime:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "_Putanja fascikle (neobavezno):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -920,49 +956,54 @@ msgstr ""
 "SSH usklađivanje zahteva postojeći ključ za server i da korisnik bude pridodat "
 "pokrenutom SSH demonu."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "Server ili korisničko ime su prazni."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs kroz FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
 msgstr ""
-"Vremenski rok za povezivanje sa serverom. Uveri se da je tvoj SSH ključ "
+"Vremenski rok za povezivanje sa serverom. Uverite se da je vaš SSH ključ "
 "pridodat pokrenutom SSH demonu."
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
 msgid "Import from Sticky Notes"
-msgstr "Uvezi gnomove beleške"
+msgstr "Uvezi Gnomove beleške"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:133
 msgid "No Sticky Notes found"
-msgstr "Nisu pronađene gnomove beleške"
+msgstr "Nisu pronađene Gnomove beleške"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
 #, csharp-format
 msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "Nije pronađena pogodna datoteka gnomovih beleški u „{0}“."
+msgstr "Nije pronađena pogodna datoteka Gnomovih beleški u „{0}“."
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
 msgid "Sticky Notes import completed"
-msgstr "Uvoz gnomovih beleški je završen"
+msgstr "Uvoz Gnomovih beleški je završen"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "Uspešno uvezene gnomove beleške: <b>{0}</b> od <b>{1}</b>"
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "Uspešno uvezene Gnomove beleške: <b>{0}</b> od <b>{1}</b>"
+msgstr[1] "Uspešno uvezene Gnomove beleške: <b>{0}</b> od <b>{1}</b>"
+msgstr[2] "Uspešno uvezene Gnomove beleške: <b>{0}</b> od <b>{1}</b>"
+msgstr[3] "Uspešno uvezene gnomove beleške: <b>{0}</b> od <b>{1}</b>"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "Bez naslova"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "Gnomova beleška: "
 
@@ -986,23 +1027,23 @@ msgstr "--- Program Zadačići nije pokrenut ---"
 msgid "_Underline"
 msgstr "Podv_učeno"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
-msgstr "_URL:"
+msgstr "_Adresa:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
-msgstr "URL, korisničko ime ili lozinka su prazni."
+msgstr "Adresa, korisničko ime ili lozinka su prazni."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "Veb fascikla (wdfs kroz FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "VebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -1015,65 +1056,159 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Snimanje postavki u Gnomov privezak za ključeve nije uspelo, uz sledeću poruku:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Veb Tomica"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
-msgstr "Povezujem se sa serverom"
+msgstr "Poveži se sa serverom"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
 msgid "Connected"
 msgstr "Povezan"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "Server ne odgovora. Pokušajte kasnije."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "Nije uspelo prijavljivanje, pokušajte ponovo"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Veb Tomica je prijavljen"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
 msgstr ""
 "Vratite se u prozor „Postavke“ i kliknite „Snimi“ da započnete usklađivanje."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Povezan. Kliknite „Snimi“ da započnete usklađivanje"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Prijava iz Internet preglednika (kliknite da resetujete vezu)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "Postavite podrazumevani internet preglednik i pokušajte ponovo"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Veb Tomica"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Izvezi sve beleške u {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Započni izvoz beleški u {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Izvezi odabranu svesku u {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Započni izvoz sveske u {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "Ala_ti"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Izvezi"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Izvezite vaše beleške."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Izvezi sve beleške u {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Izvezi odabranu svesku u {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Izvoz svih {0} beleški"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Ne mogu da izvezem, pristup je odbijen."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Ne mogu da izvezem, fascikla ne postoji."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Ne mogu da izvezem: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Nepoznata greška."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Nepopunjene beleške"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Vaše beleške su izvežene u „{0}“."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Beleška je uspešno izvežena"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Ne mogu da sačuvam datoteku u „{0}“"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Napravi odredišnu fasciklu za {0} izvoz"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "Traži kroz sve beleške"
 
@@ -1126,26 +1261,6 @@ msgstr "Ime je već zauzeto"
 msgid "C_reate"
 msgstr "_Nova"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Šablon za svesku „{0}“"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Sve beleške"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Nepopunjene beleške"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "_Sveske"
@@ -1185,15 +1300,35 @@ msgid "Delete the selected notebook"
 msgstr "Obriši odabranu svesku"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "Sveske"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Šablon za svesku „{0}“"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nova beleška"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Sve beleške"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
-msgstr "Zaista želiš da obrišeš ovu svesku?"
+msgstr "Zaista želite da obrišete ovu svesku?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1212,25 +1347,31 @@ msgstr "Nema sveski"
 #: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
 #, csharp-format
 msgid "New \"{0}\" Note"
-msgstr "„{0}“: nova beleška"
+msgstr "{0} — nova beleška"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "Spremi belešku u svesku"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "Sveska"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "_Nova sveska..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Zaista želiš da obrišeš ovu belešku?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "{0}. beleška"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Stvarno da obrišem „{0}“?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
@@ -1239,11 +1380,11 @@ msgstr[1] "Zaista želite da obrišete ove {0} beleške?"
 msgstr[2] "Zaista želite da obrišete ovih {0} beleški?"
 msgstr[3] "Zaista želite da obrišete ovu {0} belešku?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "Ako je obrišete ona će zauvek biti izgubljena."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1254,13 +1395,13 @@ msgstr ""
 "prostora na disku i da imate prava upisa u fasciklu {0}. Detalji o grešci su "
 "zapisani u {1}."
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "Greška pri čuvanju podataka beleške."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "Šablon nove beleške"
 
@@ -1383,7 +1524,7 @@ msgstr ""
 "njoj će automatski biti napravljena.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "Početna stanica"
 
@@ -1391,14 +1532,9 @@ msgstr "Početna stanica"
 msgid "Using Links in Tomboy"
 msgstr "Korišćenje veza u Tomici"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "{0}. beleška"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "Ovde opišite vašu misao."
 
@@ -1462,139 +1598,164 @@ msgstr "_Nikad ne preimenuj veze"
 msgid "Alwa_ys rename links"
 msgstr "_Uvek preimenuj veze"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "Traži unutar beleške"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "_Veza na novu belešku"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "Te_kst"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "_Traži unutar beleške"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "Zatvori sv_e beleške"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "Pretraga"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Traži u beleškama (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Potražite vaše beleške"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "Veza"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Poveži odabrani tekst na novu belešku (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Poveži odabrani tekst na novu belešku"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "Te_kst"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "Postavi osobine teksta"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "Ala_ti"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "Koristi alate"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "Obriši ovu belešku"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Uskladi beleške"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"Ova beleška je beleška šablona. Ona ondređuje osnovni sadržaj običnih "
+"beleški, i neće biti prikazana u izborniku beleški ili u prozoru za pretragu."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Pretvori u običnu belešku"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Veličina _čuvanja"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Sačuvaj _izbor"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Naslov beleške"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
-msgstr "Tra_ži...:"
+msgstr "_Traži...:"
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "Traži _naredno"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "Traži _prethodno"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "Ne mogu da napravim belešku"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "Pretra_ži:"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "_Prethodna"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "_Sledeća"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "_Podebljano"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "_Iskošeno"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "Pre_crtano"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "_Podvučeno"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "Veličina slova"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "_Normalna"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "O_gromna"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "Ve_lika"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "_Mala"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "Povećaj veličinu fonta"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "Smanji veličinu fonta"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "Lista sa tačkicama"
 
@@ -1614,73 +1775,73 @@ msgstr "Usklađivanje"
 msgid "Add-ins"
 msgstr "Dodaci"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "Proveri pravopi_s tokom kucanja"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr ""
-"Neispravno napisane reči će biti crveno podvučene, sa predlozima koji se "
-"pojavljuju u meniju po desnom kliku na reč."
+"Neispravno napisane reči će biti podvučene crvenom bojom, sa predlozima "
+"ispravnog pisanja prikazanih u priručnom izborniku."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "Označi _VikiReči"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
 msgstr ""
-"Omogući opciju za obeležavanje reči <b>KojeIzgledajuOvako</b>. Klik iznad "
+"Omogućite opciju za obeležavanje reči <b>KojeIzgledajuOvako</b>. Klik iznad "
 "reči će tada napraviti novu belešku sa tim imenom."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "Omogući automatske _liste"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "Koristi poseban _slovni lik"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "Kada se preimenuje beleška na koju druge beleške imaju vezu:"
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "Pitaj me šta da radim"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "Nikad ne preimenuj veze"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "Uvek preimenuj veze"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr ""
 "Koristi šablon nove beleške za određivanje početnog teksta u novim beleškama"
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "Otvori šablon nove beleške"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "Reaguj na _prečice"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1690,82 +1851,82 @@ msgstr ""
 "prečica: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "Prikaz _menija sa beleškama"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "Otvori „Početnu _stranicu“"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "Napravi _novu belešku"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "Z_apočni pretragu kroz sve beleške"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "Ser_vis:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "Nije podesivo"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Automatski usaglasi beleške svakih"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "minuta"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Napredno..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "Sledeći dodaci su instalirani"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Nabavi još dodataka..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "_Uključi"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "_Isključi"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "Još nije napravljeno"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Postavke za {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "Odaberi slovni lik za beleške"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "Ostale opcije usklađivanja"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1773,23 +1934,23 @@ msgstr ""
 "Kada se dogodi sukob između lokalni beleške i beleške na odabranom serveru "
 "za usklađivanje:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "Uvek me pitaj šta da uradiš."
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "Preimenuj moju lokalnu belešku."
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "Zameni moju lokalnu belešku onom sa servera."
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "UPOZORENJE: Sigurno ovo želite?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Da li ste sigurni?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1797,76 +1958,80 @@ msgstr ""
 "Uklanjanje postavki za usklađivanje nije preporučeno. Može se dogoditi da moraš "
 "ponovo da uskladite sve vaše beleške kada sačuvate nove postavke."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "Ponovo postavi postavke za usklađivanje"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "Podešeni servis za usklađivanje je onemogućen. Vaše postavke za usklađivanje "
 "će sada biti obrisane. Može se dogoditi da ćete morati ponovo da uskladite "
 "sve vaše beleške kada sačuvate nove postavke."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Uspeh! Povezani smo!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Veza je uspostavljena"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomica je spreman da uskladi beleške. Želite li da ih uskladite sada?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"Nažalost nešto je pošlo naopako. Proverite informacije i pokušajte ponovo. "
-"Sadržaj iz {0} takođe može biti koristan."
+"Proverite vaše podatke i pokušajte ponovo.  Datoteka dnevnika {0} može da "
+"sadrži više podataka o grešci."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Greška pri povezivanju :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Greška u povezivanju"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "Verzija:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "Prava:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "Međuzavisnosti dodatka:"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "Pretra_ži:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "Beleška"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "Poslednja izmena"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "Poklapanja"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Poklapanje naslova"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
@@ -1875,7 +2040,7 @@ msgstr[1] "({0} poklapanja)"
 msgstr[2] "({0} poklapanja)"
 msgstr[3] "({0} poklapanje)"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
@@ -1884,7 +2049,7 @@ msgstr[1] "Ukupno: {0} beleške"
 msgstr[2] "Ukupno: {0} beleški"
 msgstr[3] "Ukupno: {0} beleška"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
@@ -1893,270 +2058,59 @@ msgstr[1] "Pronađeno: {0} beleške"
 msgstr[2] "Pronađeno: {0} beleški"
 msgstr[3] "Ukupno: {0} beleška"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Nisu pronađeni rezultati u izabranoj svesci.\n"
+"Kliknite ovde da potražite u svim beleškama."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Kliknite ovde da potražite u svim sveskama"
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "Beleške"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Ne mogu da napravim novu belešku"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Ovaj dodatak za usklađivanje nije podržan na vašem računaru. Proverite da li "
+"su FUSE i {0} ispravno instalirani i podešeni."
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Glavni razvoj:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Ne mogu da čitam datoteku testa."
 
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "Doprinosioci:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Test pisanja nije uspeo."
 
-#: ../Tomboy/Tomboy.cs:405
-msgid "translator-credits"
-msgstr ""
-"Goran Rakić <grakic at devbase.net>\n"
-"Branko Kokanović <branko.kokanovic at gmail.com>\n"
-"\n"
-"http://prevod.org — prevod na srpski jezik."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Isteklo je vreme za povezivanje sa serverom."
 
-#: ../Tomboy/Tomboy.cs:414
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Autorska prava © 2004-2007 Alex Graveley\n"
-"Autorska prava © 2004-2010 Ostali\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Greška pri povezivanju sa serverom."
 
-#: ../Tomboy/Tomboy.cs:416
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Jednostavan i zgodan programčić za hvatanje beleški"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "FUSE ne može biti omogućen."
 
-#: ../Tomboy/Tomboy.cs:426
-msgid "Homepage"
-msgstr "Veb stranica"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Dogodila se greška pri povezivanju sa navedenim serverom:"
 
-#: ../Tomboy/Tomboy.cs:544
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomica: Jednostavno programče za hvatanje beleški.\n"
-"Autorska prava (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:556
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Upotreba:\n"
-"  --version\t\t\tPrikaži informacije o verziji.\n"
-"  --help\t\t\tPrikaži ovaj tekst pomoći.\n"
-"  --note-path [putanja]\t\tUčitaj/snimi podatke o beleškama iz/u "
-"direktorijum.\n"
-"  --search [tekst]\t\tTraži uneti tekst kroz sve beleške u prozoru za "
-"pretragu.\n"
-
-#: ../Tomboy/Tomboy.cs:566
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tNapravi i prikaži novu belešku.\n"
-"  --new-note [naslov]\t\tNapravi i prikaži novu belešku, uz naslov.\n"
-"  --open-note [naslov/url]\tPrikaži postojeću belešku koja se poklapa sa "
-"naslovom.\n"
-"  --start-here\t\t\tPrikaži belešku „Početna stanica“.\n"
-"  --highlight-search [tekst]\tPronađi i obeleži tekst u otvorenoj beleški.\n"
-
-#: ../Tomboy/Tomboy.cs:580
-#, csharp-format
-msgid "Version {0}"
-msgstr "Verzija {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nova)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_O Tomici"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"„Uputstvo za Tomičine beleške“ nije pronađeno.  Proverite da li je "
-"instalacija programa prošla uspešno."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Pomoć nije pronađena"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Ne mogu da otvorim lokaciju"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Danas, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Danas"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Juče, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Juče"
-
-# bug(goran): plural!
-# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Pre {0} dana, {1}"
-msgstr[1] "Pre {0} dana, {1}"
-msgstr[2] "Pre {0} dana, {1}"
-msgstr[3] "Pre {0} dana, {1}"
-
-# bug(goran): plural!
-# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Pre {0} dan"
-msgstr[1] "Pre {0} dana"
-msgstr[2] "Pre {0} dana"
-msgstr[3] "Pre {0} dan"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Sutra, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Sutra"
-
-# bug(goran): plural!
-# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Kroz {0} dan, {1}"
-msgstr[1] "Kroz {0} dana, {1}"
-msgstr[2] "Kroz {0} dana, {1}"
-msgstr[3] "Kroz {0} dan, {1}"
-
-# bug(goran): plural!
-# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Kroz {0} dan"
-msgstr[1] "Kroz {0} dana"
-msgstr[2] "Kroz {0} dana"
-msgstr[3] "Kroz {0} dan"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d. MMMM, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d. MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Bez datuma"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d. MMMM yyyy, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d. MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Bez naslova {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Beleška <b>{0}</b> već postoji. Odaberite drugo ime za ovu belešku pre nego "
-"što nastavite dalje."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Naslov beleške je zauzet"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Umnoži adresu veze"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Otvori vezu"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"Ovaj dodatak za usklađivanje nije podržan na vašem računaru. Proverite da li "
-"su FUSE i {0} ispravno instalirani i podešeni."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Ne mogu da čitam datoteku testa."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Test pisanja nije uspeo."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Isteklo je vreme za povezivanje sa serverom."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Greška pri povezivanju sa serverom."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "FUSE ne može biti omogućen."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Dogodila se greška pri povezivanju sa navedenim serverom:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Detalji"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Detalji"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2356,10 +2310,6 @@ msgstr ""
 "Verzija beleške „{0}“ sa servera je u sukobu sa lokalnom beleškom. Šta "
 "želite da učinite sa vašom lokalnom beleškom?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "Ala_ti"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2393,6 +2343,250 @@ msgstr ""
 "Da izbegnete ovo prozorče u budućnosti, treba da učitate FUSE pri pokretanju. "
 "Dodajte „modprobe fuse“ u /etc/init.d/boot.local ili „fuse“ u /etc/modules."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Ne mogu da napravim novu belešku"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Glavni razvoj:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Doprinosioci:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Goran Rakić <grakic at devbase.net>\n"
+"Branko Kokanović <branko.kokanovic at gmail.com>\n"
+"\n"
+"http://prevod.org — prevod na srpski jezik."
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Autorska prava © 2004-2007 Alex Graveley\n"
+"Autorska prava © 2004-2011 Ostali\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Jednostavan i zgodan programčić za hvatanje beleški"
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Veb stranica"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomica: Jednostavno programče za hvatanje beleški.\n"
+"Autorska prava (C) 2004-2007 Alex Graveley <alex at beatniksoftware.com>\n"
+"\n"
+"Autorska prava © 2004-2011 Ostali\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Upotreba:\n"
+"  --version\t\t\tPrikaži informacije o verziji.\n"
+"  --help\t\t\tPrikaži ovaj tekst pomoći.\n"
+"  --note-path [putanja]\t\tUčitaj/snimi podatke o beleškama iz/u "
+"direktorijum.\n"
+"  --search [tekst]\t\tTraži uneti tekst kroz sve beleške u prozoru za "
+"pretragu.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tNapravi i prikaži novu belešku.\n"
+"  --new-note [naslov]\t\tNapravi i prikaži novu belešku, uz naslov.\n"
+"  --open-note [naslov/url]\tPrikaži postojeću belešku koja se poklapa sa "
+"naslovom.\n"
+"  --start-here\t\t\tPrikaži belešku „Početna stanica“.\n"
+"  --highlight-search [tekst]\tPronađi i obeleži tekst u otvorenoj beleški.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Verzija {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nova)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_O Tomici"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"„Uputstvo za Tomičine beleške“ nije pronađeno.  Proverite da li je "
+"instalacija programa prošla uspešno."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Pomoć nije pronađena"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Ne mogu da otvorim lokaciju"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Danas, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Danas"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Juče, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Juče"
+
+# bug(goran): plural!
+# http://bugzilla.gnome.org/show_bug.cgi?id=476061
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Pre {0} dana, {1}"
+msgstr[1] "Pre {0} dana, {1}"
+msgstr[2] "Pre {0} dana, {1}"
+msgstr[3] "Pre {0} dana, {1}"
+
+# bug(goran): plural!
+# http://bugzilla.gnome.org/show_bug.cgi?id=476061
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Pre {0} dan"
+msgstr[1] "Pre {0} dana"
+msgstr[2] "Pre {0} dana"
+msgstr[3] "Pre {0} dan"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Sutra, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Sutra"
+
+# bug(goran): plural!
+# http://bugzilla.gnome.org/show_bug.cgi?id=476061
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Kroz {0} dan, {1}"
+msgstr[1] "Kroz {0} dana, {1}"
+msgstr[2] "Kroz {0} dana, {1}"
+msgstr[3] "Kroz {0} dan, {1}"
+
+# bug(goran): plural!
+# http://bugzilla.gnome.org/show_bug.cgi?id=476061
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Kroz {0} dan"
+msgstr[1] "Kroz {0} dana"
+msgstr[2] "Kroz {0} dana"
+msgstr[3] "Kroz {0} dan"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d. MMMM, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d. MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Bez datuma"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d. MMMM yyyy, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d. MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Bez naslova {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Beleška <b>{0}</b> već postoji. Odaberite drugo ime za ovu belešku pre nego "
+"što nastavite dalje."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Naslov beleške je zauzet"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Umnoži adresu veze"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Otvori vezu"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Poslednji direktorijum za HTML izvoz"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs kroz FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "Veb fascikla (wdfs kroz FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Zaista želiš da obrišeš ovu belešku?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Traži u beleškama (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Uspeh! Povezani smo!"
+
 #~ msgid "_Browse..."
 #~ msgstr "_Razgledaj..."
 
@@ -2619,9 +2813,6 @@ msgstr ""
 #~ msgid "_Search..."
 #~ msgstr "Pretra_ži"
 
-#~ msgid "S_earch notes"
-#~ msgstr "Pretra_ži beleške"
-
 #~ msgid "Table of Contents"
 #~ msgstr "Sadržaj"
 
diff --git a/po/ta.po b/po/ta.po
index 8e2d96a..d2a2536 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,7 +5,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Felix <ifelix at redhat.com>, 2006.
-# Dr.T.Vasudevan <agnihot3 at gmail.com>, 2007, 2008, 2009, 2010.
+# Dr.T.Vasudevan <agnihot3 at gmail.com>, 2007, 2008, 2009, 2010, 2011.
 # Dr.T.vasudevan <agnihot3 at gmail.com>, 2009.
 # I. Felix <ifelix at redhat.com>, 2009.
 # Dr,T,Vasudevan <agnihot3 at gmail.com>, 2010, 2011.
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tomboy.master.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-01 20:54+0530\n"
-"PO-Revision-Date: 2011-04-01 20:54+0530\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2011-09-06 12:31+0530\n"
+"PO-Revision-Date: 2011-09-06 15:04+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3 at gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc at kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.1\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -90,37 +91,51 @@ msgid "Custom Font Face"
 msgstr "தனிபயன் எழுத்துரு முகம்"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "டாம்பாய் வெளியேறும் போது சேமித்த தேடல் சாளரத்தின்  X ஆயத்தொலைவை நிர்ணயிக்கிறது."
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"எல்லா குறிப்புகளையும் தேடு சாளரத்தின்  X ஆயத்தொலைவை நிர்ணயிக்கிறது. டாம்பாய் வெளியேறும் போது "
+"சேமிக்கிறது"
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "டாம்பாய் வெளியேறும் போது சேமித்த தேடல் சாளரத்தின்  Y ஆயத்தொலைவை நிர்ணயிக்கிறது."
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"எல்லா குறிப்புகளையும் தேடு சாளரத்தின்  Y ஆயத்தொலைவை நிர்ணயிக்கிறது. டாம்பாய் வெளியேறும் போது "
+"சேமிக்கிறது"
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr "டாம்பாய் வெளியேறும் போது சேமித்த தேடல் சாளரத்தின் உயரத்தை பிக்ஸல் இல்  நிர்ணயிக்கிறது."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"எல்லா குறிப்புகளையும் தேடு சாளரத்தின்   உயரத்தை பிக்ஸல் இல்  நிர்ணயிக்கிறது.  டாம்பாய் "
+"வெளியேறும் போது சேமிக்கிறது."
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
-msgstr "டாம்பாய் வெளியேறும் போது சேமித்த தேடல் சாளரத்தின் அகலத்தை பிக்ஸல் இல்  நிர்ணயிக்கிறது."
+msgid "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"எல்லா குறிப்புகளையும் தேடு சாளரத்தின் அகலத்தை பிக்ஸல் இல்  நிர்ணயிக்கிறது.  டாம்பாய் "
+"வெளியேறும் போது சேமிக்கிறது."
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "தானியங்கி எண்ணிட்ட பட்டியலை இயல்படுத்து "
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "நடு சொடுக்கு ஒட்டு சின்னத்தை இயல்படுத்து "
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "அறிவிப்பு இடத்தில் சின்னத்தை  செயல்படுத்து"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "விகிவோர்ட் சிறப்புச்சுட்டலை செயல்படச்செய்"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "தானியங்கி எண்ணிட்ட பட்டியலை இயல்படுத்து "
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "எஸ்கேப் விசையால் குறிப்பை மூடுதலை செயல்படுத்து."
@@ -178,18 +193,14 @@ msgid "HTML Export All Linked Notes"
 msgstr "எல்லாம் இணைந்த குறிப்புகளை HTML ஏற்றுமதி செய்க"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "கடைசி அடைவை HTML ஏற்றுமதி செய்க"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "இணைந்த குறிப்புகளை HTML ஏற்றுமதி செய்க"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr "செயல் நீக்கினால் \" குறிப்பை நீக்கு\" உறுதிப்படுத்தல் உரையாடல் கட்டுப்படுத்தப்படும்."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -197,7 +208,7 @@ msgstr ""
 "enable_custom_font உண்மையானால் இங்கு பெயர் அமைத்த எழுத்துரு குறிப்புகளை காட்டும் "
 "எழுதுருவாக பயன்படுத்தப்படும்"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -205,11 +216,11 @@ msgstr ""
 "செயல்படுத்தினால் டாம்பாய் வெளியேறியபோது திறந்து இருந்த அனைத்து குறிப்புகளும் கணினி "
 "துவக்கத்தின் போது திறக்கும்."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "செயற்படுத்தினால் திறந்த  குறிப்பை எஸ்கேப்  விசையை அழுத்தி மூட முடியும்"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -218,7 +229,7 @@ msgstr ""
 "உண்மையெனில் டாம்பாயின் ட்ரே சின்னம் அறிவிப்பு இடத்தில் காட்டப்படும். இதை செயல் நீக்கல் ட்ரே "
 "சின்னத்தின் பயன்பாட்டை மற்றொரு பயன்பாடு தரும் போது பயன்படலாம்."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -226,7 +237,7 @@ msgstr ""
 "உண்மை என அமைத்தால் சொற்பிழைகளுக்கு சிவப்பு அடிக்கோடு இடப்படும். பரிந்துரைகளை வலது "
 "சொடுக்கு பட்டியில் காணலாம்."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -235,7 +246,7 @@ msgstr ""
 "உண்மை என அமைத்தால் /apps/tomboy/global_keybindings இல் அமைத்த மேல்மேசை-உலகளாவிய "
 "விசை பிணைப்புகள் செயல்படும். இதனால் டாம்பாய் செயல்கள் அனைத்து நிரல்களிலிருந்தும் கிடைக்கும்."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -244,7 +255,7 @@ msgstr ""
 "எழுதுருவாக பயன்படுத்தப்படும். இல்லாவிட்டால் மேல்மேசையின் முன்னிருப்பு எழுத்துரு "
 "பயன்படுத்தப்படும்."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -252,13 +263,13 @@ msgstr ""
 "ஒட்டு குறிப்பு இறக்குமதி சொருகி இது வரை இயக்கப்படவில்லை என குறிக்கிறது. அடுத்த முறை "
 "டாம்பாய் துவங்கும் போது அது தானியங்கியாக இயக்கப்பட வேண்டும்."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr "டாம்பாய் பட்டியில் காட்டப்படவேண்டிய குறிப்புகளின் எண்ணிக்கையை நிர்ணயிக்கும் முழு எண்."
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -269,7 +280,7 @@ msgstr ""
 "அமைத்து இருந்தால்) குறிக்கும் முழு எண். 1 க்கு கீழான மதிப்பு தானியங்கி செயலிழப்பதை "
 "குறிக்கிறது. மதிப்பு குறைந்தது 5 ஆக இருக்க வேண்டும். மதிப்பு நிமிடங்களில் உள்ளது."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -281,7 +292,7 @@ msgstr ""
 "தேர்வுக்கான முழு எண். மதிப்புகள் ஒரு உள்ளமை கணக்கெடுத்தில் நிறைவுறும்.0 எனில் முரண்பாடு "
 "எழும் போது அந்த அந்த நேரம் பொருத்து சரி செய்ய பயனரை கேட்க வேண்டும்."
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -297,6 +308,10 @@ msgstr ""
 "தொடுப்பை நீக்க வேண்டும். 2 எனில் தொடுப்பு உரையை புதுப்பெயர் இட்டு மேம்படுத்தி அதை "
 "தொடர்ந்து சுட்ட வேண்டும்."
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "ஹெச்டிஎம்எல் ஏற்றுமதிக்கு பயன்படுத்திய கடைசி அடைவு"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "குறிப்பை மறுபெயரிட்டா ல் இணைப்பை மேம்படுத்தும் நடத்தை"
@@ -364,20 +379,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS ஒத்திசைவு சேவையக யூஆர்எல்"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "தேடல் சாளரத்தின் சேமித்த உயரம்"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "எல்லா குறிப்புகளையும் தேடுக சாளரத்தின் சேமித்த உயரம்"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "தேடல் சாளரத்தின் சேமித்த கிடைமட்ட இடம்"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "எல்லா குறிப்புகளையும் தேடுக சாளரத்தின் சேமித்த கிடைமட்ட இடம்"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "தேடல் சாளரத்தின் சேமித்த செங்குத்து இடம்"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "எல்லா குறிப்புகளையும் தேடுக சாளரத்தின் சேமித்த செங்குத்து இடம்"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "தேடுக சாளரத்தின் அகலம் சேமிக்கப்பட்டது."
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "எல்லா குறிப்புகளையும் தேடுக சாளரத்தின் சேமித்த அகலம்."
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -609,7 +624,7 @@ msgstr "_அழி"
 msgid "Delete the selected note"
 msgstr "தேர்ந்தெடுத்த குறிப்பை நீக்கு"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "மூடு (_C)"
 
@@ -653,7 +668,7 @@ msgstr "தட்டு சின்னம்."
 msgid "Create _New Note"
 msgstr "புதிய குறிப்பினை உருவாக்கு (_N)"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "_எல்லா குறிப்புகளையும் தேடுக"
 
@@ -665,11 +680,22 @@ msgstr "எல்லா குறிப்புகளையும் தேட
 msgid "Start synchronizing notes"
 msgstr "குறிப்புகளை ஒத்திசைவு செய்ய ஆரம்பி"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "மேம்பட்ட"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "அண்மை பட்டியில் காட்டப்படவேண்டிய குறிப்புகளின் குறைந்த பட்ச எண்ணிக்கை (அதிகபட்சம் 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "இங்கு என்ன தொடுப்புகள்?"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(எதுவும் இல்லை)"
 
@@ -722,6 +748,26 @@ msgstr "இந்த சின்னத்தை நிச்சயம் நீ
 msgid "If you remove an icon it is permanently lost."
 msgstr "இந்த சின்னத்தை நீக்கினால் அது நிரந்தரமாக நீக்கப்படும்."
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "மின்னஞ்சல் திறக்க முடியவில்லை"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "ஹெச்டிஎம்எல்"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "HTML ஏற்றுமதிக்கு இலக்கு"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "இணைக்கப்பட்ட குறிப்புகளை ஏற்று"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "மற்ற இணைப்புள்ள குறிப்புகளையும் சேர்த்துக் கொள்க"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "HTML க்கு ஏற்று"
@@ -736,10 +782,14 @@ msgid "Note exported successfully"
 msgstr "உங்கள் குறிப்பு வெற்றிகரமாக ஏற்றுமதி செய்யப்பட்டது."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "அணுக்கம் மறுக்கப்பட்டது."
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "அடைவு இல்லை."
 
@@ -748,22 +798,6 @@ msgstr "அடைவு இல்லை."
 msgid "Could not save the file \"{0}\""
 msgstr "கோப்பு  \"{0}\" ஐ சேமிக்க முடியவில்லை."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "HTML ஏற்றுமதிக்கு இலக்கு"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "இணைக்கப்பட்ட குறிப்புகளை ஏற்று"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "மற்ற இணைப்புள்ள குறிப்புகளையும் சேர்த்துக் கொள்க"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "மின்னஞ்சல் திறக்க முடியவில்லை"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_F அடைவு பாதை:"
@@ -772,15 +806,15 @@ msgstr "_F அடைவு பாதை:"
 msgid "Select Synchronization Folder..."
 msgstr "ஒத்திசைவு அடைவை தேர்ந்தெடு..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "அடைவு தடம் புலம் காலியாக உள்ளது"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "குறிப்பிட்ட அடைவு தடம் இல்லை மற்றும் டாம்பாயால் அதை உருவாக்க இயலவில்லை"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "உள் அடைவு"
 
@@ -844,11 +878,11 @@ msgstr "சந்திப்பு ஏற்பாடுகள்"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"புதிய இன்றைய குறிப்புகளுக்கு இருக்கும் உரையை தனிப்பயன் ஆக்க <span weight=\"bold\"> "
-"இன்றைய: வார்ப்புரு</span> குறிப்பை மாற்றுக."
+"புதிய இன்றைய குறிப்புகளுக்கு இருக்கும் உரையை தனிப்பயன் ஆக்க <b>"
+"இன்றைய: வார்ப்புரு</b> குறிப்பை மாற்றுக."
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -873,26 +907,31 @@ msgstr "{1} இல் {0} பக்கம்"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd MM/dd/yyyy, hh:mm:ss tt"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "சிதைந்த இணைப்புகளை நீக்கு"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "ஒரு கோட்டு சித்திரத்தை சேர்"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "சேவையகம்:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "(_n)பயனீட்டாளர் பெயர்"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "அடைவு பாதை(தேவையானால்):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
@@ -900,15 +939,15 @@ msgstr ""
 "SSH ஒத்திசைவுக்கு இந்த வழங்கன் மற்றும் பயனருக்கு ஒரு இருப்பில் உள்ள SSH விசை இயங்கும் SSH "
 "கிங்கரனுக்கு சேர்க்கப்பட வேண்டும்."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "சேவையகம் அல்லது பயனர் பெயர் புலம் காலியாக உள்ளது"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -935,14 +974,16 @@ msgstr "ஒட்டு குறிப்புகள் இறக்கும
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> இதில் <b>{1}</b>. ஒட்டு குறிப்புகள் இறக்குமதி வெற்றிகரமாக முடிந்தது."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> <b>{1}</b> இதில் . ஒட்டு குறிப்பு இறக்குமதி வெற்றிகரமாக முடிந்தது."
+msgstr[1] "<b>{0}</b> <b>{1}</b> இதில் . ஒட்டு குறிப்புகள் இறக்குமதி வெற்றிகரமாக முடிந்தது."
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "தலைப்பில்லாத"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "ஒட்டுக் குறிப்பு: "
 
@@ -966,23 +1007,23 @@ msgstr "--- டாஸ்க் இயங்கவில்லை--- "
 msgid "_Underline"
 msgstr "(_U) அடிக்கோடிடுக"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "_கடவுச்சொல்:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "URL, பயனர் பெயர் அல்லது கடவுச்சொல் புலம் காலியாக உள்ளது"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -995,16 +1036,12 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "க்னோம் விசை வளைய வடிவமைப்பை சேமிப்பது இயலவில்லை இதனுடன் பின்வருபவை செய்திகள்வந்தன:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "டாம்பாய் வலை"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "சேவையகத்துடன் இணை"
 
@@ -1013,44 +1050,142 @@ msgid "Connected"
 msgstr "இணைக்கப்பட்டது"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "சேவையகம் பதில் தரவில்லை. மீண்டும் பிறகு முயற்சி செய்யவும்."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "ஒத்திசைவு தோல்வியடைந்தது. மீண்டும் முயற்சி செய்யவும்."
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy இணைய அங்கீகாரம் வெற்றி"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
 msgstr "Tomboy விருப்பங்கள் சாளரத்திற்கு வந்து சேமி என்பதை அழுத்தி ஒத்திசைவை துவக்கவும்."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "இணைக்கப்பட்டது. ஒத்திசைவு ஆரம்பிக்க சேமி என்பதை அழுத்தவும்"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "உலாவியில் அங்கீகரிக்கிறது (இணைப்பை மறுஅமைக்க அழுத்தவும்)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "முன்னிருப்பு உலாவியை அமைதது மீண்டும் முயற்சி செய்யவும்"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "டாம்பாய் வலை"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "எல்லா குறிப்புகளைகளையும் {0} க்கு ஏற்றுமதி செய்க"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "{0} க்கு குறிப்புகளை ஏற்றுமதி செய்ய ஆரம்பி"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "தேர்ந்தெடுக்கப்பட்ட குறிப்பு புத்தகத்தை {0} க்கு ஏற்றுமதி செய்க"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "{0} க்கு நோட்டுப்புத்தகத்தை ஏற்றுமதி செய்யத் துவங்கு"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_T கருவிகள்"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "ஏற்றுமதி செய்க"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "குறிப்புகளை ஏற்றுமதி செய்க"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "எல்லா குறிப்புகளையும்  {0} க்கு ஏற்றுமதி செய்க"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "{0}  க்கு தேர்வு செய்த குறிப்பு புத்தகத்தை ஏற்றுமதி செய்க"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "அனைத்து குறிப்புகள்  {0} ஏற்றுமதி"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "ஏற்றுமதி செய்ய  முடியவில்லை, அணுகல் மறுக்கப்பட்டது."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "ஏற்றுமதி செய்ய  முடியவில்லை. அடைவு இருப்பில் இல்லை."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "ஏற்றுமதி செய்ய முடியவில்லை: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "தெரியாத பிழை."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "நிரப்பாத குறிப்புகள்"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "உங்கள் குறிப்புகள் \"{0}\" க்கு ஏற்றுமதி செய்யப்பட்டது."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "குறிப்புகள் வெற்றிகரமாக ஏற்றுமதி செய்யப்பட்டது."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "கோப்புகளை  \"{0}\" இல் சேமிக்க முடியவில்லை."
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "{0} ஏற்றுமதிக்கு இலக்கு அடைவை உருவாக்கு"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "அனைத்து குறிப்புகளையும் தேடு"
 
@@ -1103,26 +1238,6 @@ msgstr "பெயர் ஏற்கெனவே பயனில் உள்ள
 msgid "C_reate"
 msgstr "_உருவாக்கு"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} கையேடு வார்ப்புரு"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "அனைத்து குறிப்புகள்"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "நிரப்பாத குறிப்புகள்"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "_b குறிப்பு புத்தகங்கள்"
@@ -1162,15 +1277,35 @@ msgid "Delete the selected notebook"
 msgstr "தேர்ந்தெடுக்கப்பட்ட குறிப்பு புத்தகத்தை நீக்கு "
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "குறிப்புப் புத்தகங்கள்"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} கையேடு வார்ப்புரு"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "புதிய குறிப்பு"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "அனைத்து குறிப்புகள்"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "நிச்சயம் இந்த குறிப்பு புத்தகத்தை  அழிக்க வேண்டுமா?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1191,34 +1326,40 @@ msgstr "குறிப்பு புத்தகம் இல்லை"
 msgid "New \"{0}\" Note"
 msgstr "புதிய \"{0}\" குறிப்பு"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "இந்த குறிப்பை ஒரு குறிப்பு புத்தகத்தில் வைக்கவும்"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "குறிப்பு புத்தகம்"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "(_N) புதிய குறிப்பு புத்தகம்..."
 
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "நிச்சயம் இந்த குறிப்பினை அழிக்க வேண்டுமா?"
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "புதிய குறிப்பு {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "நிச்சயம்  \"{0}\" ஐ அழிக்க வேண்டுமா?"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "நிச்சயம் இந்த {0} குறிப்பினை அழிக்க வேண்டுமா?"
 msgstr[1] "நிச்சயம் இந்த {0} குறிப்புகளை அழிக்க வேண்டுமா?"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "ஒரு குறிப்பை அழித்தால் அது நிரந்தரமாக அழிக்கப்படும்."
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1229,13 +1370,13 @@ msgstr ""
 "சோதிக்கவும். {0}. க்கு உங்களுக்கு உரிமை  உள்ளதா என்றும் பார்க்க. பிழை  விவரங்கள்  {1} இல் "
 "உள்ளது "
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "குறிப்பு தரவை  சேமிப்பதில் பிழை"
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "புதிய குறிப்பு வார்ப்புரு"
 
@@ -1358,7 +1499,7 @@ msgstr ""
 "ஏற்படுத்தப்படும். </note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "இங்கே தொடங்கு"
 
@@ -1366,14 +1507,9 @@ msgstr "இங்கே தொடங்கு"
 msgid "Using Links in Tomboy"
 msgstr "டாம்பாயில்  தொடுப்புகளை பயன்படுத்துதல்"
 
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "புதிய குறிப்பு {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "இங்கு உங்களை புதிய குறிப்பினை குறிப்பிடவும்."
 
@@ -1437,139 +1573,164 @@ msgstr "_l இணைப்புகளை  எப்போதும் மறு
 msgid "Alwa_ys rename links"
 msgstr "_y  எப்போதும் இணைப்புகளை மறுபெயரிடு"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "இந்த குறிப்பில் தேடுக"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "புதிய குறிப்புக்கு இணைப்பு (_L)"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "உரை (_x)"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "இந்த குறிப்பில் தேடுக"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "அனைத்து குறிப்புகளையும் மூடு (_e)"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "தேடு"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "உங்கள் குறிப்புகளில் தேடுக (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "உங்கள் குறிப்புகளை தேடு"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "இணைப்பு"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "தேர்ந்தெடுத்த உரையை ஒரு புதிய குறிப்புக்கு இணைக்கவும் (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "தேர்ந்தெடுத்த உரையை ஒரு புதிய குறிப்புக்கு இணைக்கவும்"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "உரை (_T)"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "உரைக்கு பண்புகளை அமை"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "கருவிகள் (_o)"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "இந்த குறிப்புக்கான கருவிகளை பயன்படுத்து"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "இந்த குறிப்பினை அழி"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "குறிப்புகளை ஒத்திசை"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"இது ஒரு வார்புரு குறிப்பு. இது வழக்கமான குறிப்புகளின் முன்னிருப்பு உள்ளடக்கத்தை "
+"நிர்ணயிக்கிறது. அது குறிப்பு மெனுவிலோ தெடல் சாளரத்திலோ காணாது."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "வழக்கமான குறிப்பாக மாற்றவும்"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "_z அளவை சேமி"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "_l தேர்வை சேமி"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "_T தலைப்பை சேமி "
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "தேடு... (_F)"
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "அடுத்ததை தேடு (_N)"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "முந்தையதை தேடு (_P)"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "குறிப்பினை உருவாக்க முடியவில்லை"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "தேடு: (_F)"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "முந்தையது (_P)"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "(_N) அடுத்து"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "தடிமன் (_B)"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "சாய்வு (_I)"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "அடித்தல் (_S)"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "முன்னிலைப்படுத்தல் (_H)"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "எழுத்துரு அளவு"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "இயல்பான (_N)"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "மிகப்பெரிய"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "பெரிய (_L)"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "சிறிய (_m)"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "எழுத்துரு அளவு ஐ அதிகமாக்குக"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "எழுத்துரு அளவு ஐ குறைவாக்குக"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "குண்டு அடையாளக் குறிப்புகள்"
 
@@ -1589,11 +1750,11 @@ msgstr "ஒத்திசைவு"
 msgid "Add-ins"
 msgstr "உள்கூட்டு"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "உள்ளிடுும்போதே_ எழுத்துப்பிழை சோதனை"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1602,11 +1763,11 @@ msgstr ""
 "காணலாம்."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "_வ விகி வார்த்தைகளை சிறப்புச்சுட்டுக"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1615,31 +1776,31 @@ msgstr ""
 "சொல்லை சொடுக்கினால் அந்த பெயருடன் ஒரு குறிப்பு பக்கம் உருவாகும்."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "தானியங்கி எண்ணிட்ட பட்டியலை இயல்படுத்து "
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "தனிபயன் எழுத்துருவை செயல்படுத்து"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "எப்போ து இணைத்த குறிப்பை ம று பெயரிடுவது: "
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "என்ன செய்வதென கேள்"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "இணைப்புகளை  எப்போதும் மறுபெயரிடாதே "
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "இணைப்புகளை  எப்போதும் மறுபெயரி டு"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1647,16 +1808,16 @@ msgstr ""
 "புதிய குறிப்பு உருவாக்கும்போது பயன்பட வேண்டிய உரையை குறிக்க புதிய குறிப்பு "
 "வார்ப்புருவை பயன்படுத்து"
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "புதிய குறிப்பு வார்ப்புருவை திற "
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "_வ விரைவு விசைகளுக்கு செவி சாய்க்கவும்"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1666,104 +1827,104 @@ msgstr ""
 "உதவுகிறது. எ-டு: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "குறிப்புகள் பட்டியை காட்டு"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "\"_இங்கே தொடங்கு\" ஐ திறக்கவும்."
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "ஒரு புதிய குறிப்பினை உருவாக்கு"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "\"_அனைத்து குறிப்புகளையும் தேடு\" ஐ திறக்கவும்"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "_v சேவை:"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "வடிவமைக்க இயலாது"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "_y பின்னணியில் தானியங்கியாக ஒவ்வொ ரு காலத்திலும் இசைவி"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "நிமிடங்கள்"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_A மேம்பட்ட..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "பின் வரும் உள்கூட்டுகள் நிறுவப்பட்டுள்ளன:"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "மேலும் கூடுதல் சேர்ப்புகளை பெறு..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "செயல்படுத்து (_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "செயல் _ந நீக்கு"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "அமுல் படுத்தவில்லை"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} முன்னுரிமைகள்"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "குறிப்பு எழுத்துருவை தேர்ந்தெடுக்கவும்"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "மற்ற ஒத்திசைவு விருப்பங்கள்"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr "உள்ளமை குறிப்பு மற்றும் வடிவமைத்த வழங்கன் குறிப்பு இடையே முரண்பாடு கண்டால்:"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "என்ன செய்வதென எப்போதும் கேள்"
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "என் உள்ளமை குறிப்பை பெயர் மாற்றுக:"
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "என் உள் குறிப்பு ஐ வழங்கனின் குறிப்பால் இற்றைப்படுத்துக"
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "எச்சரிக்கை: நிச்சயமாக?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr " நிச்சயமாக?"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1771,337 +1932,154 @@ msgstr ""
 "உங்கள் ஒத்திசைவு அமைப்பை நீக்குவது பரிந்துரைக்கப்படவில்லை.நீங்கள் புதிய அமைப்பை சேமிக்கும் "
 "போது உங்கள் குறிப்புகளனைத்தையும் ஒத்திசைக்க கட்டாயப்படுத்தப்ப்டலாம்."
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "ஒத்திசைவு அமைப்பை மறுஅமைப்பு செய்கிறது"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
-"நீங்கள் வடிவமைத்த ஒத்திசைவு சேவையை செயல் முடக்கம் செய்துள்ளீர்கள். உங்கள் வடிவமைப்பு இப்போது "
-"சுத்தப்படுத்தப்பட்டது. நீங்கள் புதிய அமைப்பை சேமிக்கும் போது உங்கள் குறிப்புகளனைத்தையும் "
-"ஒத்திசைக்க கட்டாயப்படுத்தப்ப்டலாம்."
+"நீங்கள் வடிவமைத்த ஒத்திசைவு சேவையை செயல் முடக்கம் செய்துள்ளீர்கள். உங்கள் ஒத்திசைவு "
+"வடிவமைப்பு இப்போது "
+"சுத்தப்படும். நீங்கள் புதிய அமைப்பை சேமிக்கும் போது உங்கள் குறிப்புகளனைத்தையும் "
+"ஒத்திசைக்க கட்டாயப்படுத்தப்படலாம்."
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "வெற்றி! நீங்கள் இணக்கப்பட்டுவிட்டீர்கள்!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "இணைப்பு வெற்றி"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "டாம்பாய் உங்கல் குறிப்புகளை ஒத்திசைக்க தயார். அவற்றை இப்போது ஒத்திசைக்கலாமா?"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
 msgstr ""
-"மன்னிக்கவும். ஏதோ தவறு நிகழ்ந்துள்ளது. உங்கள் தகவலை சரி பார்த்து மீண்டும் முயற்சி செய்க. "
-"{0} அதற்கு உதவலாம்."
+"உங்கள் தகவலை சரி பார்த்து மீண்டும் முயற்சி செய்க.  பதிவேடு {0} பிழை குறித்து மேலும் தகவால்களை "
+"தரலாம்."
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "இணைப்பதில் பிழை :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "இணைப்பதில் பிழை"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "பதிப்பு:"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "ஆசிரியர்:"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "காப்புரிமை:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "உள்கூட்டு சார்புகள்"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "_த தேடல்:"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "குறிப்பு"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "கடைசியான மாற்றம்"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "ஒத்திசைவு"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "தலைப்பு பொருத்தம்"
+
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "({0} ஒப்பீடு)"
 msgstr[1] "({0} ஒப்பீடுகள்)"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "மொத்தம்:{0} குறிப்பு"
 msgstr[1] "மொத்தம்:{0} குறிப்புகள்"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "ஒத்திசைவு: {0} குறிப்பு"
 msgstr[1] "ஒத்திசைவு: {0} குறிப்புகள்"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"தெர்ந்தெடுத்த குறிப்பு புத்தகத்தில் விடைகள் இல்லை.\n"
+"எல்லா குறிப்பு புத்தகங்களிடையேயும் தேட இங்கு சொடுக்கவும்."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "எல்லா குறிப்பு புத்தகங்களிடையேயும் தேட இங்கு சொடுக்கவும்."
+
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "குறிப்புகள்"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "புதிய குறிப்பினை உருவாக்க முடியவில்லை"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"உங்கள் கணினியில் இந்த ஒத்திசைவு சொருகி ஆதரிக்கப்படவில்லை. ப்யூஸ் மற்றும் {0} சரியாக "
+"நிறுவப்பட்டதா வடிவமைக்கப்பட்டதா என உறுதி செய்து கொள்க."
 
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "முதன்மை வளர்ச்சி:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "சோதனை கோப்பை படிக்க முடியவில்லை. "
 
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "கொடையாளர்கள்:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "எழுதும் சோதனை தோல்வியுற்றது"
 
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr "I. Felix <ifelix at redhat.com>. Dr. T. Vasudevan <agnihot3 at gmail.com>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "சேவையகத்துடன் தொடர்பு கொள்கையில் நேரம் காலாவதியானது."
 
-#: ../Tomboy/Tomboy.cs:410
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"பதிப்புரிமை © 2004-2007 அலெக்ஸ் க்ராவலி \n"
-"பதிப்புரிமை © 2004-2010 மற்றவர்கள்\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "சேவையகத்துடன் தொடர்பு கொள்கையில் தவறு."
 
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "மேல்மேசை குறிப்பெடுத்தலுக்கு ஒரு எளிய பயன்பாடு."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "ப்யூஸ்(FUSE) ஐ செயல்படுத்த முடியவில்லை"
 
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "ஆரம்பபக்கம்"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "குறிப்பிட்ட சேவையகத்துடன் தொடர்பு கொள்கையில் தவறு நேர்ந்தது:"
 
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"மேல்மேசை குறிப்பெடுத்தலுக்கு ஒரு எளிய பயன்பாடு.\n"
-"பதிப்புரிமை © 2004-2006 அலெக்ஸ் க்ராவலி <alex at beatniksoftware.com>\n"
-
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"பயன்பாடு:\n"
-"  --version\t\t\tபதிப்புத் தகவலை அச்சிடுக.\n"
-"  --help\t\t\tஇந்த பயன்பாடு செய்தியை அச்சிடுக.\n"
-"  --note-path [path]\t\tஇந்த அடைவில் தரவை ஏற்று/சேமி.\n"
-"  --search [text]\t\tஎல்லா குறிப்புகளையும் தேடு சாளரத்தை தேடும் உரையுடன் "
-"திறக்கவும்.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\tபுதிய குறிப்பை உருவாக்கி அதைக்காட்டவும்.\n"
-"  --new-note [title]\t\tபுதிய குறிப்பை உருவாக்கி அதை தலைப்புடன் காட்டவும்.\n"
-"  --open-note [title/url]\tஇருப்பில் உள்ள தலைப்பு ஒத்திசைவான குறிப்பை காட்டவும்.\n"
-"  --start-here\t\t\tஇங்கே துவங்கு குறிப்பை காட்டவும்.\n"
-"  --highlight-search [text]\t உரையை தேடி திறந்த குறிப்பில் சிறப்புச் சுட்டவும்.\n"
-
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "பதிப்பு {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (புதிய)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "டாம்பாய் _பற்றி"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"\"டாம்பாய் குறிப்புகள் கையேடு\" காணப்படவில்லை. உங்கள் நிறுவல் முழுமை பெற்றதா என "
-"சோதிக்கவும்."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "உதவி காணப்படவில்லை"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "இடத்தினை திறக்க முடியவில்லை"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "இன்று, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "இன்று"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "நேற்று, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "நேற்று"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} நாளுக்கு முன், {1}"
-msgstr[1] "{0} நாட்களுக்கு முன், {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} நாளுக்கு முன்"
-msgstr[1] "{0} நாட்களுக்கு முன்"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "நாளை, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "நாளை"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "{0} தினத்தில், {1}"
-msgstr[1] "{0} தினங்களில், {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "{0} தினத்தில்"
-msgstr[1] "{0} தினங்களில்"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "MMMM d"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "தேதி இல்லை"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "MMMM d yyyy, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "MMMM d yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(தலைப்பில்லாத {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"<b>{0}</b> என்ற பெயரில் ஒரு குறிப்பு ஏற்கெனவே உள்ளது. தொடரு முன் வேறு ஒரு பெயரை "
-"தேர்ந்தெடுக்கவும்."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "குறிப்பு தலைப்பு கிடைக்காது."
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "இணைப்பு முகவரியை நகலெடு (_C)"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "இணைப்பினை திற (_O)"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and {0} correctly installed and configured"
-msgstr ""
-"உங்கள் கணினியில் இந்த ஒத்திசைவு சொருகி ஆதரிக்கப்படவில்லை. ப்யூஸ் மற்றும் {0} சரியாக "
-"நிறுவப்பட்டதா வடிவமைக்கப்பட்டதா என உறுதி செய்து கொள்க."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "சோதனை கோப்பை படிக்க முடியவில்லை. "
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "எழுதும் சோதனை தோல்வியுற்றது"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "சேவையகத்துடன் தொடர்பு கொள்கையில் நேரம் காலாவதியானது."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "சேவையகத்துடன் தொடர்பு கொள்கையில் தவறு."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "ப்யூஸ்(FUSE) ஐ செயல்படுத்த முடியவில்லை"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "குறிப்பிட்ட சேவையகத்துடன் தொடர்பு கொள்கையில் தவறு நேர்ந்தது:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "விவரங்கள்"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "விவரங்கள்"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
@@ -2299,10 +2277,6 @@ msgstr ""
 "\"{0}\"  இன் சேவையக பிரதி உங்கள் உள்ளமை குறிப்புடன் முரண்படுகிறது. உங்கள் உள்ளமை "
 "குறிப்பை என்ன செய்ய?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_T கருவிகள்"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2337,6 +2311,228 @@ msgstr ""
 "fuse\" ஐ /etc/init.d/boot.local க்கு அல்லது \"fuse\" ஐ /etc/modules க்கு "
 "சேர்கவும்."
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "புதிய குறிப்பினை உருவாக்க முடியவில்லை"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "முதன்மை வளர்ச்சி:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "கொடையாளர்கள்:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr "I. Felix <ifelix at redhat.com>. Dr. T. Vasudevan <agnihot3 at gmail.com>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"பதிப்புரிமை © 2004-2007 அலெக்ஸ் க்ராவலி \n"
+"பதிப்புரிமை © 2004-2011 மற்றவர்கள்\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "மேல்மேசை குறிப்பெடுத்தலுக்கு ஒரு எளிய பயன்பாடு."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "ஆரம்ப பக்கம்"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"மேல்மேசை குறிப்பெடுத்தலுக்கு ஒரு எளிய பயன்பாடு.\n"
+"பதிப்புரிமை © 2004-20067அலெக்ஸ் க்ராவலி \n"
+"<alex at beatniksoftware.com>\n"
+"பதிப்புரிமை © 2004-2011 மற்றவர்கள்\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"பயன்பாடு:\n"
+"  --version\t\t\tபதிப்புத் தகவலை அச்சிடுக.\n"
+"  --help\t\t\tஇந்த பயன்பாடு செய்தியை அச்சிடுக.\n"
+"  --note-path [path]\t\tஇந்த அடைவில் தரவை ஏற்று/சேமி.\n"
+"  --search [text]\t\tஎல்லா குறிப்புகளையும் தேடு சாளரத்தை தேடும் உரையுடன் "
+"திறக்கவும்.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\tபுதிய குறிப்பை உருவாக்கி அதைக்காட்டவும்.\n"
+"  --new-note [title]\t\tபுதிய குறிப்பை உருவாக்கி அதை தலைப்புடன் காட்டவும்.\n"
+"  --open-note [title/url]\tஇருப்பில் உள்ள தலைப்பு ஒத்திசைவான குறிப்பை காட்டவும்.\n"
+"  --start-here\t\t\tஇங்கே துவங்கு குறிப்பை காட்டவும்.\n"
+"  --highlight-search [text]\t உரையை தேடி திறந்த குறிப்பில் சிறப்புச் சுட்டவும்.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "பதிப்பு {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (புதிய)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "டாம்பாய் _பற்றி"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"\"டாம்பாய் குறிப்புகள் கையேடு\" காணப்படவில்லை. உங்கள் நிறுவல் முழுமை பெற்றதா என "
+"சோதிக்கவும்."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "உதவி காணப்படவில்லை"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "இடத்தினை திறக்க முடியவில்லை"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "இன்று, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "இன்று"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "நேற்று, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "நேற்று"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} நாளுக்கு முன், {1}"
+msgstr[1] "{0} நாட்களுக்கு முன், {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} நாளுக்கு முன்"
+msgstr[1] "{0} நாட்களுக்கு முன்"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "நாளை, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "நாளை"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "{0} தினத்தில், {1}"
+msgstr[1] "{0} தினங்களில், {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "{0} தினத்தில்"
+msgstr[1] "{0} தினங்களில்"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "MMMM d"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "தேதி இல்லை"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "MMMM d yyyy, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "MMMM d yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(தலைப்பில்லாத {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"<b>{0}</b> என்ற பெயரில் ஒரு குறிப்பு ஏற்கெனவே உள்ளது. தொடரு முன் வேறு ஒரு பெயரை "
+"தேர்ந்தெடுக்கவும்."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "குறிப்பு தலைப்பு கிடைக்காது."
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "இணைப்பு முகவரியை நகலெடு (_C)"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "இணைப்பினை திற (_O)"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "கடைசி அடைவை HTML ஏற்றுமதி செய்க"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "நிச்சயம் இந்த குறிப்பினை அழிக்க வேண்டுமா?"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "உங்கள் குறிப்புகளில் தேடுக (Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "வெற்றி! நீங்கள் இணக்கப்பட்டுவிட்டீர்கள்!"
+
 #~ msgid "_Browse..."
 #~ msgstr "_மேலோடு..."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a81eb80..8328439 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,15 +8,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-05 10:33+0800\n"
-"PO-Revision-Date: 2011-07-05 09:59+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-11 22:09+0000\n"
+"PO-Revision-Date: 2011-09-13 11:45+0800\n"
 "Last-Translator: lainme <lainme993 at gmail.com>\n"
 "Language-Team: Chinese (Simplified) <i18n-zh at googlegroups.com>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
@@ -83,24 +84,24 @@ msgstr "自定义字体"
 msgid ""
 "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
-msgstr "决定“搜索所有便签”窗口的 X 坐标;当 Tomboy 退出时保存。"
+msgstr "决定“搜索所有便笺”窗口的 X 坐标;当 Tomboy 退出时保存。"
 
 #: ../data/tomboy.schemas.in.h:6
 msgid ""
 "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
-msgstr "决定“搜索所有便签”窗口的 Y 坐标;当 Tomboy 退出时保存。"
+msgstr "决定“搜索所有便笺”窗口的 Y 坐标;当 Tomboy 退出时保存。"
 
 #: ../data/tomboy.schemas.in.h:7
 msgid ""
 "Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
 "exit."
-msgstr "决定“搜索所有便签”窗口的像素高度;当 Tomboy 退出时保存。"
+msgstr "决定“搜索所有便笺”窗口的像素高度;当 Tomboy 退出时保存。"
 
 #: ../data/tomboy.schemas.in.h:8
 msgid ""
 "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
-msgstr "决定“搜索所有便签”窗口的像素宽度;当 Tomboy 退出时保存。"
+msgstr "决定“搜索所有便笺”窗口的像素宽度;当 Tomboy 退出时保存。"
 
 #: ../data/tomboy.schemas.in.h:9
 msgid "Enable Middle-Click Paste On Icon."
@@ -348,19 +349,19 @@ msgstr "SSHFS 同步服务器 URL"
 
 #: ../data/tomboy.schemas.in.h:54
 msgid "Saved height of \"Search All Notes\" window"
-msgstr "已保存的“搜索所有便签”窗口的高度"
+msgstr "已保存的“搜索所有便笺”窗口的高度"
 
 #: ../data/tomboy.schemas.in.h:55
 msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr "已保存的“搜索所有便签”窗口的水平位置"
+msgstr "已保存的“搜索所有便笺”窗口的水平位置"
 
 #: ../data/tomboy.schemas.in.h:56
 msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr "已保存的“搜索所有便签”窗口的垂直位置"
+msgstr "已保存的“搜索所有便笺”窗口的垂直位置"
 
 #: ../data/tomboy.schemas.in.h:57
 msgid "Saved width of \"Search All Notes\" window"
-msgstr "已保存的“搜索所有便签”窗口的宽度"
+msgstr "已保存的“搜索所有便笺”窗口的宽度"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -577,7 +578,7 @@ msgstr "删除(_D)"
 msgid "Delete the selected note"
 msgstr "删除选中便笺"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -621,7 +622,7 @@ msgstr "托盘图标"
 msgid "Create _New Note"
 msgstr "创建新便笺(_N)"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "搜索全部便笺(_S)"
 
@@ -633,6 +634,16 @@ msgstr "打开搜索全部便笺窗口"
 msgid "Start synchronizing notes"
 msgstr "开始同步便笺"
 
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "高级"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "最近列表中中要显示的最少便笺数(最大 18)"
+
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
 msgstr "反向链接"
@@ -691,10 +702,26 @@ msgstr "真的要删除此图标吗?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "如果您删除了图标,其内容将永久丢失。"
 
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "无法打开电子邮件"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
 msgid "HTML"
 msgstr "HTML"
 
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "HTML 导出的目标位置"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "导出链接的便笺"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "包含链接的全部其它便笺"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "导出为 HTML"
@@ -725,22 +752,6 @@ msgstr "文件夹不存在。"
 msgid "Could not save the file \"{0}\""
 msgstr "无法保存文件“{0}”"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "HTML 导出的目标位置"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "导出链接的便笺"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "包含链接的全部其它便笺"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "无法打开电子邮件"
-
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "文件夹路径(_F):"
@@ -749,16 +760,16 @@ msgstr "文件夹路径(_F):"
 msgid "Select Synchronization Folder..."
 msgstr "选择同步文件夹..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "文件夹路径为空。"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "特殊文件夹路径不存在,阿帖无法创建它。"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "本地文件夹"
 
@@ -858,37 +869,37 @@ msgstr "删除失效的链接"
 msgid "Add a sketch"
 msgstr "添加草图"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "服务器(_R):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "用户名(_N):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "文件夹路径(可选)(_F):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
 msgstr ""
 "SSH 同步需要将该服务器和用户的已有 SSH 钥匙添加到正在运行的 SSH 守护进程。"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "服务器或用户名为空。"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
 msgid "SSH"
 msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -947,23 +958,23 @@ msgstr "--- Tasque 未运行 ---"
 msgid "_Underline"
 msgstr "下划线(_U)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "URL、用户名或密码为空。"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -974,17 +985,13 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "将配置保存到 GNOME 密钥环时失败,出错信息如下:"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "阿帖网站"
-
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "连接到服务器"
 
@@ -993,58 +1000,66 @@ msgid "Connected"
 msgstr "连接的"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "服务器没有响应。以后在重新尝试。"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "认证失败,重试"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy 网络认证成功"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
 msgstr "请返回到 Tomboy 首选项窗口并按下保存来开始同步。"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "已经连接。按下保存来开始同步"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "在浏览器中认证(按下来重置连接)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "设定默认浏览器并重试"
 
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "阿帖网站"
+
 #: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "导出所有便签到"
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "导出所有便笺到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "开始导出便笺到"
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "开始导出便笺到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "导出选中的笔记本到"
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "导出选中的笔记本到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "开始导出笔记本到"
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "开始导出笔记本到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:65
 #: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1060,12 +1075,19 @@ msgid "Export your notes."
 msgstr "导出您的便笺。"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "导出全部便笺到"
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "导出全部便笺到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "导出选定的笔记本到"
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "导出选定的笔记本到 {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "全部便笺 {0} 导出"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:193
 #: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -1089,7 +1111,7 @@ msgid "Unknown error."
 msgstr "未知错误。"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
 msgid "Unfiled Notes"
 msgstr "未分类便笺"
 
@@ -1107,9 +1129,11 @@ msgstr "便笺导出成功"
 msgid "Could not save the files in \"{0}\""
 msgstr "无法保存文件到“{0}”"
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "创建目标文件夹用于"
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "创建目标文件夹用于 {0} 导出"
 
 #: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
@@ -1164,22 +1188,6 @@ msgstr "此名称已被使用"
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#. The templateNoteTite should show the name of the
-#. notebook.  For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} 个笔记本模板"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "全部便笺"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "笔记本(_B)"
@@ -1219,15 +1227,35 @@ msgid "Delete the selected notebook"
 msgstr "删除选中笔记本"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:285
+#: ../Tomboy/RecentChanges.cs:276
 msgid "Notebooks"
 msgstr "笔记本"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook.  For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template".  Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} 个笔记本模板"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "新建便笺"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "全部便笺"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "真的要删除此笔记本?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1247,38 +1275,39 @@ msgstr "没有笔记本"
 msgid "New \"{0}\" Note"
 msgstr "新建“{0}”便笺"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "将此便笺放入一个笔记本"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "笔记本"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "新建笔记本(_N)..."
 
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
 #, csharp-format
 msgid "New Note {0}"
 msgstr "新便笺 {0}"
 
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "真的要删除此便笺吗?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "真的要删除“{0}”吗?"
 
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "真的要删除 {0} 个便笺吗?"
 
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "如果您删除了便笺,其内容将永久丢失。"
 
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1288,7 +1317,7 @@ msgstr ""
 "保存您的便笺时发生了错误。请检查您是否有足够的磁盘空间,以及您在 {0} 是否有足"
 "够的权限。错误细节可在 {1} 中找到。"
 
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "保存便笺数据时出错。"
 
@@ -1419,7 +1448,7 @@ msgstr "在阿帖中使用链接"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "在此描述您的新便笺。"
 
@@ -1483,140 +1512,164 @@ msgstr "总不重命名连接(_L)"
 msgid "Alwa_ys rename links"
 msgstr "总是重命名链接(_Y)"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "在此便笺中查找"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "链接到新便笺(_L)"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "文本(_X)"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "在此便笺中查找(_F)"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "关闭全部便笺(_E)"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "搜索"
 
 #. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
 msgid "Search your notes"
 msgstr "搜索您的便笺"
 
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "链接"
 
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
 msgid "Link selected text to a new note"
 msgstr "将选中文本链接到新便笺"
 
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "文本(_T)"
 
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "设置文本属性"
 
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "工具(_O)"
 
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "在此便笺上使用工具"
 
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "删除此便笺"
 
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "同步便笺"
 
-#: ../Tomboy/NoteWindow.cs:564
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"此便笺是一个模板便笺。它决定了常规便笺的默认内容,且不会显示在便笺菜单或搜索"
+"窗口中。"
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "转换为常规便笺"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "保存尺寸(_Z)"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "保存选择(_L)"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "保存标题(_T)"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "查找(_F)..."
 
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "查找下一个(_N)"
 
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "查找上一个(_P)"
 
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "无法创建便笺"
 
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "查找(_F):"
 
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "上一个(_P)"
 
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "下一个(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "粗体(_B)"
 
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "斜体(_I)"
 
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "删除线(_S)"
 
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "高亮显示(_H)"
 
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "字体大小"
 
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "普通(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "巨大(_G)"
 
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "大(_L)"
 
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "小(_M)"
 
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "增大字号"
 
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "减小字号"
 
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "项目符号"
 
@@ -1846,19 +1899,19 @@ msgstr "请检查您的信息并重试。日志文件 {0} 也许会有关于此
 msgid "Error connecting"
 msgstr "连接出错"
 
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "版本:"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "作者:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "版权所有:"
 
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "插件依赖:"
 
@@ -1866,254 +1919,56 @@ msgstr "插件依赖:"
 msgid "_Search:"
 msgstr "搜索(_S):"
 
-#: ../Tomboy/RecentChanges.cs:359
+#: ../Tomboy/RecentChanges.cs:350
 msgid "Note"
 msgstr "便笺"
 
-#: ../Tomboy/RecentChanges.cs:381
+#: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
 msgstr "最近更改"
 
-#: ../Tomboy/RecentChanges.cs:520
+#: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
 msgstr "匹配项"
 
-#: ../Tomboy/RecentChanges.cs:571
+#: ../Tomboy/RecentChanges.cs:563
 msgid "Title match"
 msgstr "标题匹配"
 
-#: ../Tomboy/RecentChanges.cs:574
+#: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} 个匹配项"
 
-#: ../Tomboy/RecentChanges.cs:588
+#: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "总计:{0} 个便笺"
 
-#: ../Tomboy/RecentChanges.cs:599
+#: ../Tomboy/RecentChanges.cs:591
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "匹配:{0} 个便笺"
 
-#: ../Tomboy/RecentChanges.cs:611
+#: ../Tomboy/RecentChanges.cs:603
 msgid ""
 "No results found in the selected notebook.\n"
 "Click here to search across all notes."
 msgstr ""
 "选定的笔记本中没有找到结果。\n"
-"点此搜索所有便签。"
+"点此搜索所有便笺。"
 
-#: ../Tomboy/RecentChanges.cs:617
+#: ../Tomboy/RecentChanges.cs:609
 msgid "Click here to search across all notebooks"
-msgstr "点此搜索所有便签"
+msgstr "点此搜索所有便笺"
 
-#: ../Tomboy/RecentChanges.cs:783
+#: ../Tomboy/RecentChanges.cs:775
 msgid "Notes"
 msgstr "便笺"
 
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "无法创建新便笺"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "首席开发:"
-
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "贡献者:"
-
-#: ../Tomboy/Tomboy.cs:415
-msgid "translator-credits"
-msgstr ""
-"Funda Wang <fundawang at gmail.com>, 2005-2008.\n"
-"Ray Wang <wanglei1123 at gmail.com>, 2009.\n"
-"Aron Xu <aronmalache at 163.com>, 2009."
-
-#: ../Tomboy/Tomboy.cs:424
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"版权所有 © 2004-2007 Alex Graveley\n"
-"版权所有 © 2004-2010 其他人\n"
-
-#: ../Tomboy/Tomboy.cs:426
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "简单易用的桌面随意帖应用程序。"
-
-#: ../Tomboy/Tomboy.cs:436
-msgid "Homepage"
-msgstr "主页"
-
-#: ../Tomboy/Tomboy.cs:554
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright © 2004-2007 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"阿帖:简单易用的桌面随意帖应用程序。\n"
-"版权所有 (C) 2004-2006 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:568
-msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"用法:\n"
-"  --version\t\t\t显示版本信息。\n"
-"  --help\t\t\t显示此用法信息。\n"
-"  --note-path [路径]\t\t装入/保存此目录中的便笺数据。\n"
-"  --search [文本]\t\t打开搜索全部便笺窗口,并预置搜索文本。\n"
-
-#: ../Tomboy/Tomboy.cs:578
-msgid ""
-"  --new-note\t\t\tCreate and display a new note.\n"
-"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"  --new-note\t\t\t创建并显示新便笺。\n"
-"  --new-note [标题]\t\t创建并显示带有标题的便笺。\n"
-"  --open-note [标题/url]\t显示与标题匹配的已有便笺。\n"
-"  --start-here\t\t\t显示“从这里开始”便笺。\n"
-"  --highlight-search [文本]\t在打开的便笺中搜索突出显示的文本。\n"
-
-#: ../Tomboy/Tomboy.cs:592
-#, csharp-format
-msgid "Version {0}"
-msgstr "{0} 版本"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (新)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "关于阿帖(_A)"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr "找不到“阿帖便笺手册”。请检查您的安装是否已成功完成。"
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "帮助未找到"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "无法打开位置"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "今日,{0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "今日"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "昨天,{0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "昨天"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} 天前,{1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} 天前"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "明天,{0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "明天"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "{0} 天内,{1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "{0} 天内"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "M 月 d 日,h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "M 月 d 日"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "没有日期"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "yyyy 年 M 月 d 日,h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "yyyy 年 M 月 d 日"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(无标题 {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr "已经存在标题为 <b>{0}</b> 的便笺。请在继续前为此便笺选择另外的名称。"
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "便笺标题已被使用"
-
-#: ../Tomboy/Watchers.cs:587
-msgid "_Copy Link Address"
-msgstr "复制链接地址(_C)"
-
-#: ../Tomboy/Watchers.cs:592
-msgid "_Open Link"
-msgstr "打开链接(_O)"
-
 #: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
 #, csharp-format
 msgid ""
@@ -2370,6 +2225,207 @@ msgstr ""
 "为了避免将来弹出这个消息,您应该在启动时加载 FUSE 。添加“modprobe fuse”到 /"
 "etc/init.d/boot.local 或者“fuse”到 /etc/modules 。"
 
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "无法创建新便笺"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "首席开发:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "贡献者:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Funda Wang <fundawang at gmail.com>, 2005-2008.\n"
+"Ray Wang <wanglei1123 at gmail.com>, 2009.\n"
+"Aron Xu <aronmalache at 163.com>, 2009."
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"版权所有 © 2004-2007 Alex Graveley\n"
+"版权所有 © 2004-2010 其他人\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "简单易用的桌面随意帖应用程序。"
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "主页"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"阿帖:简单易用的桌面随意帖应用程序。\n"
+"版权所有 (C) 2004-2006 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+"  --version\t\t\tPrint version information.\n"
+"  --help\t\t\tPrint this usage message.\n"
+"  --note-path [path]\t\tLoad/store note data in this directory.\n"
+"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"用法:\n"
+"  --version\t\t\t显示版本信息。\n"
+"  --help\t\t\t显示此用法信息。\n"
+"  --note-path [路径]\t\t装入/保存此目录中的便笺数据。\n"
+"  --search [文本]\t\t打开搜索全部便笺窗口,并预置搜索文本。\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+"  --new-note\t\t\tCreate and display a new note.\n"
+"  --new-note [title]\t\tCreate and display a new note, with a title.\n"
+"  --open-note [title/url]\tDisplay the existing note matching title.\n"
+"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
+"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"  --new-note\t\t\t创建并显示新便笺。\n"
+"  --new-note [标题]\t\t创建并显示带有标题的便笺。\n"
+"  --open-note [标题/url]\t显示与标题匹配的已有便笺。\n"
+"  --start-here\t\t\t显示“从这里开始”便笺。\n"
+"  --highlight-search [文本]\t在打开的便笺中搜索突出显示的文本。\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "{0} 版本"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (新)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "关于阿帖(_A)"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr "找不到“阿帖便笺手册”。请检查您的安装是否已成功完成。"
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "帮助未找到"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "无法打开位置"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "今日,{0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "今日"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "昨天,{0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "昨天"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} 天前,{1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} 天前"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "明天,{0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "明天"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "{0} 天内,{1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "{0} 天内"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "M 月 d 日,h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "M 月 d 日"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "没有日期"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "yyyy 年 M 月 d 日,h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "yyyy 年 M 月 d 日"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(无标题 {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr "已经存在标题为 <b>{0}</b> 的便笺。请在继续前为此便笺选择另外的名称。"
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "便笺标题已被使用"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "复制链接地址(_C)"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "打开链接(_O)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "真的要删除此便笺吗?"
+
 #~ msgid "HTML Export Last Directory"
 #~ msgstr "HTML 导出上个目录"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 51a6fe6..8f65336 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tomboy 1.7.3\n"
+"Project-Id-Version: tomboy 1.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-13 20:22+0800\n"
-"PO-Revision-Date: 2011-08-13 20:23+0800\n"
+"POT-Creation-Date: 2011-09-06 20:13+0800\n"
+"PO-Revision-Date: 2011-09-06 20:13+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\n"
 "Language: zh_TW\n"
@@ -534,7 +534,7 @@ msgstr "刪除(_D)"
 msgid "Delete the selected note"
 msgstr "刪除選定的筆記"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -578,7 +578,7 @@ msgstr "系統匣圖示"
 msgid "Create _New Note"
 msgstr "新增筆記(_N)"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "搜尋所有筆記(_S)"
 
@@ -714,16 +714,16 @@ msgstr "資料夾路徑(_F):"
 msgid "Select Synchronization Folder..."
 msgstr "選擇同步化資料夾…"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "資料夾路徑欄位是空的。"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "指定的資料夾路徑不存在,而 Tomboy 無法建立它。"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "本地端資料夾"
 
@@ -822,36 +822,36 @@ msgstr "移除損壞的連結"
 msgid "Add a sketch"
 msgstr "加入素描"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "伺服器(_R):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "資料夾路徑[選擇性的](_F):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
 msgstr "SSH 同步化需要有這個伺服器及使用者的 SSH 密碼匙,並加入已執行的 SSH 伺服程式。"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "伺服器或使用者名稱欄位是空的。"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
 msgid "SSH"
 msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -909,23 +909,23 @@ msgstr "--- Tasque 尚未執行 ---"
 msgid "_Underline"
 msgstr "底線(_U)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "網址(_U):"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "網址、使用者名稱或密碼欄位是空的。"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -936,13 +936,13 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "儲存組態至 GNOME keyring 失敗,訊息為:"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "連接伺服器"
 
@@ -951,40 +951,40 @@ msgid "Connected"
 msgstr "已連線"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "伺服器沒有回應。請稍後再試。"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "驗證失敗,請再試一次"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy 網頁驗證成功"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
 msgstr "請回到 Tomboy 偏好設定視窗並按下「儲存」以開始同步化。"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "已連線。請按「儲存」開始同步化"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "在瀏覽器中驗證(按下可重設連線)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "設定預設瀏覽器後再試一次"
 
@@ -993,20 +993,24 @@ msgid "Tomboy Web"
 msgstr "Tomboy 網頁"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "匯出所有筆記至"
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "匯出所有筆記到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "正在匯出筆記到"
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "開始匯出筆記到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "將選取的筆記匯出到"
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "匯出選取的筆記簿到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "開始匯出筆記簿到"
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "開始匯出筆記簿到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:65
 #: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1022,12 +1026,19 @@ msgid "Export your notes."
 msgstr "匯出你的筆記。"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "匯出所有的筆記到"
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "匯出所有的筆記到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "匯出選取的筆記簿到"
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "匯出選取的筆記簿到 {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "所有筆記 {0} 匯出"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:193
 #: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -1051,7 +1062,7 @@ msgid "Unknown error."
 msgstr "不明的錯誤。"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
 msgid "Unfiled Notes"
 msgstr "未歸檔筆記"
 
@@ -1069,9 +1080,11 @@ msgstr "筆記已經成功的匯出"
 msgid "Could not save the files in \"{0}\""
 msgstr "無法在「{0}」中儲存檔案"
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "建立目的地資料夾給"
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "建立 {0} 匯出用的目的地資料夾"
 
 #: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
@@ -1181,15 +1194,19 @@ msgstr "筆記簿"
 msgid "{0} Notebook Template"
 msgstr "{0} 筆記簿範本"
 
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "新增筆記"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
 msgid "All Notes"
 msgstr "所有筆記"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "確定要刪除這個筆記簿嗎?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1208,38 +1225,39 @@ msgstr "沒有筆記簿"
 msgid "New \"{0}\" Note"
 msgstr "新增「{0}」筆記"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "將這個筆記放入筆記簿"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "筆記簿"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "新增筆記簿(_N)…"
 
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
 #, csharp-format
 msgid "New Note {0}"
 msgstr "添加新筆記頁 {0}"
 
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "確定要刪除這個筆記?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "確定要刪除「{0}」?"
 
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "確定要刪除這 {0} 個筆記?"
 
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "如果你刪除一篇筆記它將永遠消失。"
 
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1247,7 +1265,7 @@ msgid ""
 "details can be found in {1}."
 msgstr "當儲存你的筆記時發生錯誤。請檢查是否有足夠的磁碟空間,並且在 {0} 有適當的權限。錯誤的詳細資訊可以在 {1} 中找到。"
 
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "儲存資料時發生錯誤。"
 
@@ -1368,7 +1386,7 @@ msgstr "在 Tomboy 中使用連結"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "在這裏編寫新筆記頁。"
 
@@ -1431,140 +1449,162 @@ msgstr "永不重新命名連結(_L)"
 msgid "Alwa_ys rename links"
 msgstr "永遠重新命名連結(_Y)"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "在這個筆記中尋找"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "連結到新頁面(_L)"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "文字格式(_X)"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "在這個筆記中尋找(_F)"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "關閉所有筆記頁(_E)"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "搜尋"
 
 #. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
 msgid "Search your notes"
 msgstr "搜尋你的筆記"
 
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "連結"
 
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
 msgid "Link selected text to a new note"
 msgstr "將選取的文字連結到新的筆記"
 
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "文字(_T)"
 
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "設定文字屬性"
 
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "工具(_O)"
 
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "在此頁筆記上使用工具"
 
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "刪除這頁筆記"
 
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "同步筆記"
 
-#: ../Tomboy/NoteWindow.cs:564
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr "這個筆記是範本筆記。它決定了一般筆記的預設內容,並且它不會出現在筆記選單或搜尋視窗中。"
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "轉換為一般筆記"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "儲存大小(_Z)"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "儲存選擇區域(_L)"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "儲存標題(_T)"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "尋找(_F)…"
 
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "找下一個(_N)"
 
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "找上一個(_P)"
 
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "無法建立筆記頁"
 
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "尋找(_F):"
 
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "粗體(_B)"
 
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "斜體(_I)"
 
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "刪除線(_S)"
 
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "加強顯示(_H)"
 
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "字型大小"
 
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "一般(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "巨大(_G)"
 
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "大(_L)"
 
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "小(_S)"
 
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "增加字型大小"
 
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "減少字型大小"
 
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "項目符號"
 
@@ -1788,19 +1828,19 @@ msgstr "請檢查你的資訊並再試一次。紀錄檔 {0} 可能會含有更
 msgid "Error connecting"
 msgstr "連線錯誤"
 
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "版本:"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "作者:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "版權:"
 
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "附加元件相根據性:"
 
@@ -2315,3 +2355,6 @@ msgstr "複製連結位址(_C)"
 #: ../Tomboy/Watchers.cs:592
 msgid "_Open Link"
 msgstr "開啟連結(_O)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "確定要刪除這個筆記?"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 682bd64..a647bd4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tomboy 1.7.3\n"
+"Project-Id-Version: tomboy 1.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-13 20:22+0800\n"
-"PO-Revision-Date: 2011-08-13 14:42+0800\n"
+"POT-Creation-Date: 2011-09-06 20:13+0800\n"
+"PO-Revision-Date: 2011-09-05 20:35+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: zh_TW\n"
@@ -584,7 +584,7 @@ msgstr "刪除(_D)"
 msgid "Delete the selected note"
 msgstr "刪除選定的筆記"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -628,7 +628,7 @@ msgstr "系統匣圖示"
 msgid "Create _New Note"
 msgstr "新增筆記(_N)"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
 msgid "_Search All Notes"
 msgstr "搜尋所有筆記(_S)"
 
@@ -766,16 +766,16 @@ msgstr "資料夾路徑(_F):"
 msgid "Select Synchronization Folder..."
 msgstr "選擇同步化資料夾…"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
 msgid "Folder path field is empty."
 msgstr "資料夾路徑欄位是空的。"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "指定的資料夾路徑不存在,而 Tomboy 無法建立它。"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
 msgid "Local Folder"
 msgstr "本地端資料夾"
 
@@ -874,37 +874,37 @@ msgstr "移除損壞的連結"
 msgid "Add a sketch"
 msgstr "加入素描"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "伺服器(_R):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
 msgid "_Folder Path (optional):"
 msgstr "資料夾路徑[選擇性的](_F):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
 msgstr ""
 "SSH 同步化需要有這個伺服器及使用者的 SSH 金鑰,並加入已執行的 SSH 伺服程式。"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
 msgid "Server or username field is empty."
 msgstr "伺服器或使用者名稱欄位是空的。"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
 msgid "SSH"
 msgstr "SSH"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -962,23 +962,23 @@ msgstr "--- Tasque 尚未執行 ---"
 msgid "_Underline"
 msgstr "底線(_U)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
 msgid "_URL:"
 msgstr "網址(_U):"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
 msgid "URL, username, or password field is empty."
 msgstr "網址、使用者名稱或密碼欄位是空的。"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -990,13 +990,13 @@ 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "儲存組態至 GNOME keyring 失敗,訊息為:"
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
 msgid "Connect to Server"
 msgstr "連接伺服器"
 
@@ -1005,40 +1005,40 @@ msgid "Connected"
 msgstr "已連線"
 
 #. 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
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
 msgid "Server not responding. Try again later."
 msgstr "伺服器沒有回應。請稍後再試。"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
 msgid "Authorization Failed, Try Again"
 msgstr "驗證失敗,請再試一次"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy 網頁驗證成功"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
 msgstr "請回到 Tomboy 偏好設定視窗並按下「儲存」以開始同步化。"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
 msgid "Connected. Press Save to start synchronizing"
 msgstr "已連線。請按「儲存」開始同步化"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "在瀏覽器中驗證(按下可重設連線)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
 msgid "Set the default browser and try again"
 msgstr "設定預設瀏覽器後再試一次"
 
@@ -1047,20 +1047,24 @@ msgid "Tomboy Web"
 msgstr "Tomboy 網頁"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "匯出所有筆記至"
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "匯出所有筆記到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "正在匯出筆記到"
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "開始匯出筆記到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "將選取的筆記匯出到"
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "匯出選取的筆記簿到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "開始匯出筆記簿到"
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "開始匯出筆記簿到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:65
 #: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1076,12 +1080,19 @@ msgid "Export your notes."
 msgstr "匯出您的筆記。"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "匯出所有的筆記到"
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "匯出所有的筆記到 {0}"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "匯出選取的筆記簿到"
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "匯出選取的筆記簿到 {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "所有筆記 {0} 匯出"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:193
 #: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -1105,7 +1116,7 @@ msgid "Unknown error."
 msgstr "不明的錯誤。"
 
 #: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
 msgid "Unfiled Notes"
 msgstr "未歸檔筆記"
 
@@ -1123,9 +1134,11 @@ msgstr "筆記已經成功的匯出"
 msgid "Could not save the files in \"{0}\""
 msgstr "無法在「{0}」中儲存檔案"
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "建立目的地資料夾給"
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "建立 {0} 匯出用的目的地資料夾"
 
 #: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
@@ -1235,15 +1248,19 @@ msgstr "筆記簿"
 msgid "{0} Notebook Template"
 msgstr "{0} 筆記簿範本"
 
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "新增筆記"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
 msgid "All Notes"
 msgstr "所有筆記"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
 msgid "Really delete this notebook?"
 msgstr "確定要刪除這個筆記簿嗎?"
 
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../Tomboy/Notebooks/NotebookManager.cs:369
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
@@ -1264,38 +1281,39 @@ msgstr "沒有筆記簿"
 msgid "New \"{0}\" Note"
 msgstr "新增「{0}」筆記"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
 msgid "Place this note into a notebook"
 msgstr "將這個筆記放入筆記簿"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
 msgid "Notebook"
 msgstr "筆記簿"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
 msgid "_New notebook..."
 msgstr "新增筆記簿(_N)…"
 
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
 #, csharp-format
 msgid "New Note {0}"
 msgstr "添加新筆記頁 {0}"
 
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "確定要刪除這個筆記?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "確定要刪除「{0}」?"
 
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "確定要刪除這 {0} 個筆記?"
 
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
 msgid "If you delete a note it is permanently lost."
 msgstr "如果您刪除一篇筆記它將永遠消失。"
 
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1305,7 +1323,7 @@ msgstr ""
 "當儲存您的筆記時發生錯誤。請檢查是否有足夠的磁碟空間,並且在 {0} 有適當的權"
 "限。錯誤的詳細資訊可以在 {1} 中找到。"
 
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
 msgid "Error saving note data."
 msgstr "儲存資料時發生錯誤。"
 
@@ -1437,7 +1455,7 @@ msgstr "在 Tomboy 中使用連結"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
 msgid "Describe your new note here."
 msgstr "在這裡編寫新筆記頁。"
 
@@ -1501,140 +1519,164 @@ msgstr "永不重新命名連結(_L)"
 msgid "Alwa_ys rename links"
 msgstr "永遠重新命名連結(_Y)"
 
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
 msgid "Find in This Note"
 msgstr "在這個筆記中尋找"
 
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
 msgid "_Link to New Note"
 msgstr "連結到新頁面(_L)"
 
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
 msgid "Te_xt"
 msgstr "文字格式(_X)"
 
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
 msgid "_Find in This Note"
 msgstr "在這個筆記中尋找(_F)"
 
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
 msgid "Clos_e All Notes"
 msgstr "關閉所有筆記頁(_E)"
 
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
 msgid "Search"
 msgstr "搜尋"
 
 #. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
 msgid "Search your notes"
 msgstr "搜尋您的筆記"
 
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link"
 msgstr "連結"
 
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
 msgid "Link selected text to a new note"
 msgstr "將選取的文字連結到新的筆記"
 
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
 msgid "_Text"
 msgstr "文字(_T)"
 
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
 msgid "Set properties of text"
 msgstr "設定文字屬性"
 
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
 msgid "T_ools"
 msgstr "工具(_O)"
 
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
 msgid "Use tools on this note"
 msgstr "在此頁筆記上使用工具"
 
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
 msgid "Delete this note"
 msgstr "刪除這頁筆記"
 
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "同步筆記"
 
-#: ../Tomboy/NoteWindow.cs:564
+#: ../Tomboy/NoteWindow.cs:565
+msgid ""
+"This note is a template note. It determines the default content of regular "
+"notes, and will not show up in the note menu or search window."
+msgstr ""
+"這個筆記是範本筆記。它決定了一般筆記的預設內容,並且它不會出現在筆記選單或搜"
+"尋視窗中。"
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "轉換為一般筆記"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "儲存大小(_Z)"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "儲存選擇區域(_L)"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "儲存標題(_T)"
+
+#: ../Tomboy/NoteWindow.cs:639
 msgid "_Find..."
 msgstr "尋找(_F)…"
 
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
 msgid "Find _Next"
 msgstr "找下一個(_N)"
 
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
 msgid "Find _Previous"
 msgstr "找上一個(_P)"
 
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
 msgid "Cannot create note"
 msgstr "無法建構筆記頁"
 
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
 msgid "_Find:"
 msgstr "尋找(_F):"
 
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Bold"
 msgstr "粗體(_B)"
 
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
 msgid "_Italic"
 msgstr "斜體(_I)"
 
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
 msgid "_Strikeout"
 msgstr "刪除線(_S)"
 
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
 msgid "_Highlight"
 msgstr "加強顯示(_H)"
 
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
 msgid "Font Size"
 msgstr "字型大小"
 
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
 msgid "_Normal"
 msgstr "一般(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "Hu_ge"
 msgstr "巨大(_G)"
 
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
 msgid "_Large"
 msgstr "大(_L)"
 
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "S_mall"
 msgstr "小(_S)"
 
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
 msgid "Increase Font Size"
 msgstr "增加字型大小"
 
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
 msgid "Decrease Font Size"
 msgstr "減少字型大小"
 
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
 msgid "Bullets"
 msgstr "項目符號"
 
@@ -1867,19 +1909,19 @@ msgstr ""
 msgid "Error connecting"
 msgstr "連線錯誤"
 
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Version:"
 msgstr "版本:"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Author:"
 msgstr "作者:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
 msgid "Copyright:"
 msgstr "版權:"
 
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
 msgid "Add-in Dependencies:"
 msgstr "附加元件相依性:"
 
@@ -2397,3 +2439,6 @@ msgstr "複製連結位址(_C)"
 #: ../Tomboy/Watchers.cs:592
 msgid "_Open Link"
 msgstr "開啟連結(_O)"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "確定要刪除這個筆記?"
diff --git a/tomboy.spec b/tomboy.spec
index 173a97d..37c11ed 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        1.7.6
+Version:        1.8.0
 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