[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.11.1-1ubuntu1

Iain Lane laney at debian.org
Thu May 3 22:55:41 UTC 2012


The following commit has been merged in the ubuntu branch:
commit b9c8135e4143490a79e71d97ec32460807dad936
Author: Sebastien Bacher <seb128 at ubuntu.com>
Date:   Mon Mar 5 22:44:28 2012 +0100

    Imported Debian patch 1.9.9-0ubuntu1

diff --git a/ChangeLog b/ChangeLog
index 8907eb6..fde2137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,54 @@
 # Generated by Makefile. Do not edit.
 
+commit b50dabe9eb67a009549dfc035d5bcc3dcfe7319f
+Author: Mattias Põldaru <mahfiaz at gmail.com>
+Date:   Thu Mar 1 18:05:22 2012 +0200
+
+    [l10n] Updated Estonian translation
+
+ po/et.po | 1249 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 693 insertions(+), 556 deletions(-)
+
+commit 7e2219c27b253309dd26cdc0d1b28203c335fd53
+Author: Kasia Bondarava <kasia.bondarava at gmail.com>
+Date:   Sun Feb 26 22:14:47 2012 +0300
+
+    Added Belarusian translation.
+
+ po/be.po |  292 ++++++++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 files changed, 229 insertions(+), 63 deletions(-)
+
+commit d816cbd01ef54ecd259518bc1f373c374f9427a0
+Author: Robert Nordan <rpvn at robpvn.net>
+Date:   Thu Feb 23 16:22:34 2012 +0100
+
+    Fix #667026 by adding '?' to the screening list
+    
+    Signed-off-by: Jared Jennings <jjennings at src.gnome.org>
+
+ Tomboy/ExportAllApplicationAddin.cs |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 7089a2eb63e65b9dba7ab76e0052aa707d686fc2
+Author: Aaron Borden <adborden at live.com>
+Date:   Mon Feb 20 08:54:35 2012 -0800
+
+    Bump version to 1.9.9
+
+ Tomboy/Defines.WIN32.cs |    2 +-
+ configure.in            |    2 +-
+ osx/Contents/Info.plist |    4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit a3b067d726e40e0ddd90e05c183b844c92c7eaf1
+Author: Aaron Borden <adborden at live.com>
+Date:   Mon Feb 20 08:49:06 2012 -0800
+
+    NEWS file for 1.9.8
+
+ NEWS |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
 commit 5abe9e46c8d0563e6713996e9c0c56cd38d7cdad
 Author: Gheyret Kenji <gheyret at gmail.com>
 Date:   Sun Feb 19 20:03:06 2012 +0900
diff --git a/NEWS b/NEWS
index c954cb9..ffc4fd6 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ 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.9.9
+* Fix link names after HTML export (#667026, Robert Nordan)
+* Updated Translations: be, et
+
 Version 1.9.8
 * Updated Translations: ug
 
diff --git a/Tomboy/ExportAllApplicationAddin.cs b/Tomboy/ExportAllApplicationAddin.cs
index 00623b9..f269482 100644
--- a/Tomboy/ExportAllApplicationAddin.cs
+++ b/Tomboy/ExportAllApplicationAddin.cs
@@ -350,6 +350,7 @@ namespace Tomboy
 			note_title = note_title.Replace ('/', '_');
 			note_title = note_title.Replace ('\\', '_');
 			note_title = note_title.Replace ('.', '_');
+			note_title = note_title.Replace ('?', '_');
 
 			return note_title;
 		}
diff --git a/configure b/configure
index 906a01e..872d7f3 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.9.8.
+# Generated by GNU Autoconf 2.68 for tomboy 1.9.9.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tomboy'
 PACKAGE_TARNAME='tomboy'
-PACKAGE_VERSION='1.9.8'
-PACKAGE_STRING='tomboy 1.9.8'
+PACKAGE_VERSION='1.9.9'
+PACKAGE_STRING='tomboy 1.9.9'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1451,7 +1451,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.9.8 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.9.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1525,7 +1525,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tomboy 1.9.8:";;
+     short | recursive ) echo "Configuration of tomboy 1.9.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1692,7 +1692,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tomboy configure 1.9.8
+tomboy configure 1.9.9
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2057,7 +2057,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tomboy $as_me 1.9.8, which was
+It was created by tomboy $as_me 1.9.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2873,7 +2873,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tomboy'
- VERSION='1.9.8'
+ VERSION='1.9.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16746,7 +16746,7 @@ 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.9.8, which was
+This file was extended by tomboy $as_me 1.9.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16812,7 +16812,7 @@ _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.9.8
+tomboy config.status 1.9.9
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index 49bb109..acaf1b0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 1.9.8)
+AC_INIT(tomboy, 1.9.9)
 AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
 AM_INIT_AUTOMAKE([foreign tar-ustar])
 AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index e7c50dd..4549d10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tomboy (1.9.9-0ubuntu1) precise; urgency=low
+
+  * New upstream version
+
+ -- Sebastien Bacher <seb128 at ubuntu.com>  Mon, 05 Mar 2012 22:44:28 +0100
+
 tomboy (1.9.8-0ubuntu1) precise; urgency=low
 
   * New upstream version
diff --git a/po/be.po b/po/be.po
index 6a84ed2..2e4329d 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,18 +1,21 @@
 # Ihar Hrachyshka <ihar.hrachyshka at gmail.com>, 2007, 2011.
+# Kasia Bondarava <kasia.bondarava at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-12 20:35+0300\n"
-"PO-Revision-Date: 2012-02-12 20:36+0300\n"
-"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>\n"
+"POT-Creation-Date: 2012-02-26 22:14+0300\n"
+"PO-Revision-Date: 2012-02-26 22:14+0300\n"
+"Last-Translator: Kasia Bondarava <kasia.bondarava at gmail.com>\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"
+"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"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Tomboy Applet Factory"
@@ -60,67 +63,81 @@ msgstr "Блакнот"
 
 #: ../data/tomboy.schemas.in.h:1
 msgid "Enable spellchecking"
-msgstr ""
+msgstr "Уключыць праверку правапісу"
 
 #: ../data/tomboy.schemas.in.h:2
 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:3
 msgid "Enable WikiWord highlighting"
-msgstr ""
+msgstr "Уключыць падсветку WikiWord"
 
 #: ../data/tomboy.schemas.in.h:4
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
 msgstr ""
+"Падсвечваць ГэтакЗапісаныяСловы. Пстрычка ў такое слова будзе ствараць новую "
+"нататку з адпаведнай назвай."
 
 #: ../data/tomboy.schemas.in.h:5
 msgid "Enable automatic bulleted lists."
-msgstr ""
+msgstr "Уключыць аўтаматычныя спісы."
 
 #: ../data/tomboy.schemas.in.h:6
 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:7
 msgid "Enable Middle-Click Paste On Icon."
-msgstr ""
+msgstr "Уключыць устаўку сярэдняй пстрычкай па значку."
 
 #: ../data/tomboy.schemas.in.h:8
 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, устаўляць новы тэкст з адзначаным часам у нататку \"У пачатак"
+"\"."
 
 #: ../data/tomboy.schemas.in.h:9
 msgid "Enable custom font"
-msgstr ""
+msgstr "Уключыць уласны шрыфт"
 
 #: ../data/tomboy.schemas.in.h:10
 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:11
 msgid "Custom Font Face"
-msgstr ""
+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, шрыфт з такой назвай будзе ўжыты для "
+"паказу нататак."
 
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable global keybindings"
-msgstr ""
+msgstr "Уключыць глабальныя клавішныя скароты"
 
 #: ../data/tomboy.schemas.in.h:14
 msgid ""
@@ -128,19 +145,23 @@ msgid ""
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
 "available from any application."
 msgstr ""
+"Калі ўключана, будуць уключаны глабальныя клавішныя скароты, настаўленыя ў /"
+"apps/tomboy/global_keybindings, і тады карысныя дзеянні Tomboy будуць "
+"даступныя з любой праграмы."
 
 #: ../data/tomboy.schemas.in.h:15
 msgid "Enable the Delete Note confirmation dialog"
-msgstr ""
+msgstr "Уключыць дыялог пацвярджэння выдалення нататкі"
 
 #: ../data/tomboy.schemas.in.h:16
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
+"Калі выключана, дыялог пацвярджэння выдалення нататкі будзе прапушчаны."
 
 #: ../data/tomboy.schemas.in.h:17
 msgid "Enable Tray Icon"
-msgstr ""
+msgstr "Задзейнічаць значок трэя"
 
 #: ../data/tomboy.schemas.in.h:18
 msgid ""
@@ -148,10 +169,13 @@ msgid ""
 "Disabling this may be useful when another application is providing the "
 "functionality of the tray icon."
 msgstr ""
+"Калі ўключана, значок трэя праграмы Tomboy будзе паказаны ў абшары "
+"апавяшчэння. Выключэнне гэтага параметра можа прыдацца, калі іншая праграма "
+"забяспечвае функцыянаванне значка трэя."
 
 #: ../data/tomboy.schemas.in.h:19
 msgid "Start Here Note"
-msgstr ""
+msgstr "Нататка \"У пачатак\""
 
 #: ../data/tomboy.schemas.in.h:20
 msgid ""
@@ -159,50 +183,61 @@ msgid ""
 "which is always placed at the bottom of the Tomboy note menu and also "
 "accessible by hotkey."
 msgstr ""
+"URI-адрас нататкі, якую неабходна разглядаць як нататку \"У пачатак\", якая "
+"заўсёды знаходзіцца ўнізе меню праграмы Tomboy і даступна праз гарачыя "
+"клавішы."
 
 #: ../data/tomboy.schemas.in.h:21
 msgid "Minimum number of notes to show in menu"
-msgstr ""
+msgstr "Мінімальная колькасць нататак, паказаных у меню"
 
 #: ../data/tomboy.schemas.in.h:22
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr ""
+"Цэлы лік, які акрэслівае мінімальную колькасць нататак, паказаных у меню "
+"праграмы Tomboy."
 
 #: ../data/tomboy.schemas.in.h:23
 msgid "List of pinned notes."
-msgstr ""
+msgstr "Спіс прышпіленых нататак."
 
 #: ../data/tomboy.schemas.in.h:24
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
 msgstr ""
+"Спіс падзеленых прабеламі URI-адрасоў нататак, якія трэба заўсёды паказваць "
+"у меню Tomboy."
 
 #: ../data/tomboy.schemas.in.h:25
 msgid "Maximum note title length to show in tray menu."
-msgstr ""
+msgstr "Максімальная даўжыня назвы нататкі, якая паказваецца ў меню трэя."
 
 #: ../data/tomboy.schemas.in.h:26
 msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
 msgstr ""
+"Максімальная колькасць знакаў назвы нататкі, якія паказваюцца ў трэі "
+"праграмы Tomboy і ў меню нататак аплета панэлі."
 
 #: ../data/tomboy.schemas.in.h:27
 msgid "Enable startup notes"
-msgstr ""
+msgstr "Паказваць нататкі пры запуску"
 
 #: ../data/tomboy.schemas.in.h:28
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
 msgstr ""
+"Калі ўключана, усе нататкі, адкрытыя да выхаду з праграмы Tomboy, будуць "
+"аўтаматычна пераадкрытыя пры наступным запуску."
 
 #: ../data/tomboy.schemas.in.h:29
 msgid "Show applet menu"
-msgstr ""
+msgstr "Паказаць меню аплета"
 
 #: ../data/tomboy.schemas.in.h:30
 msgid ""
@@ -213,10 +248,15 @@ msgid ""
 "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:31
 msgid "Open Start Here"
-msgstr ""
+msgstr "Адкрыць \"У пачатак\""
 
 #: ../data/tomboy.schemas.in.h:32
 msgid ""
@@ -227,10 +267,16 @@ msgid ""
 "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:33
 msgid "Create a new Note"
-msgstr ""
+msgstr "Стварыць новую нататку"
 
 #: ../data/tomboy.schemas.in.h:34
 msgid ""
@@ -241,10 +287,16 @@ 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\" (выключана), для гэтага дзеяння не будзе клавішнага "
+"скароту."
 
 #: ../data/tomboy.schemas.in.h:35
 msgid "Open Search Dialog"
-msgstr ""
+msgstr "Адкрыць дыялог пошуку"
 
 #: ../data/tomboy.schemas.in.h:36
 msgid ""
@@ -255,10 +307,16 @@ msgid ""
 "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:37
 msgid "Open Recent Changes"
-msgstr ""
+msgstr "Адкрыць нядаўнія змены"
 
 #: ../data/tomboy.schemas.in.h:38
 msgid ""
@@ -269,68 +327,85 @@ 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\" (выключана), для гэтага дзеяння не будзе клавішнага "
+"скароту."
 
 #: ../data/tomboy.schemas.in.h:39
 msgid "Saved height of \"Search All Notes\" window"
-msgstr ""
+msgstr "Захаваная вышыня акна \"Пошук ва ўсіх нататках\""
 
 #: ../data/tomboy.schemas.in.h:40
 msgid ""
 "Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
 "exit."
 msgstr ""
+"Акрэслівае вышыню акна \"Пошук ва ўсіх нататках\" у пікселах; захоўваецца "
+"пры выхадзе з праграмы Tomboy."
 
 #: ../data/tomboy.schemas.in.h:41
 msgid "Saved width of \"Search All Notes\" window"
-msgstr ""
+msgstr "Захаваная шырыня акна \"Пошук ва ўсіх нататках\""
 
 #: ../data/tomboy.schemas.in.h:42
 msgid ""
 "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
+"Акрэслівае шырыню акна \"Пошук ва ўсіх нататках\" у пікселах; захоўваецца "
+"пры выхадзе з праграмы Tomboy."
 
 #: ../data/tomboy.schemas.in.h:43
 msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr ""
+msgstr "Захаваная гарызантальная пазіцыя акна \"Пошук ва ўсіх нататках\""
 
 #: ../data/tomboy.schemas.in.h:44
 msgid ""
 "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
 msgstr ""
+"Акрэслівае X-каардынату акна \"Пошук ва ўсіх нататках\"; захоўваецца пры "
+"выхадзе з праграмы Tomboy."
 
 #: ../data/tomboy.schemas.in.h:45
 msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr ""
+msgstr "Захаваная вертыкальная пазіцыя акна \"Пошук ва ўсіх нататках\""
 
 #: ../data/tomboy.schemas.in.h:46
 msgid ""
 "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
 msgstr ""
+"Акрэслівае Y-каардынату акна \"Пошук ва ўсіх нататках\"; захоўваецца пры "
+"выхадзе з праграмы Tomboy."
 
 #: ../data/tomboy.schemas.in.h:47
 msgid "Last Directory used in HTML Export"
-msgstr ""
+msgstr "Апошні каталог, ужыты для экспартавання HTML"
 
 #: ../data/tomboy.schemas.in.h:48
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
+"Каталог, у які апошні раз экспартавалі нататку з выкарыстаннем плугіна HTML."
 
 #: ../data/tomboy.schemas.in.h:49
 msgid "HTML Export Linked Notes"
-msgstr ""
+msgstr "Экспартаваць звязаныя нататкі ў HTML"
 
 #: ../data/tomboy.schemas.in.h:50
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
 msgstr ""
+"Апошняя настройка для пераключальніка \"Экспартаваць звязаныя нататкі\" ў "
+"плугіне \"Экспартаваць у HTML\"."
 
 #: ../data/tomboy.schemas.in.h:51
 msgid "HTML Export All Linked Notes"
-msgstr ""
+msgstr "Экспартаваць усе звязаныя нататкі ў HTML"
 
 #: ../data/tomboy.schemas.in.h:52
 msgid ""
@@ -339,104 +414,124 @@ msgid ""
 "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:53
 msgid "Sticky Note Importer First Run"
-msgstr ""
+msgstr "Першы запуск імпартавальніка Прылепленых нататак"
 
 #: ../data/tomboy.schemas.in.h:54
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
 msgstr ""
+"Паказвае, што плугін імпартавальніка Прылепленых нататак яшчэ не быў "
+"запушчаны, і ён будзе запушчаны аўтаматычна пры наступным запуску праграмы "
+"Tomboy."
 
 #: ../data/tomboy.schemas.in.h:55
 msgid "Synchronization Client ID"
-msgstr ""
+msgstr "ID кліента сінхранізацыі"
 
 #: ../data/tomboy.schemas.in.h:56
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
 msgstr ""
+"Унікальны ідэнтыфікатар гэтага кліента Tomboy, які ўжываецца для сувязі з "
+"серверам сінхранізацыі."
 
 #: ../data/tomboy.schemas.in.h:57
 msgid "Synchronization Local Server Path"
-msgstr ""
+msgstr "Сцежка да мясцовага сервера сінхранізацыі"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
 msgstr ""
+"Сцежка да сервера сінхранізацыі, пры выкарыстанні дадатковай паслугі "
+"сінхранізацыі файлавай сістэмы."
 
 #: ../data/tomboy.schemas.in.h:59
 msgid "Selected Synchronization Service Addin"
-msgstr ""
+msgstr "Выбраная дадатковая паслуга сінхранізацыі"
 
 #: ../data/tomboy.schemas.in.h:60
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr ""
+"Унікальны ідэнтыфікатар для бягучай настроенай дадатковай паслугі "
+"сінхранізацыі нататак."
 
 #: ../data/tomboy.schemas.in.h:61
 msgid "FUSE Mounting Timeout (ms)"
-msgstr ""
+msgstr "Тэрмін чакання мацавання FUSE (мс)"
 
 #: ../data/tomboy.schemas.in.h:62
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
 msgstr ""
+"Час (у мілісекундах), цягам якога Tomboy чакае адказу пры прымацаванні FUSE, "
+"ужытага для сінхранізацыі."
 
 #: ../data/tomboy.schemas.in.h:63
 msgid "SSHFS Remote Synchronization Folder"
-msgstr ""
+msgstr "Папка аддаленай сінхранізацыі SSHFS"
 
 #: ../data/tomboy.schemas.in.h:64
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr ""
+msgstr "Сцежка на SSH-серверы да каталога сінхранізацыі Tomboy (неабавязкова)."
 
 #: ../data/tomboy.schemas.in.h:65
 msgid "SSHFS Synchronization Server URL"
-msgstr ""
+msgstr "URL-адрас сервера сінхранізацыі SSHFS"
 
 #: ../data/tomboy.schemas.in.h:66
 msgid "URL of SSH server containing Tomboy synchronization directory."
-msgstr ""
+msgstr "URL-адрас SSH-сервера, які змяшчае каталог сінхранізацыі Tomboy."
 
 #: ../data/tomboy.schemas.in.h:67
 msgid "SSHFS Remote Synchronization User Name"
-msgstr ""
+msgstr "Імя карыстальніка для аддаленай сінхранізацыі SSHFS"
 
 #: ../data/tomboy.schemas.in.h:68
 msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr ""
+msgstr "Імя карыстальніка для злучэння з серверам сінхранізацыі праз SSH."
 
 #: ../data/tomboy.schemas.in.h:69
 msgid "SSHFS Synchronization Server Port"
-msgstr ""
+msgstr "Порт сервера сінхранізацыі SSHFS"
 
 #: ../data/tomboy.schemas.in.h:70
 msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
 msgstr ""
+"Порт для злучэння з серверам сінхранізацыі праз SSH. Настаўце -1 ці менш, "
+"калі трэба ўжыць прадвызначаныя настройкі SSH-порта."
 
 #: ../data/tomboy.schemas.in.h:71
 msgid "Accept SSL Certificates"
-msgstr ""
+msgstr "Прымаць SSL-сертыфікаты"
 
 #: ../data/tomboy.schemas.in.h:72
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr ""
+"Ужыць параметр wdfs \"-ac\", каб прымаць SSL-сертыфікаты без запыту "
+"пацвярджэння ў карыстальніка."
 
 #: ../data/tomboy.schemas.in.h:73
 msgid "Note Synchronization Conflict Saved Behavior"
-msgstr ""
+msgstr "Паводзіны ў выпадку канфлікту сінхранізацыі нататак"
 
 #: ../data/tomboy.schemas.in.h:74
 msgid ""
@@ -446,10 +541,14 @@ 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 азначае, што карыстальнік хоча, каб у яго пыталі "
+"пацвярджэнне ў выпадку канфлікту."
 
 #: ../data/tomboy.schemas.in.h:75
 msgid "Automatic Background Synchronization Timeout"
-msgstr ""
+msgstr "Тэрмін чакання аўтаматычнай фонавай сінхранізацыі"
 
 #: ../data/tomboy.schemas.in.h:76
 msgid ""
@@ -458,10 +557,14 @@ msgid ""
 "autosync is disabled. The lowest acceptable positive value is 5. Value is in "
 "minutes."
 msgstr ""
+"Лічбавае значэнне, якое акрэслівае частату выканання фонавай сінхранізацыі "
+"вашых нататак (калі сінхранізацыя ўключана). Любое значэнне, меншае за 1, "
+"азначае, што аўтаматычная сінхранізацыя выключана. Найменшае магчымае "
+"значэнне: 5. Значэнне апісваецца ў хвілінах."
 
 #: ../data/tomboy.schemas.in.h:77
 msgid "Link Updating Behavior on Note Rename"
-msgstr ""
+msgstr "Паводзіны пры абнаўленні спасылак пры змяненні назвы нататкі"
 
 #: ../data/tomboy.schemas.in.h:78
 msgid ""
@@ -473,30 +576,39 @@ 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 азначае, што карыстальнік хоча, каб у яго "
+"запытвалі пацвярджэнне, калі змяненне назвы нататкі можа паўплываць на "
+"спасылкі, якія існуюць у іншых нататках. Значэнне 1 азначае, што неабходна "
+"аўтаматычна выдаляць спасылкі. Значэнне 2 азначае, што тэкст спасылкі "
+"неабходна змяніць на новую назву нататкі, каб спасылка і надалей працягвала "
+"працаваць як раней."
 
 #: ../data/tomboy.schemas.in.h:79
 msgid "Timestamp format"
-msgstr ""
+msgstr "Фармат часу"
 
 #: ../data/tomboy.schemas.in.h:80
 msgid "The date format that is used for the timestamp."
-msgstr ""
+msgstr "Фармат даты, які ўжываецца для апісання часу."
 
 #: ../data/tomboy.schemas.in.h:81
 msgid "Enable closing notes with escape."
-msgstr ""
+msgstr "Уключыць закрыццё нататак пра дапамозе Escape."
 
 #: ../data/tomboy.schemas.in.h:82
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
+"Калі ўключана, адкрытую нататку можна закрыць, націснуўшы клавішу Escape."
 
 #: ../data/tomboy.schemas.in.h:83
 msgid "The handler for \"note://\" URLs"
-msgstr ""
+msgstr "Апрацоўшчык для URL-адрасоў \"note://\""
 
 #: ../data/tomboy.schemas.in.h:84
 msgid "Set to TRUE to activate"
-msgstr ""
+msgstr "Настаўце як TRUE, каб уключыць"
 
 #: ../Tomboy/ActionManager.cs:127
 msgid "_File"
@@ -1075,22 +1187,22 @@ msgstr "Невядомая памылка."
 msgid "Unfiled Notes"
 msgstr "Адасобленыя нататкі"
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#: ../Tomboy/ExportAllApplicationAddin.cs:390
 #, csharp-format
 msgid "Your notes were exported to \"{0}\"."
 msgstr "Вашы нататкі былі экспартаваныя ў \"{0}\"."
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:398
+#: ../Tomboy/ExportAllApplicationAddin.cs:399
 msgid "Notes exported successfully"
 msgstr "Нататкі паспяхова экспартаваныя"
 
-#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#: ../Tomboy/ExportAllApplicationAddin.cs:422
 #, 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
+#: ../Tomboy/ExportAllApplicationAddin.cs:508
 #, csharp-format
 msgid "Create destination folder for {0} export"
 msgstr "Стварыць мэтавую папку для экспартавання {0}"
@@ -1323,6 +1435,28 @@ msgid ""
 "\n"
 "Ciao!"
 msgstr ""
+"У апошняй версіі праграмы Tomboy файлы нататак былі перамешчаныя. Вы, "
+"напэўна, ніколі не клапаціліся аб тым, дзе захоўваюцца вашы нататкі. Калі "
+"вас гэта і цяпер не абыходзіць, проста <bold>выдаліце гэту нататку</"
+"bold>. :)\n"
+"\n"
+"Ваш стары каталог нататак і цяпер змяшчаецца на старым месцы: <link:url>{0}</"
+"link:url>. Калі вы вернецеся да старой версіі праграмы Tomboy, яна будзе там "
+"шукаць нататкі.\n"
+"\n"
+"Але мы скапіравалі вашы нататкі і канфігурацыйныя звесткі ў новыя каталогі, "
+"якія будуць выкарыстоўвацца надалей:\n"
+"\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>\n"
+"</list-item><list-item dir=\"ltr\">Журнальныя файлы можна знайсці ў <link:"
+"url>{4}</link:url></list-item></list>\n"
+"\n"
+"Дзякуй за ўвагу!"
 
 #: ../Tomboy/NoteManager.cs:265
 msgid ""
@@ -1344,6 +1478,24 @@ msgid ""
 "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"
+"\n"
+"Выкарыстайце нататку \"У пачатак\", каб пачаць арганізоўваць вашы ідэі і "
+"думкі.\n"
+"\n"
+"Вы можаце ствараць новыя нататкі для вашых ідэй, абіраючы элемент \"Стварыць "
+"новую нататку\" ў меню Tomboy у вашай панэлі GNOME. Ваша нататка захаваецца "
+"аўтаматычна.\n"
+"\n"
+"Потым можна арганізоўваць іх, злучаючы разам звязаныя нататкі і ідэі!\n"
+"\n"
+"Мы стварылі нататку пад назвай <link:internal>Як карыстацца спасылкамі "
+"Tomboy</link:internal>. Звярніце ўвагу, што кожны раз, калі мы пішам <link:"
+"internal>Як карыстацца спасылкамі Tomboy</link:internal>, гэта назва "
+"аўтаматычна падкрэсліваецца. Пстрыкніце па спасылцы, каб адкрыць нататку.</"
+"note-content>"
 
 #: ../Tomboy/NoteManager.cs:284
 msgid ""
@@ -1360,6 +1512,18 @@ 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"
+"\n"
+"Нататкі ў Tomboy могуць быць звязаныя разам пры дапамозе спасылак, якія "
+"можна ствараць, падсвяціўшы тэкст у бягучай нататцы і пстрыкнуўшы па кнопцы "
+"<bold>Спасылка</bold> на паліцы прылад.  Такім чынам будзе створана новая "
+"нататка, а падсветлены ў бягучай нататцы тэкст будзе падкрэслены.\n"
+"\n"
+"Змяненне назвы нататкі прывядзе да абнаўлення спасылак у іншых нататках. "
+"Дзякуючы гэтаму, усе спасылкі будуць дзейнымі пасля змянення назвы нататкі.\n"
+"\n"
+"Таксама, калі вы пішаце назву іншай нататкі ў бягучай нататцы, яна будзе "
+"аўтаматычна пераўтворана ў спасылку.</note-content>"
 
 #. Attempt to find an existing Start Here note
 #: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
@@ -1862,23 +2026,23 @@ msgstr "Нататка"
 
 #: ../Tomboy/RecentChanges.cs:373
 msgid "Last Changed"
-msgstr ""
+msgstr "Апошнія змены"
 
 #: ../Tomboy/RecentChanges.cs:512
 msgid "Matches"
-msgstr ""
+msgstr "Адпаведнікі"
 
 #: ../Tomboy/RecentChanges.cs:563
 msgid "Title match"
-msgstr ""
+msgstr "Адпаведнік у загалоўку"
 
 #: ../Tomboy/RecentChanges.cs:566
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "{0} адпаведнік"
+msgstr[1] "{0} адпаведнікі"
+msgstr[2] "{0} адпаведнікаў"
 
 #: ../Tomboy/RecentChanges.cs:580
 #, csharp-format
@@ -2197,7 +2361,9 @@ msgstr "Удзельнікі праекта:"
 
 #: ../Tomboy/Tomboy.cs:416
 msgid "translator-credits"
-msgstr "Ihar Hrachyshka <ihar.hrachyshka at gmail.com>"
+msgstr ""
+"Ihar Hrachyshka <ihar.hrachyshka at gmail.com>\n"
+"Kasia Bondarava<kasia.bondarava at gmail.com>"
 
 #: ../Tomboy/Tomboy.cs:425
 msgid ""
diff --git a/po/et.po b/po/et.po
index 3c160dc..338f7cd 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,28 +6,22 @@
 #
 # Ivar Smolin <okul linux ee>, 2006–2010.
 # Priit Laes <amd store20 com>, 2007.
-# Mattias Põldaru <mahfiaz gmail com>, 2009.
+# Mattias Põldaru <mahfiaz at gmail.com>, 2009, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=tomboy&component=general\n"
-"POT-Creation-Date: 2010-12-17 13:37+0000\n"
-"PO-Revision-Date: 2010-11-02 07:40+0200\n"
-"Last-Translator: Ivar Smolin <okul at linux.ee>\n"
-"Language-Team: Estonian <gnome-et at linux.ee>\n"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-02-26 19:16+0000\n"
+"PO-Revision-Date: 2012-03-01 12:53+0200\n"
+"Last-Translator: Mattias Põldaru <mahfiaz at gmail.com>\n"
+"Language-Team: Estonian <>\n"
 "Language: et\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"
-
-msgid "Accessories"
-msgstr "Tarvikud"
-
-msgid "Simple and easy to use note-taking"
-msgstr "Lihtne ja kergestikasutatav märkmete tegemise programm"
+"Content-Transfer-Encoding: 8bits\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 msgid "Tomboy Applet Factory"
 msgstr "Tomboy rakendi Factory"
@@ -35,79 +29,54 @@ msgstr "Tomboy rakendi Factory"
 msgid "Tomboy Notes"
 msgstr "Tomboy märkmed"
 
+msgid "Simple and easy to use note-taking"
+msgstr "Lihtne ja kergestikasutatav märkmete tegemise programm"
+
+msgid "Accessories"
+msgstr "Tarvikud"
+
 msgid "S_ynchronize Notes"
 msgstr "Sü_nkroniseeri märkmed"
 
-msgid "_About"
-msgstr "_Tomboy'st lähemalt"
+msgid "_Preferences"
+msgstr "_Eelistused"
 
 msgid "_Help"
 msgstr "A_bi"
 
-msgid "_Preferences"
-msgstr "_Eelistused"
-
-msgid "Note-taker"
-msgstr "Märkmik"
+msgid "_About"
+msgstr "_Tomboy'st lähemalt"
 
 msgid "Take notes, link ideas, and stay organized"
 msgstr "Tee märkmeid, ühenda ideed omavahel ja ole organiseeritud"
 
-msgid "Accept SSL Certificates"
-msgstr "SSL-sertifikaatide aktsepteerimine"
-
-msgid "Automatic Background Synchronization Timeout"
-msgstr "Automaatsünkroniseerimise intervall"
-
-msgid "Create a new Note"
-msgstr "Uue märkme loomine"
-
-msgid "Custom Font Face"
-msgstr "Kohandatud kirjatüüp"
-
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "Määrab otsinguakna X-koordinaadi, salvestatakse Tomboyst väljumisel."
-
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "Määra otsinguakna Y-koordinaadi, salvestatakse Tomboyst väljumisel."
+msgid "Note-taker"
+msgstr "Märkmik"
 
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr ""
-"Määrab otsinguakna kõrguse pikslites, salvestatakse Tomboyst väljumisel."
+msgid "Enable spellchecking"
+msgstr "Õigekirjakontrolli lubamine"
 
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid ""
+"If true, misspellings will be underlined in red, and correct spelling "
+"suggestions shown in the right-click menu."
 msgstr ""
-"Määrab otsinguakna laiuse pikslites, salvestatakse Tomboyst väljumisel."
-
-msgid "Enable Auto bulleted lists."
-msgstr "Täpploetelude lubamine."
-
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "Ikoonile keskmise nupuga asetamise lubamine."
-
-msgid "Enable Tray Icon"
-msgstr "Salveikooni lubamine"
+"Kui märgitud, siis õigekirjakontrolli poolt kahtlaseks märgitud sõnad "
+"joonitakse punaselt alla ja sõnal parema hiireklõpsu peale avanev menüü "
+"sisaldab õigekirjakontrolli soovitusi."
 
 msgid "Enable WikiWord highlighting"
 msgstr "WikiWord esiletõstmise lubamine"
 
-msgid "Enable closing notes with escape."
-msgstr "Escape-klahvi abil märkmete sulgemise lubamine"
-
-msgid "Enable custom font"
-msgstr "Kohandatud kirjatüübi lubamine"
-
-msgid "Enable global keybindings"
-msgstr "Globaalsete kiirklahvide lubamine"
-
-msgid "Enable spellchecking"
-msgstr "Õigekirjakontrolli lubamine"
-
-msgid "Enable startup notes"
-msgstr "Märkmete avamine käivitamisel"
+msgid ""
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
+msgstr ""
+"Selle võtme lubamisega tõstetakse SellisedSõnad (sõnad millel on suur täht "
+"keskel) esile. Sellisele sõnale klõpsates luuakse uus märge, mille "
+"pealkirjaks on klõpsatud sõna."
 
-msgid "Enable the Delete Note confirmation dialog"
-msgstr "Märkme kustutamise kinnitusdialoogi lubamine"
+msgid "Enable automatic bulleted lists."
+msgstr "Automaatsete täpploetelude lubamine."
 
 msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
@@ -116,6 +85,9 @@ msgstr ""
 "Kui märgitud, siis rea algusesse paigutatud märgi '-' või '*' korral "
 "alustatakse automaatselt täpploetelu."
 
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "Ikoonile keskmise nupuga asetamise lubamine."
+
 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."
@@ -124,31 +96,18 @@ msgstr ""
 "klõpsamisega asetada lõikelaua sisu \"Alusta siit\" märkmesse. Lisatav tekst "
 "varustatakse ajatempliga."
 
-msgid ""
-"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
-"will create a note with that name."
-msgstr ""
-"Selle võtme lubamisega tõstetakse SellisedSõnad (sõnad millel on suur täht "
-"keskel) esile. Sellisele sõnale klõpsates luuakse uus märge, mille "
-"pealkirjaks on klõpsatud sõna."
-
-msgid "FUSE Mounting Timeout (ms)"
-msgstr "FUSE-ga haakimise aegumine (ms)"
-
-msgid "HTML Export All Linked Notes"
-msgstr "Kõigi viidatud märkmete HTML-eksport"
-
-msgid "HTML Export Last Directory"
-msgstr "HTML-ekspordi viimane kataloog"
-
-msgid "HTML Export Linked Notes"
-msgstr "Viidatud märkmete HTML-eksport"
+msgid "Enable custom font"
+msgstr "Kohandatud kirjatüübi lubamine"
 
 msgid ""
-"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+"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 ""
-"Kui keelatud, siis toimub märkme kustutamine ilma kasutajalt kinnitust "
-"küsimata."
+"Kui märgitud, siis märkmete kuvamiseks kasutatakse custom_font_face võtmes "
+"määratud kirjatüüpi. Vastasel juhul kasutatakse töölaua kirjatüüpi."
+
+msgid "Custom Font Face"
+msgstr "Kohandatud kirjatüüp"
 
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
@@ -157,16 +116,29 @@ msgstr ""
 "Kui enable_custom_font võti on märgitud, siis kasutatakse märkmete "
 "kuvamiseks siinkirjeldatud kirjatüüpi."
 
+msgid "Enable global keybindings"
+msgstr "Globaalsete kiirklahvide lubamine"
+
 msgid ""
-"If enabled, all notes that were open when Tomboy quit will automatically be "
-"reopened at startup."
+"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 ""
-"Kui märgitud, siis avatakse käivitamisel automaatselt kõik märkmed, mis "
-"Tomboy sulgemisel avatud olid."
+"Kui märgitud, siis on /apps/tomboy/global_keybindings all määratud "
+"globaalsed kiirklahvid lubatud ja nende abil on võimalik Tomboy toiminguid "
+"igast rakendusest välja kutsuda."
 
-msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgid "Enable the Delete Note confirmation dialog"
+msgstr "Märkme kustutamise kinnitusdialoogi lubamine"
+
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr ""
-"Kui lubatud, siis on võimalik avatud märget sulgeda escape-klahvi abil."
+"Kui keelatud, siis toimub märkme kustutamine ilma kasutajalt kinnitust "
+"küsimata."
+
+msgid "Enable Tray Icon"
+msgstr "Salveikooni lubamine"
 
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
@@ -177,185 +149,76 @@ msgstr ""
 "keelamine võib vajalik olla juhul, kui mõni muu rakendus asendab Tomboy "
 "salveikooni."
 
-msgid ""
-"If true, misspellings will be underlined in red, and correct spelling "
-"suggestions shown in the right-click menu."
-msgstr ""
-"Kui märgitud, siis õigekirjakontrolli poolt kahtlaseks märgitud sõnad "
-"joonitakse punaselt alla ja sõnal parema hiireklõpsu peale avanev menüü "
-"sisaldab õigekirjakontrolli soovitusi."
-
-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 ""
-"Kui märgitud, siis on /apps/tomboy/global_keybindings all määratud "
-"globaalsed kiirklahvid lubatud ja nende abil on võimalik Tomboy toiminguid "
-"igast rakendusest välja kutsuda."
+msgid "Start Here Note"
+msgstr "\"Alusta siit\" märge"
 
 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."
+"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 ""
-"Kui märgitud, siis märkmete kuvamiseks kasutatakse custom_font_face võtmes "
-"määratud kirjatüüpi. Vastasel juhul kasutatakse töölaua kirjatüüpi."
+"\"Alusta siit\" märkme URI. See märge on alati nähtav Tomboy märkmete menüü "
+"allosas ja seda on võimalik kiirklahvi abil avada."
 
-msgid ""
-"Indicates that the Sticky Note Importer plugin has not been run, so it "
-"should run automatically the next time Tomboy starts."
-msgstr ""
-"Näitab, et Märkmepaberite importija pole varem käivitatud, seega tuleb see "
-"järgmisel Tomboy käivitamisel automaatselt käima panna."
+msgid "Minimum number of notes to show in menu"
+msgstr "Vähim menüüs näidatavate märgete arv"
 
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr "Täisarv, millega määratakse vähim märgete arv Tomboy märkmemenüüs."
 
-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 ""
-"Täisarvuline väärtus, mis määrab kui tihti teostatakse märkemete automaatset "
-"sünkroniseermist taustal (kui sünkroniseerimine on seadistatud). Iga "
-"väärtus, mis on väiksem kui 1, tühistab automaatsünkroniseerimise. Väikseim "
-"lubatud positiivne väärtus on 5. Väärtus on minutites."
-
-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 ""
-"Täisarvuline väärtus meetodi kohta, mille kasutaja on määranud vastuolude "
-"lahendamiseks. Väärtus 0 määrab, et iga vastuolu leidmisel küsitakse "
-"kasutajalt lahendamiseks kinnitust ja kasutaja peab iga juhtumi eraldi "
-"lahendama."
-
-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 ""
-"Täisarvuline väärtus, mis määrab märkmete ümbernimetamisel viidete "
-"uuendamise käitumise selle asemel, et küsida iga kord kasutajalt. Väärtus 0 "
-"määrab, et vastuolu leidmisel küsitakse kasutajalt lahendamiseks kinnitust. "
-"Väärtus 1 määrab, et viited eemaldatakse automaatselt. Väärtus 2 määrab, et "
-"viidete nimed asendatakse uute nimedega nii, et ümbernimetatud märgete vahel "
-"säilib viitamine."
-
-msgid "Link Updating Behavior on Note Rename"
-msgstr "Viite uuendamise käitumine märkme ümbernimetamisel"
-
 msgid "List of pinned notes."
 msgstr "Laualolevate märkmete nimekiri."
 
 msgid ""
-"Maximum characters of note title to show in the Tomboy tray or panel applet "
-"note menu."
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Tomboy note menu."
 msgstr ""
-"Tomboy salves või paneelirakendi märkmemenüüs näidatava märkme pealkirja "
-"suurim pikkus."
+"Tühja ruumiga eraldatud nimekiri märgete URI-dest, mis peavad alati olema "
+"Tomboy märgete menüüs."
 
 msgid "Maximum note title length to show in tray menu."
 msgstr "Salvemenüüs näidatava märkme pealkirja suurim pikkus."
 
-msgid "Minimum number of notes to show in menu"
-msgstr "Vähim menüüs näidatavate märgete arv"
-
-msgid "Note Synchronization Conflict Saved Behavior"
-msgstr "Salvestatud käitumine märkmete sünkroniseerimise vastuolu tarbeks"
-
-msgid "Open Recent Changes"
-msgstr "Viimaste muudatuste avamine"
-
-msgid "Open Search Dialog"
-msgstr "Otsimisdialoogi avamine"
-
-msgid "Open Start Here"
-msgstr "\"Alusta siit\" avamine"
-
-msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr "Tomboy sünkroniseerimiskataloogi asukoht SSH serveris (valikuline)."
-
 msgid ""
-"Path to the synchronization server when using the filesystem synchronization "
-"service addin."
-msgstr ""
-"Sünkroniseerimisserveri rada failisüsteemipõhise sünkroniseerimise lisa "
-"kasutamise korral."
-
-msgid "SSHFS Remote Synchronization Folder"
-msgstr "SSHFS kaugsünkroniseerimise kataloog"
-
-msgid "SSHFS Remote Synchronization User Name"
-msgstr "SSHFS kaugsünkroniseerimise kasutajanimi"
-
-msgid "SSHFS Synchronization Server Port"
-msgstr "SSHFS kaugsünkroniseerimise serveri port"
-
-msgid "SSHFS Synchronization Server URL"
-msgstr "SSHFS kaugsünkroniseerimise serveri URL"
-
-msgid "Saved height of Search window"
-msgstr "Otsinguakna kõrgus"
-
-msgid "Saved horizontal position of Search window"
-msgstr "Otsinguakna asukoht X-teljel"
-
-msgid "Saved vertical position of Search window"
-msgstr "Otsinguakna asukoht Y-teljel"
-
-msgid "Saved width of Search window"
-msgstr "Otsinguakna laius"
-
-msgid "Selected Synchronization Service Addin"
-msgstr "Sünkroniseerimisteenuseks valitud lisa"
-
-msgid "Set to TRUE to activate"
-msgstr "Aktiveerimiseks tuleb see märkida"
-
-msgid "Show applet menu"
-msgstr "Rakendimenüü näitamine"
-
-msgid "Start Here Note"
-msgstr "\"Alusta siit\" märge"
-
-msgid "Sticky Note Importer First Run"
-msgstr "Märkmepaberite importeri esimene töökord"
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
+msgstr ""
+"Tomboy salves või paneelirakendi märkmemenüüs näidatava märkme pealkirja "
+"suurim pikkus."
 
-msgid "Synchronization Client ID"
-msgstr "Sünkroniseerimiskliendi ID"
+msgid "Enable startup notes"
+msgstr "Märkmete avamine käivitamisel"
 
-msgid "Synchronization Local Server Path"
-msgstr "Sünkroniseerimise kohaliku serveri rada"
+msgid ""
+"If enabled, all notes that were open when Tomboy quit will automatically be "
+"reopened at startup."
+msgstr ""
+"Kui märgitud, siis avatakse käivitamisel automaatselt kõik märkmed, mis "
+"Tomboy sulgemisel avatud olid."
 
-msgid "The date format that is used for the timestamp."
-msgstr "Ajatemplis kasutatav kuupäeva vorming."
+msgid "Show applet menu"
+msgstr "Rakendimenüü näitamine"
 
 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."
+"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 ""
-"Globaalne klahvikombinatsioon uue märkme loomiseks ja kuvamiseks. Vorming on "
+"Globaalne klahvikombinatsioon Tomboy rakendimenüü näitamiseks. Vorming on "
 "kujul \"<Control>a\" või \"<Shift><Alt>F1\". Parser on "
 "vormingu suhtes üpris leplik ja lubab läbisegi nii suur- kui väiketähti, "
 "samuti ka lühendeid nagu \"<Ctl>\" and \"<Ctrl>\". Kui "
 "väärtuseks määrata eristring \"disabled\", siis on selle toimingu jaoks "
 "klahvikombinatsioon keelatud."
 
+msgid "Open Start Here"
+msgstr "\"Alusta siit\" avamine"
+
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -371,6 +234,27 @@ msgstr ""
 "väärtuseks määrata eristring \"disabled\", siis on selle toimingu jaoks "
 "klahvikombinatsioon keelatud."
 
+msgid "Create a new Note"
+msgstr "Uue märkme loomine"
+
+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 ""
+"Globaalne klahvikombinatsioon uue märkme loomiseks ja kuvamiseks. Vorming on "
+"kujul \"<Control>a\" või \"<Shift><Alt>F1\". Parser on "
+"vormingu suhtes üpris leplik ja lubab läbisegi nii suur- kui väiketähti, "
+"samuti ka lühendeid nagu \"<Ctl>\" and \"<Ctrl>\". Kui "
+"väärtuseks määrata eristring \"disabled\", siis on selle toimingu jaoks "
+"klahvikombinatsioon keelatud."
+
+msgid "Open Search Dialog"
+msgstr "Otsimisdialoogi avamine"
+
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -386,6 +270,9 @@ msgstr ""
 "väärtuseks määrata eristring \"disabled\", siis on selle toimingu jaoks "
 "klahvikombinatsioon keelatud."
 
+msgid "Open Recent Changes"
+msgstr "Viimaste muudatuste avamine"
+
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -401,28 +288,56 @@ msgstr ""
 "Kui väärtuseks määrata eristring \"disabled\", siis on selle toimingu jaoks "
 "klahvikombinatsioon keelatud."
 
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "\"Kõigi märkmete otsingu\" akna salvestatud kõrgus"
+
 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."
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
 msgstr ""
-"Globaalne klahvikombinatsioon Tomboy rakendimenüü näitamiseks. Vorming on "
-"kujul \"<Control>a\" või \"<Shift><Alt>F1\". Parser on "
-"vormingu suhtes üpris leplik ja lubab läbisegi nii suur- kui väiketähti, "
-"samuti ka lühendeid nagu \"<Ctl>\" and \"<Ctrl>\". Kui "
-"väärtuseks määrata eristring \"disabled\", siis on selle toimingu jaoks "
-"klahvikombinatsioon keelatud."
+"Määrab \"Kõigi märkmete otsingu\" akna kõrguse, salvestatakse Tomboyst "
+"väljumisel."
 
-msgid "The handler for \"note://\" URLs"
-msgstr "\"note://\" URL-ide käsitleja"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "\"Kõigi märkmete otsingu\" akna salvestatud laius"
+
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"Määrab \"Kõigi märkmete otsingu\" akna laiuse, salvestatakse Tomboyst "
+"väljumisel."
+
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr ""
+"\"Kõigi märkmete otsingu\" akna salvestatud horisontaalsuunaline asukoht"
+
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Määrab \"Kõigi märkmete otsingu\" akna X-koordinaadi, salvestatakse Tomboyst "
+"väljumisel."
+
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "\"Kõigi märkmete otsingu\" akna salvestatud vertikaalsuunaline asukoht"
+
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Määrab \"Kõigi märkmete otsingu\" akna Y-koordinaadi, salvestatakse Tomboyst "
+"väljumisel."
+
+msgid "Last Directory used in HTML Export"
+msgstr "HTMLi eksportimisel viimati kasutatud kataloog"
 
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr "Viimane kataloog, kuhu HTML-iks eksportimise plugin märkme salvestas."
 
+msgid "HTML Export Linked Notes"
+msgstr "Viidatud märkmete HTML-eksport"
+
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
@@ -430,6 +345,9 @@ msgstr ""
 "HTML-iks eksportimise plugina märkeruudu \"Eksporditakse ka viidatud märkmed"
 "\" viimane olek."
 
+msgid "HTML Export All Linked Notes"
+msgstr "Kõigi viidatud märkmete HTML-eksport"
+
 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 "
@@ -442,20 +360,47 @@ msgstr ""
 "eksportimise ajal kaasatakse kõik eksporditava märkme poolt viidatud "
 "märkmed, mis leitakse rekursiivse otsingu abil."
 
+msgid "Sticky Note Importer First Run"
+msgstr "Märkmepaberite importeri esimene töökord"
+
 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."
+"Indicates that the Sticky Note Importer plugin has not been run, so it "
+"should run automatically the next time Tomboy starts."
 msgstr ""
-"\"Alusta siit\" märkme URI. See märge on alati nähtav Tomboy märkmete menüü "
-"allosas ja seda on võimalik kiirklahvi abil avada."
+"Näitab, et Märkmepaberite importija pole varem käivitatud, seega tuleb see "
+"järgmisel Tomboy käivitamisel automaatselt käima panna."
+
+msgid "Synchronization Client ID"
+msgstr "Sünkroniseerimiskliendi ID"
 
 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."
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
 msgstr ""
-"SSH-ga sünkroniseerimisserverisse ühendumisel kasutatav port. SSH sätete "
-"vaikimisi pordi jaoks kasuta väärtust -1."
+"Sünkroniseerimisserveriga suhtlemiseks kasutatava Tomboy kliendi unikaalne "
+"identifikaator."
+
+msgid "Synchronization Local Server Path"
+msgstr "Sünkroniseerimise kohaliku serveri rada"
+
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr ""
+"Sünkroniseerimisserveri rada failisüsteemipõhise sünkroniseerimise lisa "
+"kasutamise korral."
+
+msgid "Selected Synchronization Service Addin"
+msgstr "Sünkroniseerimisteenuseks valitud lisa"
+
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr ""
+"Hetkel seadistatud sünkroniseerimisteenuse lisa unikaalne identifikaator."
+
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "FUSE-ga haakimise aegumine (ms)"
 
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
@@ -464,24 +409,36 @@ msgstr ""
 "Aeg (millisekundites) mille jooksul Tomboy peaks vastama jagatud "
 "sünkroniseerimiskausta haakimisel, kui kasutatakse FUSE-t."
 
-msgid "Timestamp format"
-msgstr "Ajatempli vorming"
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "SSHFS kaugsünkroniseerimise kataloog"
+
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr "Tomboy sünkroniseerimiskataloogi asukoht SSH serveris (valikuline)."
+
+msgid "SSHFS Synchronization Server URL"
+msgstr "SSHFS kaugsünkroniseerimise serveri URL"
 
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "SSH serveri URL, kus asub Tomboy sünkroniseerimiskataloog."
 
-msgid ""
-"Unique identifier for the currently configured note synchronization service "
-"addin."
-msgstr ""
-"Hetkel seadistatud sünkroniseerimisteenuse lisa unikaalne identifikaator."
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "SSHFS kaugsünkroniseerimise kasutajanimi"
+
+msgid "User name to use when connecting to the synchronization server via SSH."
+msgstr "SSH sünkroniseerimisserveriga ühendumise kasutajanimi."
+
+msgid "SSHFS Synchronization Server Port"
+msgstr "SSHFS kaugsünkroniseerimise serveri port"
 
 msgid ""
-"Unique identifier for this Tomboy client, used when communicating with a "
-"sychronization server."
+"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 ""
-"Sünkroniseerimisserveriga suhtlemiseks kasutatava Tomboy kliendi unikaalne "
-"identifikaator."
+"SSH-ga sünkroniseerimisserverisse ühendumisel kasutatav port. SSH sätete "
+"vaikimisi pordi jaoks kasuta väärtust -1."
+
+msgid "Accept SSL Certificates"
+msgstr "SSL-sertifikaatide aktsepteerimine"
 
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
@@ -490,15 +447,72 @@ msgstr ""
 "Wdfs valiku \"-ac\" kasutamine SSL sertifikaatidega nõustumiseks ilma "
 "kasutajalt küsimata."
 
-msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr "SSH sünkroniseerimisserveriga ühendumise kasutajanimi."
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr "Salvestatud käitumine märkmete sünkroniseerimise vastuolu tarbeks"
 
 msgid ""
-"Whitespace-separated list of note URIs for notes that should always appear "
-"in the Tomboy note menu."
+"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 ""
-"Tühja ruumiga eraldatud nimekiri märgete URI-dest, mis peavad alati olema "
-"Tomboy märgete menüüs."
+"Täisarvuline väärtus meetodi kohta, mille kasutaja on määranud vastuolude "
+"lahendamiseks. Väärtus 0 määrab, et iga vastuolu leidmisel küsitakse "
+"kasutajalt lahendamiseks kinnitust ja kasutaja peab iga juhtumi eraldi "
+"lahendama."
+
+msgid "Automatic Background Synchronization Timeout"
+msgstr "Automaatsünkroniseerimise intervall"
+
+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 ""
+"Täisarvuline väärtus, mis määrab kui tihti teostatakse märkemete automaatset "
+"sünkroniseermist taustal (kui sünkroniseerimine on seadistatud). Iga "
+"väärtus, mis on väiksem kui 1, tühistab automaatsünkroniseerimise. Väikseim "
+"lubatud positiivne väärtus on 5. Väärtus on minutites."
+
+msgid "Link Updating Behavior on Note Rename"
+msgstr "Viite uuendamise käitumine märkme ümbernimetamisel"
+
+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 ""
+"Täisarvuline väärtus, mis määrab märkmete ümbernimetamisel viidete "
+"uuendamise käitumise selle asemel, et küsida iga kord kasutajalt. Väärtus 0 "
+"määrab, et vastuolu leidmisel küsitakse kasutajalt lahendamiseks kinnitust. "
+"Väärtus 1 määrab, et viited eemaldatakse automaatselt. Väärtus 2 määrab, et "
+"viidete nimed asendatakse uute nimedega nii, et ümbernimetatud märgete vahel "
+"säilib viitamine."
+
+msgid "Timestamp format"
+msgstr "Ajatempli vorming"
+
+msgid "The date format that is used for the timestamp."
+msgstr "Ajatemplis kasutatav kuupäeva vorming."
+
+msgid "Enable closing notes with escape."
+msgstr "Escape-klahvi abil märkmete sulgemise lubamine"
+
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr ""
+"Kui lubatud, siis on võimalik avatud märget sulgeda escape-klahvi abil."
+
+msgid "The handler for \"note://\" URLs"
+msgstr "\"note://\" URL-ide käsitleja"
+
+msgid "Set to TRUE to activate"
+msgstr "Aktiveerimiseks tuleb see märkida"
 
 msgid "_File"
 msgstr "_Fail"
@@ -563,9 +577,18 @@ msgstr "Otsing kõikide märkmete hulgast"
 msgid "Start synchronizing notes"
 msgstr "Märkmete sünkroniseerimise alustamine"
 
+#. Addin's tab caption
+msgid "Advanced"
+msgstr "Laiendatud"
+
+#. Menu Note Count option
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Vähim menüüs näidatavate hiljutiste märgete arv (maksimaalne 18)"
+
 msgid "What links here?"
 msgstr "Mis siia viitab?"
 
+#. This is a disabled placeholder item for an empty menu
 msgid "(none)"
 msgstr "(puudub)"
 
@@ -607,6 +630,21 @@ msgstr "Kas kustutada see ikoon?"
 msgid "If you remove an icon it is permanently lost."
 msgstr "Kui sa ikooni kustutad, siis on see jäädavalt kadunud."
 
+msgid "Cannot open email"
+msgstr "E-posti pole võimalik avada"
+
+msgid "HTML"
+msgstr "HTML"
+
+msgid "Destination for HTML Export"
+msgstr "HTML-ekspordi sihtkoht"
+
+msgid "Export linked notes"
+msgstr "Eksporditakse ka viidatud märkmed"
+
+msgid "Include all other linked notes"
+msgstr "Kaasa arvatud kõik ülejäänud viidatud märkmed"
+
 msgid "Export to HTML"
 msgstr "Ekspordi HTML-iks"
 
@@ -627,18 +665,6 @@ msgstr "Kataloogi pole olemas."
 msgid "Could not save the file \"{0}\""
 msgstr "Faili \"{0}\" pole võimalik salvestada"
 
-msgid "Destination for HTML Export"
-msgstr "HTML-ekspordi sihtkoht"
-
-msgid "Export linked notes"
-msgstr "Eksporditakse ka viidatud märkmed"
-
-msgid "Include all other linked notes"
-msgstr "Kaasa arvatud kõik ülejäänud viidatud märkmed"
-
-msgid "Cannot open email"
-msgstr "E-posti pole võimalik avada"
-
 msgid "_Folder Path:"
 msgstr "_Kataloogi rada:"
 
@@ -700,14 +726,14 @@ msgid "Appointments"
 msgstr "Sündmused"
 
 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 ""
-"Uute \"tänaste märkmete\" teksti kohandamiseks tuleb muuta <span weight="
-"\"bold\">Täna: Mall</span> märget."
+"Uute \"Täna\" märkmete teksti muutmiseks muuda <b>Täna: mall</b> märkme "
+"teksti."
 
 msgid "_Open Today: Template"
-msgstr "_Ava Täna: Mall"
+msgstr "_Ava Täna: mall"
 
 msgid "Print"
 msgstr "Prindi"
@@ -724,6 +750,10 @@ msgstr "Lehekülg {0} / {1}"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd, d. MMMM yyyy, h:mm tt"
 
+#. Adding menu item when note is opened and window created
+msgid "Remove broken links"
+msgstr "Katkiste linkide eemaldamine"
+
 msgid "Add a sketch"
 msgstr "Lisa visand"
 
@@ -747,8 +777,8 @@ msgstr ""
 msgid "Server or username field is empty."
 msgstr "Serveri või kasutajanime väli on tühi."
 
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+msgid "SSH"
+msgstr "SSH"
 
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
@@ -771,8 +801,11 @@ msgid "Sticky Notes import completed"
 msgstr "Märkmepaberite import on valmis"
 
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> märkmepaberit <b>{1}</b>-st on edukalt imporditud."
+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>-st kleepmärkmest on edukalt imporditud."
+msgstr[1] "<b>{0}</b> <b>{1}</b>-st kleepmärkmest on edukalt imporditud."
 
 msgid "Untitled"
 msgstr "Pealkirjata"
@@ -805,8 +838,8 @@ msgstr "_Parool:"
 msgid "URL, username, or password field is empty."
 msgstr "URL-i, kasutajanime või parooliväli on tühi."
 
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+msgid "WebDAV"
+msgstr "WebDAV"
 
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
@@ -824,9 +857,6 @@ msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "Seadistuste salvestamine GNOME võtmerõngasse lõppes järgneva veaga:"
 
-msgid "Tomboy Web"
-msgstr "Tomboy veebisait"
-
 msgid "Connect to Server"
 msgstr "Serveriga ühenduse võtmine"
 
@@ -863,6 +893,78 @@ msgstr "Autoriseerimine veebisirvijas (Vajuta ühenduse lähtestamiseks)"
 msgid "Set the default browser and try again"
 msgstr "Määra vaikimisi veebisirvija ja proovi uuesti"
 
+msgid "Tomboy Web"
+msgstr "Tomboy veebisait"
+
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Ekspordi kõik märkmed kohta {0}"
+
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Alusta märkmete eksportimist kohta {0}"
+
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Ekspordi valitud märkmik kohta {0}"
+
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Alusta märkmiku eksportimist kohta {0}"
+
+msgid "_Tools"
+msgstr "_Tööriistad"
+
+msgid "Export"
+msgstr "Eksport"
+
+msgid "Export your notes."
+msgstr "Märkmete eksportimine."
+
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Kõigi märkmete eksportimine kohta {0}"
+
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Valitud märkmiku eksportimine kohta {0}"
+
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Kõigi märkmete {0} eksportimine"
+
+msgid "Could not export, access denied."
+msgstr "Eksportimine pole võimalik, ligipääs on keelatud."
+
+msgid "Could not export, folder does not exist."
+msgstr "Eksportimine pole võimalik, kataloogi pole olemas."
+
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Eksportimine pole võimalik: {0}"
+
+msgid "Unknown error."
+msgstr "Tundmatu viga."
+
+msgid "Unfiled Notes"
+msgstr "Liigitamata märkmed"
+
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Sinu märkmed eksporditi kohta \"{0}\"."
+
+msgid "Notes exported successfully"
+msgstr "Märkmed on edukalt eksporditud"
+
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Faile pole võimalik salvestada kataloogi \"{0}\""
+
+#. Translators: {0} is the export type, e.g. HTML
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "{0} eksportimiseks sihtkausta loomine"
+
 msgid "Search All Notes"
 msgstr "Otsing kõikide märkmete hulgast"
 
@@ -904,23 +1006,6 @@ msgstr "Nimi on juba kasutusel"
 msgid "C_reate"
 msgstr "L_oo"
 
-#. 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.
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Märkmiku {0} mall"
-
-msgid "All Notes"
-msgstr "Kõik märkmed"
-
-msgid "Unfiled Notes"
-msgstr "Liigitamata märkmed"
-
 msgid "Note_books"
 msgstr "_Märkmikud"
 
@@ -951,6 +1036,23 @@ msgstr "Valitud märkmiku kustutamine"
 msgid "Notebooks"
 msgstr "Märkmikud"
 
+#. 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.
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Märkmiku {0} mall"
+
+msgid "New Note"
+msgstr "Uus märge"
+
+msgid "All Notes"
+msgstr "Kõik märkmed"
+
 msgid "Really delete this notebook?"
 msgstr "Kas kustutada see märkmik?"
 
@@ -982,8 +1084,13 @@ msgstr "Märkmik"
 msgid "_New notebook..."
 msgstr "_Uus märkmik..."
 
-msgid "Really delete this note?"
-msgstr "Kas kustutada see märge?"
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Uus märge {0}"
+
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Kas kustutada märge \"{0}\"?"
 
 #, csharp-format
 msgid "Really delete this {0} note?"
@@ -1135,10 +1242,6 @@ msgstr "Alusta siit"
 msgid "Using Links in Tomboy"
 msgstr "Viitade kasutamine Tomboy's"
 
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Uus märge {0}"
-
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
 msgid "Describe your new note here."
@@ -1208,14 +1311,15 @@ msgstr "_Sulge kõik märkmed"
 msgid "Search"
 msgstr "Otsing"
 
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Otsing Sinu märkmete hulgast (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+msgid "Search your notes"
+msgstr "Otsing märkmete hulgast"
 
 msgid "Link"
 msgstr "Viit"
 
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Valitud tekstist uuele märkmele viitamine (Ctrl-L)"
+msgid "Link selected text to a new note"
+msgstr "Valitud tekstiga uuele märkmele viitamine"
 
 msgid "_Text"
 msgstr "_Tekst"
@@ -1235,6 +1339,25 @@ msgstr "Selle märkme kustutamine"
 msgid "Synchronize Notes"
 msgstr "Sünkroniseeri märkmeid"
 
+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 ""
+"See on mallmärge. See määrab tavaliste märgete vaikimisi sisu ning seda ei "
+"näidata märkmete menüüs ega otsingu aknas."
+
+msgid "Convert to regular note"
+msgstr "Tavaliseks märkmeks teisendamine"
+
+msgid "Save Si_ze"
+msgstr "Salvesta _suurus"
+
+msgid "Save Se_lection"
+msgstr "Salvesta _valik"
+
+msgid "Save _Title"
+msgstr "Salvesta _pealkiri"
+
 msgid "_Find..."
 msgstr "_Leia..."
 
@@ -1441,8 +1564,8 @@ msgstr "Muudetakse kohalik märkme nime."
 msgid "Replace my local note with the server's update."
 msgstr "Asendatakse kohalik märge serverist tuleva märkmega."
 
-msgid "WARNING: Are you sure?"
-msgstr "HOIATUS: Oled sa kindel?"
+msgid "Are you sure?"
+msgstr "Kas sa oled kindel?"
 
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
@@ -1458,250 +1581,90 @@ msgstr "Sünkroniseerimissätete lähtestamine"
 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 ""
 "Sa keelasid seadistatud sünkroniseerimisteenuse. Sinu sünkroniseerimissätted "
-"puhastatakse. Uut sünkroniseerimist on võimalik läbi viia alles pärast uute "
-"sätete salvestamist."
+"puhastatakse. Pärast sätete salvestamist võid olla sunnitud kõiki märkmeid "
+"uuesti sünkroniseerima."
 
-msgid "Success! You're connected!"
-msgstr "Ühendus edukalt loodud!"
+msgid "Connection successful"
+msgstr "Ühendus edukas"
 
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr ""
 "Tomboy on valmis Sinu märkmeid sünkroniseerima. Kas sa soovid kohe "
-"sünkroniseerida?"
-
-#, csharp-format
-msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
-msgstr ""
-"Vabandust, midagi läks viltu.  Palun kontrolli oma andmeid ja proovi uuesti. "
-"Võib-olla aitab sind logifaili {0} uurimine."
-
-msgid "Error connecting :("
-msgstr "Viga ühendumisel :("
-
-msgid "Version:"
-msgstr "Versioon:"
-
-msgid "Author:"
-msgstr "Autor:"
-
-msgid "Copyright:"
-msgstr "Autoriõigus:"
-
-msgid "Add-in Dependencies:"
-msgstr "Lisa sõltuvused:"
-
-msgid "_Search:"
-msgstr "_Otsing:"
-
-msgid "Note"
-msgstr "Märge"
-
-msgid "Last Changed"
-msgstr "Viimati muudetud"
-
-msgid "Matches"
-msgstr "Vastavused"
-
-#, csharp-format
-msgid "{0} match"
-msgid_plural "{0} matches"
-msgstr[0] "{0} vastavus"
-msgstr[1] "{0} vastavust"
-
-#, csharp-format
-msgid "Total: {0} note"
-msgid_plural "Total: {0} notes"
-msgstr[0] "Kokku: {0} märge"
-msgstr[1] "Kokku: {0} märget"
-
-#, csharp-format
-msgid "Matches: {0} note"
-msgid_plural "Matches: {0} notes"
-msgstr[0] "Vastavusi: {0} märge"
-msgstr[1] "Vastavusi: {0} märget"
-
-msgid "Notes"
-msgstr "Märkmed"
-
-msgid "Cannot create new note"
-msgstr "Uut märget pole võimalik luua"
-
-msgid "Primary Development:"
-msgstr "Põhiarendus:"
-
-msgid "Contributors:"
-msgstr "Kaasaaitajad:"
-
-msgid "translator-credits"
-msgstr ""
-"Ivar Smolin <okul linux ee>, 2006–2010.\n"
-"Priit Laes <amd store20 com>, 2007.\n"
-"Mattias Põldaru <mahfiaz gmail com>, 2009.\n"
-"Rene Pärts <rene87 hot ee>, 2010."
-
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 ülejäänud\n"
-
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Lihtne ja kergestikasutatav märkmete tegemise programm."
-
-msgid "Homepage"
-msgstr "Koduleht"
-
-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 on lihtne ja hõlpsasti kasutatav märkmete tegemise rakendus.\n"
-"Autoriõigused (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-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 ""
-"Kasutamine:\n"
-"  --version\t\t\tVersiooniandmete printimine.\n"
-"  --help\t\t\tSelle kasutusõpetuse printimine.\n"
-"  --note-path [path]\t\tMärkmete laadimine ja salvestamine selles "
-"kataloogis.\n"
-"  --search [tekst]\t\tMärkmeotsinguakna avamine koos määratud "
-"otsingutekstiga.\n"
-
-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\tUue märkme loomine ja kuvamine.\n"
-"  --new-note [pealkiri]\t\tUue, etteantud pealkirjaga märkme loomine ja "
-"kuvamine.\n"
-"  --open-note [pealkiri/url]\tOlemasoleva, etteantud pealkirjaga märkme "
-"kuvamine.\n"
-"  --start-here\t\t\t'Alusta siit' märkme kuvamine.\n"
-"  --highlight-search [tekst]\tAvatud märkmest teksti otsimine ja "
-"esiletõstmine.\n"
-
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versioon {0}"
-
-msgid " (new)"
-msgstr " (uus)"
-
-msgid "_About Tomboy"
-msgstr "_Tomboy'st lähemalt"
-
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"\"Tomboy märgete käsiraamatut\" pole võimalik leida. Palun veendu, et "
-"programm on korrektselt paigaldatud."
-
-msgid "Help not found"
-msgstr "Abiteavet ei leitud"
-
-msgid "Cannot open location"
-msgstr "Asukohta pole võimalik avada"
-
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Täna, {0}"
-
-msgid "Today"
-msgstr "Täna"
-
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Eile, {0}"
-
-msgid "Yesterday"
-msgstr "Eile"
+"sünkroniseerida?"
 
 #, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} päev tagasi, {1}"
-msgstr[1] "{0} päeva tagasi, {1}"
+msgid ""
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
+msgstr ""
+"Palun kontrolli oma andmeid ja proovi uuesti. Võib-olla sisaldab logifail "
+"{0} infot vea kohta."
 
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} päev tagasi"
-msgstr[1] "{0} päeva tagasi"
+msgid "Error connecting"
+msgstr "Viga ühendumisel"
 
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Homme, {0}"
+msgid "Version:"
+msgstr "Versioon:"
 
-msgid "Tomorrow"
-msgstr "Homme"
+msgid "Author:"
+msgstr "Autor:"
 
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "{0} päeva jooksul, {1}"
-msgstr[1] "{0} päeva jooksul, {1}"
+msgid "Copyright:"
+msgstr "Autoriõigus:"
 
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "{0} päeva jooksul"
-msgstr[1] "{0} päeva jooksul"
+msgid "Add-in Dependencies:"
+msgstr "Lisa sõltuvused:"
 
-msgid "MMMM d, h:mm tt"
-msgstr "d. MMMM h:mm tt"
+msgid "_Search:"
+msgstr "_Otsing:"
 
-msgid "MMMM d"
-msgstr "d. MMMM"
+msgid "Note"
+msgstr "Märge"
 
-msgid "No Date"
-msgstr "Kuupäev puudub"
+msgid "Last Changed"
+msgstr "Viimati muudetud"
 
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d. MMMM yyyy, h:mm tt"
+msgid "Matches"
+msgstr "Vastavused"
 
-msgid "MMMM d yyyy"
-msgstr "d. MMMM yyyy"
+msgid "Title match"
+msgstr "Pealkirja vastavus"
 
 #, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Pealkirjata {0})"
+msgid "{0} match"
+msgid_plural "{0} matches"
+msgstr[0] "{0} vastavus"
+msgstr[1] "{0} vastavust"
+
+#, csharp-format
+msgid "Total: {0} note"
+msgid_plural "Total: {0} notes"
+msgstr[0] "Kokku: {0} märge"
+msgstr[1] "Kokku: {0} märget"
 
 #, csharp-format
+msgid "Matches: {0} note"
+msgid_plural "Matches: {0} notes"
+msgstr[0] "Vastavusi: {0} märge"
+msgstr[1] "Vastavusi: {0} märget"
+
 msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
 msgstr ""
-"Märge pealkirjaga <b>{0}</b> on juba olemas. Enne jätkamist vali sellele "
-"märkmele mõni muu pealkiri."
-
-msgid "Note title taken"
-msgstr "Pealkiri on juba kasutusel"
+"Valitud märkmikust ei leitud vasteid.\n"
+"Kõigist märkmetest otsimiseks klõpsa siia."
 
-msgid "_Copy Link Address"
-msgstr "_Kopeeri viida aadress"
+msgid "Click here to search across all notebooks"
+msgstr "Kõigist märkmikutest otsimiseks klõpsa siia."
 
-msgid "_Open Link"
-msgstr "_Ava viit"
+msgid "Notes"
+msgstr "Märkmed"
 
 #, csharp-format
 msgid ""
@@ -1884,9 +1847,6 @@ msgstr ""
 "Serveris olev \"{0}\" versioon on vastuolus sinu kohaliku märkmega.  Mida sa "
 "soovid kohaliku märkmega ette võtta?"
 
-msgid "_Tools"
-msgstr "_Tööriistad"
-
 msgid "Could not enable FUSE"
 msgstr "FUSE-t pole võimalik lubada"
 
@@ -1915,3 +1875,180 @@ msgstr ""
 "Et tulevikus seda teatet vältida, peaks FUSE moodulid laaditama arvuti "
 "üleslaadimise ajal.  Lisa oma /etc/init.d/boot.local skripti rida \"modprobe "
 "fuse\" või faili /etc/modules rida \"fuse\"."
+
+msgid "Cannot create new note"
+msgstr "Uut märget pole võimalik luua"
+
+msgid "Primary Development:"
+msgstr "Põhiarendus:"
+
+msgid "Contributors:"
+msgstr "Kaasaaitajad:"
+
+msgid "translator-credits"
+msgstr ""
+"Ivar Smolin <okul linux ee>, 2006–2010.\n"
+"Priit Laes <amd store20 com>, 2007.\n"
+"Mattias Põldaru <mahfiaz gmail com>, 2009, 2011.\n"
+"Rene Pärts <rene87 hot ee>, 2010."
+
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 ülejäänud\n"
+
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Lihtne ja kergestikasutatav märkmete tegemise programm."
+
+msgid "Homepage"
+msgstr "Koduleht"
+
+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 on lihtne ja hõlpsasti kasutatav märkmete tegemise rakendus.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 ülejäänud\n"
+
+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 ""
+"Kasutamine:\n"
+"  --version\t\t\tVersiooniandmete printimine.\n"
+"  --help\t\t\tSelle kasutusõpetuse printimine.\n"
+"  --note-path [path]\t\tMärkmete laadimine ja salvestamine selles "
+"kataloogis.\n"
+"  --search [tekst]\t\tMärkmeotsinguakna avamine koos määratud "
+"otsingutekstiga.\n"
+
+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\tUue märkme loomine ja kuvamine.\n"
+"  --new-note [pealkiri]\t\tUue, etteantud pealkirjaga märkme loomine ja "
+"kuvamine.\n"
+"  --open-note [pealkiri/url]\tOlemasoleva, etteantud pealkirjaga märkme "
+"kuvamine.\n"
+"  --start-here\t\t\t'Alusta siit' märkme kuvamine.\n"
+"  --highlight-search [tekst]\tAvatud märkmest teksti otsimine ja "
+"esiletõstmine.\n"
+
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versioon {0}"
+
+msgid " (new)"
+msgstr " (uus)"
+
+msgid "_About Tomboy"
+msgstr "_Tomboy'st lähemalt"
+
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"\"Tomboy märgete käsiraamatut\" pole võimalik leida. Palun veendu, et "
+"programm on korrektselt paigaldatud."
+
+msgid "Help not found"
+msgstr "Abiteavet ei leitud"
+
+msgid "Cannot open location"
+msgstr "Asukohta pole võimalik avada"
+
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Täna, {0}"
+
+msgid "Today"
+msgstr "Täna"
+
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Eile, {0}"
+
+msgid "Yesterday"
+msgstr "Eile"
+
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} päev tagasi, {1}"
+msgstr[1] "{0} päeva tagasi, {1}"
+
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} päev tagasi"
+msgstr[1] "{0} päeva tagasi"
+
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Homme, {0}"
+
+msgid "Tomorrow"
+msgstr "Homme"
+
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "{0} päeva jooksul, {1}"
+msgstr[1] "{0} päeva jooksul, {1}"
+
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "{0} päeva jooksul"
+msgstr[1] "{0} päeva jooksul"
+
+msgid "MMMM d, h:mm tt"
+msgstr "d. MMMM h:mm tt"
+
+msgid "MMMM d"
+msgstr "d. MMMM"
+
+msgid "No Date"
+msgstr "Kuupäev puudub"
+
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d. MMMM yyyy, h:mm tt"
+
+msgid "MMMM d yyyy"
+msgstr "d. MMMM yyyy"
+
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Pealkirjata {0})"
+
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Märge pealkirjaga <b>{0}</b> on juba olemas. Enne jätkamist vali sellele "
+"märkmele mõni muu pealkiri."
+
+msgid "Note title taken"
+msgstr "Pealkiri on juba kasutusel"
+
+msgid "_Copy Link Address"
+msgstr "_Kopeeri viida aadress"
+
+msgid "_Open Link"
+msgstr "_Ava viit"
diff --git a/tomboy.spec b/tomboy.spec
index 8b713e7..aaa88f3 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        1.9.8
+Version:        1.9.9
 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