[Pkg-cli-apps-commits] [tomboy] 01/02: Imported Upstream version 1.15.4

Iain Lane laney at moszumanska.debian.org
Fri May 2 15:28:52 UTC 2014


This is an automated email from the git hooks/post-receive script.

laney pushed a commit to branch ubuntu
in repository tomboy.

commit 39ef0addf94b08a67873b5e4d647b6f757f48705
Author: Iain Lane <laney at debian.org>
Date:   Fri May 2 15:58:19 2014 +0100

    Imported Upstream version 1.15.4
---
 ChangeLog                                          |  479 +++++
 Makefile.in                                        |  242 +--
 NEWS                                               |   12 +
 Tomboy/Addins/AdvancedPreferences/Makefile.in      |  104 +-
 Tomboy/Addins/Backlinks/Makefile.in                |  104 +-
 Tomboy/Addins/Bugzilla/Makefile.in                 |  104 +-
 Tomboy/Addins/Evolution/Makefile.in                |  104 +-
 Tomboy/Addins/ExportToHtml/Makefile.in             |  104 +-
 Tomboy/Addins/FileSystemSyncService/Makefile.in    |  104 +-
 Tomboy/Addins/FixedWidth/Makefile.in               |  104 +-
 Tomboy/Addins/GalagoPresence/Makefile.in           |  104 +-
 Tomboy/Addins/InsertTimestamp/Makefile.in          |  104 +-
 Tomboy/Addins/Makefile.in                          |  201 +-
 Tomboy/Addins/NoteDirectoryWatcher/Makefile.in     |  104 +-
 Tomboy/Addins/NoteOfTheDay/Makefile.in             |  104 +-
 Tomboy/Addins/PrintNotes/Makefile.in               |  105 +-
 Tomboy/Addins/RemoveBrokenLinks/Makefile.in        |  104 +-
 Tomboy/Addins/Sketching/Makefile.in                |  104 +-
 Tomboy/Addins/SshSyncService/Makefile.in           |  104 +-
 Tomboy/Addins/StickyNoteImport/Makefile.in         |  104 +-
 Tomboy/Addins/Tasque/Makefile.in                   |  104 +-
 Tomboy/Addins/Underline/Makefile.in                |  104 +-
 Tomboy/Addins/WebDavSyncService/Makefile.in        |  104 +-
 Tomboy/Addins/WebSyncService/Api/NoteInfo.cs       |   84 +-
 .../Addins/WebSyncService/Api/ProxiedWebRequest.cs |   11 +-
 Tomboy/Addins/WebSyncService/Makefile.in           |  104 +-
 Tomboy/Makefile.in                                 |  219 ++-
 Tomboy/Note.cs                                     |    7 +-
 Tomboy/NoteManager.cs                              |    3 +-
 Tomboy/PreferencesDialog.cs                        |    2 +-
 Tomboy/Synchronization/SyncManager.cs              |    3 +-
 Tomboy/Synchronization/TomboySyncClient.cs         |    4 +-
 aclocal.m4                                         |  650 +++++--
 configure                                          | 1984 +++++++-------------
 configure.in                                       |    4 +-
 data/Makefile.in                                   |  237 +--
 data/icons/Makefile.in                             |  102 +-
 debian/README.source                               |   57 -
 debian/WebSyncServiceAddin.dll.config              |    3 -
 debian/changelog                                   | 1202 ------------
 debian/compat                                      |    1 -
 debian/control                                     |   44 -
 debian/copyright                                   |   94 -
 debian/dirs                                        |    1 -
 debian/gbp.conf                                    |    4 -
 debian/patches/01_dllmaps.patch                    |   15 -
 debian/patches/20_remove_pcfile_requires           |   16 -
 debian/patches/series                              |    2 -
 debian/rules                                       |   51 -
 debian/source/format                               |    1 -
 debian/source/local-options                        |    1 -
 debian/tomboy.docs                                 |    2 -
 debian/tomboy.install                              |    1 -
 debian/tomboy.menu                                 |    6 -
 debian/tomboy.postinst                             |   13 -
 debian/watch                                       |    4 -
 help/C/addins-desktop-bugzilla.page                |   32 +
 help/C/addins-desktop-printing.page                |   41 +
 help/C/addins-desktop.page                         |   51 -
 help/C/addins-formatting-fixed-width.page          |   41 +
 help/C/addins-formatting-underline.page            |   39 +
 help/C/addins-formatting.page                      |   40 -
 help/C/addins-preferences.page                     |   51 +
 help/C/addins-sync-local.page                      |   21 +
 help/C/addins-sync-ssh.page                        |   27 +
 help/C/addins-sync-webdav.page                     |   26 +
 help/C/addins-sync-webservice.page                 |   22 +
 help/C/addins-sync.page                            |   60 -
 help/C/addins-tools-backlinks.page                 |   29 +
 help/C/addins-tools-html-export.page               |   35 +
 help/C/addins-tools-note-of-day.page               |   37 +
 help/C/addins-tools-timestamp.page                 |   33 +
 help/C/addins-tools.page                           |   73 -
 help/C/addins.page                                 |   61 +-
 help/C/delete-notes.page                           |   41 +-
 help/C/introduction.page                           |    4 +-
 help/C/pin-notes.page                              |   49 +
 help/C/sync-setup.page                             |    8 +-
 help/C/sync.page                                   |   20 +-
 help/C/whatsnew.page                               |    4 +-
 help/Makefile.am                                   |   23 +-
 help/Makefile.in                                   |  130 +-
 help/ca/addins-desktop-bugzilla.page               |   31 +
 help/ca/addins-desktop-printing.page               |   40 +
 help/ca/addins-desktop.page                        |   41 -
 help/ca/addins-formatting-fixed-width.page         |   40 +
 help/ca/addins-formatting-underline.page           |   38 +
 help/ca/addins-formatting.page                     |   33 -
 help/ca/addins-preferences.page                    |   50 +
 help/ca/addins-sync-local.page                     |   20 +
 help/ca/addins-sync-ssh.page                       |   26 +
 help/ca/addins-sync-webdav.page                    |   25 +
 help/ca/addins-sync-webservice.page                |   21 +
 help/ca/addins-sync.page                           |   46 -
 help/ca/addins-tools-backlinks.page                |   28 +
 help/ca/addins-tools-html-export.page              |   34 +
 help/ca/addins-tools-note-of-day.page              |   36 +
 help/ca/addins-tools-timestamp.page                |   32 +
 help/ca/addins-tools.page                          |   53 -
 help/ca/addins.page                                |   61 +-
 help/ca/delete-notes.page                          |   39 +-
 help/ca/introduction.page                          |    5 +-
 help/ca/pin-notes.page                             |   47 +
 help/ca/sync-setup.page                            |   23 +-
 help/ca/sync.page                                  |   23 +-
 help/ca/whatsnew.page                              |    5 +-
 help/cs/addins-desktop-bugzilla.page               |   27 +
 help/cs/addins-desktop-printing.page               |   37 +
 help/cs/addins-desktop.page                        |   41 -
 help/cs/addins-formatting-fixed-width.page         |   37 +
 help/cs/addins-formatting-underline.page           |   37 +
 help/cs/addins-formatting.page                     |   33 -
 help/cs/addins-preferences.page                    |   47 +
 help/cs/addins-sync-local.page                     |   20 +
 help/cs/addins-sync-ssh.page                       |   22 +
 help/cs/addins-sync-webdav.page                    |   22 +
 help/cs/addins-sync-webservice.page                |   20 +
 help/cs/addins-sync.page                           |   46 -
 help/cs/addins-tools-backlinks.page                |   28 +
 help/cs/addins-tools-html-export.page              |   34 +
 help/cs/addins-tools-note-of-day.page              |   33 +
 help/cs/addins-tools-timestamp.page                |   29 +
 help/cs/addins-tools.page                          |   53 -
 help/cs/addins.page                                |   58 +-
 help/cs/cs.po                                      | 1213 +++++++-----
 help/cs/delete-notes.page                          |   35 +-
 help/cs/introduction.page                          |    4 +-
 help/cs/legal.xml                                  |    8 +-
 help/cs/pin-notes.page                             |   39 +
 help/cs/sync-setup.page                            |    2 +-
 help/cs/sync.page                                  |    4 +-
 help/de/addins-desktop-bugzilla.page               |   31 +
 help/de/addins-desktop-printing.page               |   40 +
 help/de/addins-desktop.page                        |   41 -
 help/de/addins-formatting-fixed-width.page         |   40 +
 help/de/addins-formatting-underline.page           |   38 +
 help/de/addins-formatting.page                     |   33 -
 help/de/addins-preferences.page                    |   50 +
 help/de/addins-sync-local.page                     |   20 +
 help/de/addins-sync-ssh.page                       |   26 +
 help/de/addins-sync-webdav.page                    |   25 +
 help/de/addins-sync-webservice.page                |   21 +
 help/de/addins-sync.page                           |   46 -
 help/de/addins-tools-backlinks.page                |   28 +
 help/de/addins-tools-html-export.page              |   34 +
 help/de/addins-tools-note-of-day.page              |   36 +
 help/de/addins-tools-timestamp.page                |   32 +
 help/de/addins-tools.page                          |   53 -
 help/de/addins.page                                |   61 +-
 help/de/delete-notes.page                          |   38 +-
 help/de/introduction.page                          |    5 +-
 help/de/pin-notes.page                             |   47 +
 help/de/sync-setup.page                            |   26 +-
 help/de/sync.page                                  |   23 +-
 help/de/whatsnew.page                              |    5 +-
 help/el/addins-desktop-bugzilla.page               |   31 +
 help/el/addins-desktop-printing.page               |   40 +
 help/el/addins-desktop.page                        |   41 -
 help/el/addins-formatting-fixed-width.page         |   40 +
 help/el/addins-formatting-underline.page           |   38 +
 help/el/addins-formatting.page                     |   33 -
 help/el/addins-preferences.page                    |   50 +
 help/el/addins-sync-local.page                     |   20 +
 help/el/addins-sync-ssh.page                       |   26 +
 help/el/addins-sync-webdav.page                    |   25 +
 help/el/addins-sync-webservice.page                |   21 +
 help/el/addins-sync.page                           |   46 -
 help/el/addins-tools-backlinks.page                |   28 +
 help/el/addins-tools-html-export.page              |   34 +
 help/el/addins-tools-note-of-day.page              |   36 +
 help/el/addins-tools-timestamp.page                |   32 +
 help/el/addins-tools.page                          |   53 -
 help/el/addins.page                                |   61 +-
 help/el/delete-notes.page                          |   38 +-
 help/el/introduction.page                          |    5 +-
 help/el/pin-notes.page                             |   47 +
 help/el/sync-setup.page                            |   26 +-
 help/el/sync.page                                  |   23 +-
 help/el/whatsnew.page                              |    5 +-
 help/en_GB/addins-desktop-bugzilla.page            |   31 +
 help/en_GB/addins-desktop-printing.page            |   40 +
 help/en_GB/addins-desktop.page                     |   50 -
 help/en_GB/addins-formatting-fixed-width.page      |   40 +
 help/en_GB/addins-formatting-underline.page        |   38 +
 help/en_GB/addins-formatting.page                  |   39 -
 help/en_GB/addins-preferences.page                 |   50 +
 help/en_GB/addins-sync-local.page                  |   20 +
 help/en_GB/addins-sync-ssh.page                    |   26 +
 help/en_GB/addins-sync-webdav.page                 |   25 +
 help/en_GB/addins-sync-webservice.page             |   21 +
 help/en_GB/addins-sync.page                        |   59 -
 help/en_GB/addins-tools-backlinks.page             |   28 +
 help/en_GB/addins-tools-html-export.page           |   34 +
 help/en_GB/addins-tools-note-of-day.page           |   36 +
 help/en_GB/addins-tools-timestamp.page             |   32 +
 help/en_GB/addins-tools.page                       |   72 -
 help/en_GB/addins.page                             |   61 +-
 help/en_GB/delete-notes.page                       |   41 +-
 help/en_GB/introduction.page                       |    4 +-
 help/en_GB/pin-notes.page                          |   47 +
 help/en_GB/sync-setup.page                         |    8 +-
 help/en_GB/sync.page                               |   20 +-
 help/en_GB/whatsnew.page                           |    4 +-
 help/es/addins-desktop-bugzilla.page               |   27 +
 help/es/addins-desktop-printing.page               |   37 +
 help/es/addins-desktop.page                        |   41 -
 help/es/addins-formatting-fixed-width.page         |   37 +
 help/es/addins-formatting-underline.page           |   37 +
 help/es/addins-formatting.page                     |   33 -
 help/es/addins-preferences.page                    |   47 +
 help/es/addins-sync-local.page                     |   20 +
 help/es/addins-sync-ssh.page                       |   22 +
 help/es/addins-sync-webdav.page                    |   22 +
 help/es/addins-sync-webservice.page                |   20 +
 help/es/addins-sync.page                           |   46 -
 help/es/addins-tools-backlinks.page                |   28 +
 help/es/addins-tools-html-export.page              |   34 +
 help/es/addins-tools-note-of-day.page              |   33 +
 help/es/addins-tools-timestamp.page                |   29 +
 help/es/addins-tools.page                          |   53 -
 help/es/addins.page                                |   56 +-
 help/es/delete-notes.page                          |   35 +-
 help/es/es.po                                      | 1422 +++++++++-----
 help/es/legal.xml                                  |    8 +-
 help/es/pin-notes.page                             |   39 +
 help/es/sync.page                                  |    6 +-
 help/es/whatsnew.page                              |    2 +-
 help/eu/addins-desktop-bugzilla.page               |   31 +
 help/eu/addins-desktop-printing.page               |   40 +
 help/eu/addins-desktop.page                        |   50 -
 help/eu/addins-formatting-fixed-width.page         |   40 +
 help/eu/addins-formatting-underline.page           |   38 +
 help/eu/addins-formatting.page                     |   39 -
 help/eu/addins-preferences.page                    |   50 +
 help/eu/addins-sync-local.page                     |   20 +
 help/eu/addins-sync-ssh.page                       |   26 +
 help/eu/addins-sync-webdav.page                    |   25 +
 help/eu/addins-sync-webservice.page                |   21 +
 help/eu/addins-sync.page                           |   59 -
 help/eu/addins-tools-backlinks.page                |   28 +
 help/eu/addins-tools-html-export.page              |   34 +
 help/eu/addins-tools-note-of-day.page              |   36 +
 help/eu/addins-tools-timestamp.page                |   32 +
 help/eu/addins-tools.page                          |   72 -
 help/eu/addins.page                                |   61 +-
 help/eu/delete-notes.page                          |   41 +-
 help/eu/introduction.page                          |    4 +-
 help/eu/pin-notes.page                             |   47 +
 help/eu/sync-setup.page                            |    8 +-
 help/eu/sync.page                                  |   20 +-
 help/eu/whatsnew.page                              |    4 +-
 help/fr/addins-desktop-bugzilla.page               |   31 +
 help/fr/addins-desktop-printing.page               |   40 +
 help/fr/addins-desktop.page                        |   41 -
 help/fr/addins-formatting-fixed-width.page         |   40 +
 help/fr/addins-formatting-underline.page           |   38 +
 help/fr/addins-formatting.page                     |   33 -
 help/fr/addins-preferences.page                    |   50 +
 help/fr/addins-sync-local.page                     |   20 +
 help/fr/addins-sync-ssh.page                       |   26 +
 help/fr/addins-sync-webdav.page                    |   25 +
 help/fr/addins-sync-webservice.page                |   21 +
 help/fr/addins-sync.page                           |   46 -
 help/fr/addins-tools-backlinks.page                |   28 +
 help/fr/addins-tools-html-export.page              |   34 +
 help/fr/addins-tools-note-of-day.page              |   36 +
 help/fr/addins-tools-timestamp.page                |   32 +
 help/fr/addins-tools.page                          |   53 -
 help/fr/addins.page                                |   61 +-
 help/fr/delete-notes.page                          |   38 +-
 help/fr/introduction.page                          |    5 +-
 help/fr/pin-notes.page                             |   47 +
 help/fr/sync-setup.page                            |   26 +-
 help/fr/sync.page                                  |   23 +-
 help/fr/whatsnew.page                              |    5 +-
 help/gl/addins-desktop-bugzilla.page               |   31 +
 help/gl/addins-desktop-printing.page               |   40 +
 help/gl/addins-desktop.page                        |   41 -
 help/gl/addins-formatting-fixed-width.page         |   40 +
 help/gl/addins-formatting-underline.page           |   38 +
 help/gl/addins-formatting.page                     |   33 -
 help/gl/addins-preferences.page                    |   50 +
 help/gl/addins-sync-local.page                     |   20 +
 help/gl/addins-sync-ssh.page                       |   26 +
 help/gl/addins-sync-webdav.page                    |   25 +
 help/gl/addins-sync-webservice.page                |   21 +
 help/gl/addins-sync.page                           |   46 -
 help/gl/addins-tools-backlinks.page                |   28 +
 help/gl/addins-tools-html-export.page              |   34 +
 help/gl/addins-tools-note-of-day.page              |   36 +
 help/gl/addins-tools-timestamp.page                |   32 +
 help/gl/addins-tools.page                          |   53 -
 help/gl/addins.page                                |   61 +-
 help/gl/delete-notes.page                          |   38 +-
 help/gl/introduction.page                          |    5 +-
 help/gl/pin-notes.page                             |   47 +
 help/gl/sync-setup.page                            |   23 +-
 help/gl/sync.page                                  |   23 +-
 help/gl/whatsnew.page                              |    5 +-
 help/hu/addins-desktop-bugzilla.page               |   31 +
 help/hu/addins-desktop-printing.page               |   40 +
 help/hu/addins-desktop.page                        |   41 -
 help/hu/addins-formatting-fixed-width.page         |   40 +
 help/hu/addins-formatting-underline.page           |   38 +
 help/hu/addins-formatting.page                     |   33 -
 help/hu/addins-preferences.page                    |   50 +
 help/hu/addins-sync-local.page                     |   20 +
 help/hu/addins-sync-ssh.page                       |   26 +
 help/hu/addins-sync-webdav.page                    |   25 +
 help/hu/addins-sync-webservice.page                |   21 +
 help/hu/addins-sync.page                           |   46 -
 help/hu/addins-tools-backlinks.page                |   28 +
 help/hu/addins-tools-html-export.page              |   34 +
 help/hu/addins-tools-note-of-day.page              |   36 +
 help/hu/addins-tools-timestamp.page                |   32 +
 help/hu/addins-tools.page                          |   53 -
 help/hu/addins.page                                |   61 +-
 help/hu/delete-notes.page                          |   38 +-
 help/hu/introduction.page                          |    5 +-
 help/hu/pin-notes.page                             |   47 +
 help/hu/sync-setup.page                            |   23 +-
 help/hu/sync.page                                  |   23 +-
 help/hu/whatsnew.page                              |    5 +-
 help/it/addins-desktop-bugzilla.page               |   31 +
 help/it/addins-desktop-printing.page               |   40 +
 help/it/addins-desktop.page                        |   50 -
 help/it/addins-formatting-fixed-width.page         |   40 +
 help/it/addins-formatting-underline.page           |   38 +
 help/it/addins-formatting.page                     |   39 -
 help/it/addins-preferences.page                    |   50 +
 help/it/addins-sync-local.page                     |   20 +
 help/it/addins-sync-ssh.page                       |   26 +
 help/it/addins-sync-webdav.page                    |   25 +
 help/it/addins-sync-webservice.page                |   21 +
 help/it/addins-sync.page                           |   59 -
 help/it/addins-tools-backlinks.page                |   28 +
 help/it/addins-tools-html-export.page              |   34 +
 help/it/addins-tools-note-of-day.page              |   36 +
 help/it/addins-tools-timestamp.page                |   32 +
 help/it/addins-tools.page                          |   72 -
 help/it/addins.page                                |   61 +-
 help/it/delete-notes.page                          |   41 +-
 help/it/introduction.page                          |    4 +-
 help/it/pin-notes.page                             |   47 +
 help/it/sync-setup.page                            |    8 +-
 help/it/sync.page                                  |   20 +-
 help/it/whatsnew.page                              |    4 +-
 help/lt/addins-desktop-bugzilla.page               |   31 +
 help/lt/addins-desktop-printing.page               |   40 +
 help/lt/addins-desktop.page                        |   50 -
 help/lt/addins-formatting-fixed-width.page         |   40 +
 help/lt/addins-formatting-underline.page           |   38 +
 help/lt/addins-formatting.page                     |   39 -
 help/lt/addins-preferences.page                    |   50 +
 help/lt/addins-sync-local.page                     |   20 +
 help/lt/addins-sync-ssh.page                       |   26 +
 help/lt/addins-sync-webdav.page                    |   25 +
 help/lt/addins-sync-webservice.page                |   21 +
 help/lt/addins-sync.page                           |   59 -
 help/lt/addins-tools-backlinks.page                |   28 +
 help/lt/addins-tools-html-export.page              |   34 +
 help/lt/addins-tools-note-of-day.page              |   36 +
 help/lt/addins-tools-timestamp.page                |   32 +
 help/lt/addins-tools.page                          |   72 -
 help/lt/addins.page                                |   61 +-
 help/lt/delete-notes.page                          |   41 +-
 help/lt/introduction.page                          |    4 +-
 help/lt/pin-notes.page                             |   47 +
 help/lt/sync-setup.page                            |    8 +-
 help/lt/sync.page                                  |   20 +-
 help/lt/whatsnew.page                              |    4 +-
 help/lv/addins-desktop-bugzilla.page               |   31 +
 help/lv/addins-desktop-printing.page               |   40 +
 help/lv/addins-desktop.page                        |   41 -
 help/lv/addins-formatting-fixed-width.page         |   40 +
 help/lv/addins-formatting-underline.page           |   38 +
 help/lv/addins-formatting.page                     |   33 -
 help/lv/addins-preferences.page                    |   50 +
 help/lv/addins-sync-local.page                     |   20 +
 help/lv/addins-sync-ssh.page                       |   26 +
 help/lv/addins-sync-webdav.page                    |   25 +
 help/lv/addins-sync-webservice.page                |   21 +
 help/lv/addins-sync.page                           |   46 -
 help/lv/addins-tools-backlinks.page                |   28 +
 help/lv/addins-tools-html-export.page              |   34 +
 help/lv/addins-tools-note-of-day.page              |   36 +
 help/lv/addins-tools-timestamp.page                |   32 +
 help/lv/addins-tools.page                          |   53 -
 help/lv/addins.page                                |   61 +-
 help/lv/delete-notes.page                          |   38 +-
 help/lv/introduction.page                          |    5 +-
 help/lv/pin-notes.page                             |   47 +
 help/lv/sync-setup.page                            |   26 +-
 help/lv/sync.page                                  |   23 +-
 help/lv/whatsnew.page                              |    5 +-
 help/oc/addins-desktop-bugzilla.page               |   31 +
 help/oc/addins-desktop-printing.page               |   40 +
 help/oc/addins-desktop.page                        |   50 -
 help/oc/addins-formatting-fixed-width.page         |   40 +
 help/oc/addins-formatting-underline.page           |   38 +
 help/oc/addins-formatting.page                     |   39 -
 help/oc/addins-preferences.page                    |   50 +
 help/oc/addins-sync-local.page                     |   20 +
 help/oc/addins-sync-ssh.page                       |   26 +
 help/oc/addins-sync-webdav.page                    |   25 +
 help/oc/addins-sync-webservice.page                |   21 +
 help/oc/addins-sync.page                           |   59 -
 help/oc/addins-tools-backlinks.page                |   28 +
 help/oc/addins-tools-html-export.page              |   34 +
 help/oc/addins-tools-note-of-day.page              |   36 +
 help/oc/addins-tools-timestamp.page                |   32 +
 help/oc/addins-tools.page                          |   72 -
 help/oc/addins.page                                |   61 +-
 help/oc/delete-notes.page                          |   41 +-
 help/oc/introduction.page                          |    4 +-
 help/oc/pin-notes.page                             |   47 +
 help/oc/sync-setup.page                            |    8 +-
 help/oc/sync.page                                  |   20 +-
 help/oc/whatsnew.page                              |    4 +-
 help/pl/addins-desktop-bugzilla.page               |   31 +
 help/pl/addins-desktop-printing.page               |   40 +
 help/pl/addins-desktop.page                        |   41 -
 help/pl/addins-formatting-fixed-width.page         |   40 +
 help/pl/addins-formatting-underline.page           |   38 +
 help/pl/addins-formatting.page                     |   33 -
 help/pl/addins-preferences.page                    |   50 +
 help/pl/addins-sync-local.page                     |   20 +
 help/pl/addins-sync-ssh.page                       |   26 +
 help/pl/addins-sync-webdav.page                    |   25 +
 help/pl/addins-sync-webservice.page                |   21 +
 help/pl/addins-sync.page                           |   46 -
 help/pl/addins-tools-backlinks.page                |   28 +
 help/pl/addins-tools-html-export.page              |   34 +
 help/pl/addins-tools-note-of-day.page              |   36 +
 help/pl/addins-tools-timestamp.page                |   32 +
 help/pl/addins-tools.page                          |   53 -
 help/pl/addins.page                                |   61 +-
 help/pl/delete-notes.page                          |   38 +-
 help/pl/pin-notes.page                             |   47 +
 help/pl/pl.po                                      |   57 +-
 help/pl/sync.page                                  |    4 +-
 help/pt_BR/addins-desktop-bugzilla.page            |   31 +
 help/pt_BR/addins-desktop-printing.page            |   40 +
 help/pt_BR/addins-desktop.page                     |   50 -
 help/pt_BR/addins-formatting-fixed-width.page      |   40 +
 help/pt_BR/addins-formatting-underline.page        |   38 +
 help/pt_BR/addins-formatting.page                  |   39 -
 help/pt_BR/addins-preferences.page                 |   50 +
 help/pt_BR/addins-sync-local.page                  |   20 +
 help/pt_BR/addins-sync-ssh.page                    |   26 +
 help/pt_BR/addins-sync-webdav.page                 |   25 +
 help/pt_BR/addins-sync-webservice.page             |   21 +
 help/pt_BR/addins-sync.page                        |   59 -
 help/pt_BR/addins-tools-backlinks.page             |   28 +
 help/pt_BR/addins-tools-html-export.page           |   34 +
 help/pt_BR/addins-tools-note-of-day.page           |   36 +
 help/pt_BR/addins-tools-timestamp.page             |   32 +
 help/pt_BR/addins-tools.page                       |   72 -
 help/pt_BR/addins.page                             |   61 +-
 help/pt_BR/delete-notes.page                       |   41 +-
 help/pt_BR/introduction.page                       |    4 +-
 help/pt_BR/pin-notes.page                          |   47 +
 help/pt_BR/sync-setup.page                         |    8 +-
 help/pt_BR/sync.page                               |   20 +-
 help/pt_BR/whatsnew.page                           |    4 +-
 help/ru/addins-desktop-bugzilla.page               |   31 +
 help/ru/addins-desktop-printing.page               |   40 +
 help/ru/addins-desktop.page                        |   50 -
 help/ru/addins-formatting-fixed-width.page         |   40 +
 help/ru/addins-formatting-underline.page           |   38 +
 help/ru/addins-formatting.page                     |   39 -
 help/ru/addins-preferences.page                    |   50 +
 help/ru/addins-sync-local.page                     |   20 +
 help/ru/addins-sync-ssh.page                       |   26 +
 help/ru/addins-sync-webdav.page                    |   25 +
 help/ru/addins-sync-webservice.page                |   21 +
 help/ru/addins-sync.page                           |   59 -
 help/ru/addins-tools-backlinks.page                |   28 +
 help/ru/addins-tools-html-export.page              |   34 +
 help/ru/addins-tools-note-of-day.page              |   36 +
 help/ru/addins-tools-timestamp.page                |   32 +
 help/ru/addins-tools.page                          |   72 -
 help/ru/addins.page                                |   61 +-
 help/ru/delete-notes.page                          |   41 +-
 help/ru/introduction.page                          |    4 +-
 help/ru/pin-notes.page                             |   47 +
 help/ru/sync-setup.page                            |    8 +-
 help/ru/sync.page                                  |   20 +-
 help/ru/whatsnew.page                              |    4 +-
 help/sl/addins-desktop-bugzilla.page               |   31 +
 help/sl/addins-desktop-printing.page               |   40 +
 help/sl/addins-desktop.page                        |   41 -
 help/sl/addins-formatting-fixed-width.page         |   40 +
 help/sl/addins-formatting-underline.page           |   38 +
 help/sl/addins-formatting.page                     |   33 -
 help/sl/addins-preferences.page                    |   50 +
 help/sl/addins-sync-local.page                     |   20 +
 help/sl/addins-sync-ssh.page                       |   26 +
 help/sl/addins-sync-webdav.page                    |   25 +
 help/sl/addins-sync-webservice.page                |   21 +
 help/sl/addins-sync.page                           |   46 -
 help/sl/addins-tools-backlinks.page                |   28 +
 help/sl/addins-tools-html-export.page              |   34 +
 help/sl/addins-tools-note-of-day.page              |   36 +
 help/sl/addins-tools-timestamp.page                |   32 +
 help/sl/addins-tools.page                          |   53 -
 help/sl/addins.page                                |   61 +-
 help/sl/delete-notes.page                          |   39 +-
 help/sl/introduction.page                          |    5 +-
 help/sl/pin-notes.page                             |   47 +
 help/sl/sync-setup.page                            |   23 +-
 help/sl/sync.page                                  |   23 +-
 help/sl/whatsnew.page                              |    5 +-
 help/sv/addins-desktop-bugzilla.page               |   31 +
 help/sv/addins-desktop-printing.page               |   40 +
 help/sv/addins-desktop.page                        |   50 -
 help/sv/addins-formatting-fixed-width.page         |   40 +
 help/sv/addins-formatting-underline.page           |   38 +
 help/sv/addins-formatting.page                     |   39 -
 help/sv/addins-preferences.page                    |   50 +
 help/sv/addins-sync-local.page                     |   20 +
 help/sv/addins-sync-ssh.page                       |   26 +
 help/sv/addins-sync-webdav.page                    |   25 +
 help/sv/addins-sync-webservice.page                |   21 +
 help/sv/addins-sync.page                           |   59 -
 help/sv/addins-tools-backlinks.page                |   28 +
 help/sv/addins-tools-html-export.page              |   34 +
 help/sv/addins-tools-note-of-day.page              |   36 +
 help/sv/addins-tools-timestamp.page                |   32 +
 help/sv/addins-tools.page                          |   72 -
 help/sv/addins.page                                |   61 +-
 help/sv/delete-notes.page                          |   41 +-
 help/sv/introduction.page                          |    4 +-
 help/sv/pin-notes.page                             |   47 +
 help/sv/sync-setup.page                            |    8 +-
 help/sv/sync.page                                  |   20 +-
 help/sv/whatsnew.page                              |    4 +-
 help/uk/addins-desktop-bugzilla.page               |   31 +
 help/uk/addins-desktop-printing.page               |   40 +
 help/uk/addins-desktop.page                        |   50 -
 help/uk/addins-formatting-fixed-width.page         |   40 +
 help/uk/addins-formatting-underline.page           |   38 +
 help/uk/addins-formatting.page                     |   39 -
 help/uk/addins-preferences.page                    |   50 +
 help/uk/addins-sync-local.page                     |   20 +
 help/uk/addins-sync-ssh.page                       |   26 +
 help/uk/addins-sync-webdav.page                    |   25 +
 help/uk/addins-sync-webservice.page                |   21 +
 help/uk/addins-sync.page                           |   59 -
 help/uk/addins-tools-backlinks.page                |   28 +
 help/uk/addins-tools-html-export.page              |   34 +
 help/uk/addins-tools-note-of-day.page              |   36 +
 help/uk/addins-tools-timestamp.page                |   32 +
 help/uk/addins-tools.page                          |   72 -
 help/uk/addins.page                                |   61 +-
 help/uk/delete-notes.page                          |   41 +-
 help/uk/introduction.page                          |    4 +-
 help/uk/pin-notes.page                             |   47 +
 help/uk/sync-setup.page                            |    8 +-
 help/uk/sync.page                                  |   20 +-
 help/uk/whatsnew.page                              |    4 +-
 help/vi/addins-desktop-bugzilla.page               |   31 +
 help/vi/addins-desktop-printing.page               |   40 +
 help/vi/addins-desktop.page                        |   50 -
 help/vi/addins-formatting-fixed-width.page         |   40 +
 help/vi/addins-formatting-underline.page           |   38 +
 help/vi/addins-formatting.page                     |   39 -
 help/vi/addins-preferences.page                    |   50 +
 help/vi/addins-sync-local.page                     |   20 +
 help/vi/addins-sync-ssh.page                       |   26 +
 help/vi/addins-sync-webdav.page                    |   25 +
 help/vi/addins-sync-webservice.page                |   21 +
 help/vi/addins-sync.page                           |   59 -
 help/vi/addins-tools-backlinks.page                |   28 +
 help/vi/addins-tools-html-export.page              |   34 +
 help/vi/addins-tools-note-of-day.page              |   36 +
 help/vi/addins-tools-timestamp.page                |   32 +
 help/vi/addins-tools.page                          |   72 -
 help/vi/addins.page                                |   61 +-
 help/vi/delete-notes.page                          |   41 +-
 help/vi/introduction.page                          |    4 +-
 help/vi/pin-notes.page                             |   47 +
 help/vi/sync-setup.page                            |    8 +-
 help/vi/sync.page                                  |   20 +-
 help/vi/whatsnew.page                              |    4 +-
 help/zh_CN/addins-desktop-bugzilla.page            |   31 +
 help/zh_CN/addins-desktop-printing.page            |   40 +
 help/zh_CN/addins-desktop.page                     |   41 -
 help/zh_CN/addins-formatting-fixed-width.page      |   40 +
 help/zh_CN/addins-formatting-underline.page        |   38 +
 help/zh_CN/addins-formatting.page                  |   33 -
 help/zh_CN/addins-preferences.page                 |   50 +
 help/zh_CN/addins-sync-local.page                  |   20 +
 help/zh_CN/addins-sync-ssh.page                    |   26 +
 help/zh_CN/addins-sync-webdav.page                 |   25 +
 help/zh_CN/addins-sync-webservice.page             |   21 +
 help/zh_CN/addins-sync.page                        |   46 -
 help/zh_CN/addins-tools-backlinks.page             |   28 +
 help/zh_CN/addins-tools-html-export.page           |   34 +
 help/zh_CN/addins-tools-note-of-day.page           |   36 +
 help/zh_CN/addins-tools-timestamp.page             |   32 +
 help/zh_CN/addins-tools.page                       |   53 -
 help/zh_CN/addins.page                             |   61 +-
 help/zh_CN/delete-notes.page                       |   39 +-
 help/zh_CN/introduction.page                       |    5 +-
 help/zh_CN/pin-notes.page                          |   47 +
 help/zh_CN/sync-setup.page                         |   23 +-
 help/zh_CN/sync.page                               |   23 +-
 help/zh_CN/whatsnew.page                           |    5 +-
 libtomboy/Makefile.in                              |  225 ++-
 ltmain.sh                                          |   95 +-
 po/Makefile.in.in                                  |    9 +-
 po/cs.po                                           |  180 +-
 po/de.po                                           |  340 ++--
 po/es.po                                           |  176 +-
 po/gl.po                                           |  311 +--
 po/id.po                                           |  319 ++--
 po/lv.po                                           |  373 ++--
 po/pl.po                                           |  187 +-
 po/pt_BR.po                                        |  178 +-
 po/sl.po                                           |  171 +-
 test/Makefile.in                                   |  100 +-
 tomboy.spec                                        |    2 +-
 623 files changed, 20166 insertions(+), 11644 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 54ac5fa..53b6fb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,484 @@
 # Generated by Makefile. Do not edit.
 
+commit 22292e20ad2f3b1f197316c409937e49c2adcb64
+Author: Christian Kirbach <christian.kirbach at gmail.com>
+Date:   Thu Jan 9 20:35:32 2014 +0100
+
+    Updated German translation
+
+ po/de.po | 180 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 94 insertions(+), 86 deletions(-)
+
+commit 72d61e53c8147d52b63e350abdf5a014ec4b7a98
+Author: Christian Kirbach <Christian.Kirbach at googlemail.com>
+Date:   Thu May 30 14:15:55 2013 +0200
+
+    Updated German translation
+
+ po/de.po | 318 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 169 insertions(+), 149 deletions(-)
+
+commit 366a21f0d08954b4ea106b87f1d810e851df5fcd
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date:   Fri Jan 3 16:52:52 2014 +0100
+
+    Updated Polish translation
+
+ po/pl.po | 187 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 99 insertions(+), 88 deletions(-)
+
+commit 733fbcb47db8b77fe84dec437d1e485b4b90602b
+Author: Jared Jennings <jared at jaredjennings.org>
+Date:   Sun Dec 22 19:06:35 2013 -0600
+
+    Updated PluginList link to new Wiki path
+
+ Tomboy/PreferencesDialog.cs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 6c768a6edf71961b28cacadcc8f148b5d0cd189b
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date:   Sat Dec 21 22:49:36 2013 +0100
+
+    Updated Slovenian translation
+
+ po/sl.po | 171 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 91 insertions(+), 80 deletions(-)
+
+commit ca3636ed14e05259a27d6e68d0d4a09e2686a2c8
+Author: Aaron Borden <adborden at live.com>
+Date:   Fri Dec 20 08:50:40 2013 -0800
+
+    Bump version to 1.15.4
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in            | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit b968be498128504e22615875c65ea7c43f027356
+Author: Aaron Borden <adborden at live.com>
+Date:   Fri Dec 20 08:47:47 2013 -0800
+
+    Update NEWS for 1.15.3
+
+ NEWS | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit 8ca377ea472be651d0db440cb8d0136b502f06e0
+Author: Marek Černocký <marek at manet.cz>
+Date:   Sat Dec 7 18:13:31 2013 +0100
+
+    Updated Czech translation
+
+ po/cs.po | 176 ++++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 94 insertions(+), 82 deletions(-)
+
+commit 65289e7b17be3e6011984c2ece7d646fa3a9cfca
+Author: Aaron Borden <adborden at shift>
+Date:   Thu Oct 4 00:42:49 2012 -0700
+
+    Cache libproxy's factory
+    
+    Avoid zombie processes from reading proxy settings.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=677561
+    
+    Signed-off-by: Jared Jennings <jared at jaredjennings.org>
+
+ Tomboy/Addins/WebSyncService/Api/ProxiedWebRequest.cs | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+commit cea2c730f3fe135067a26aafd6dd258348932662
+Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
+Date:   Mon Nov 25 23:36:17 2013 -0200
+
+    Updated Brazilian Portuguese translation
+
+ po/pt_BR.po | 178 ++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 95 insertions(+), 83 deletions(-)
+
+commit 73fe620334cce52761aa3516e998ccb349aa65d4
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:   Mon Nov 25 17:28:44 2013 +0100
+
+    Updated Spanish translation
+
+ po/es.po | 176 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 91 insertions(+), 85 deletions(-)
+
+commit a3fa5c9e9e44eff1de31ff1fef9ae1efb0825c6d
+Author: Jared Jennings <jared at jaredjennings.org>
+Date:   Fri Nov 22 11:24:08 2013 -0600
+
+    Aaron Burgemeister
+    * Updated patch to rework date format for standards, sorting, and precision.
+    * Added seconds to the title (Catalog.GetString ("MMMM d yyyy, h:mm:ss tt")) so
+     that the application doesn't loop continuously for the remainder of the minute
+    trying to create a note, something an uninformed user could see as a program
+    lockup.
+
+ Tomboy/NoteManager.cs | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 37d77d1b10d533d7652551b71da723b425955b40
+Author: Guido Günther <agx at sigxcpu.org>
+Date:   Tue Nov 12 18:05:58 2013 +0100
+
+    Use ResetClient
+    
+    since it provides more debug infos and printout the server's id
+    if it doesn't match with the expected one.
+    
+    Signed-off-by: Jared Jennings <jared at jaredjennings.org>
+
+ Tomboy/Synchronization/SyncManager.cs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 1915bba713be8489c3a79843d705257b86bc1235
+Author: Guido Günther <agx at sigxcpu.org>
+Date:   Tue Nov 12 17:17:29 2013 +0100
+
+    Print what we failed to parse
+    
+    Instead of just printing
+    
+       Unparsable last-sync-date element in /home/foo/.config/tomboy/manifest.xml
+    
+    print which value failed to passe like
+    
+       Unparsable last-sync-date '0001-01-01T00:00:00.0000000+01:00' in /home/foo/.config/tomboy/manifest.xml
+    
+    Signed-off-by: Jared Jennings <jared at jaredjennings.org>
+
+ Tomboy/Synchronization/TomboySyncClient.cs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 8f4cdb289c6154d278486c1c70f42d5163807ea9
+Author: Guido Günther <agx at sigxcpu.org>
+Date:   Mon Nov 4 18:41:28 2013 +0100
+
+    Improve error reportiing on note parsing errors
+    
+    Print the uuid, key and value that failed to parse. Otherwise one just
+    sees:
+    
+    [ERROR 18:34:52.808] Synchronization failed with the following exception: Cannot cast from source type to destination type.
+      at Tomboy.WebSync.Api.NoteInfo.ParseJson (Hyena.Json.JsonObject jsonObj) [0x00000] in <filename unknown>:0
+      at Tomboy.WebSync.Api.UserInfo.ParseJsonNoteArray (Hyena.Json.JsonArray jsonArray) [0x00000] in <filename unknown>:0
+      at Tomboy.WebSync.Api.UserInfo.ParseJsonNotes (System.String jsonString, System.Nullable`1& latestSyncRevision) [0x00000] in <filename unknown>:0
+      at Tomboy.WebSync.Api.UserInfo.GetNotes (Boolean includeContent, Int32 sinceRevision, System.Nullable`1& latestSyncRevision) [0x00000] in <filename unknown>:0
+      at Tomboy.WebSync.WebSyncServer.GetNoteUpdatesSince (Int32 revision) [0x00000] in <filename unknown>:0
+      at Tomboy.Sync.SyncManager.SynchronizationThread () [0x00000] in <filename unknown>:0
+    
+    This makes debugging parsing errors send back from the server much
+    simpler.
+    
+    Signed-off-by: Jared Jennings <jared at jaredjennings.org>
+
+ Tomboy/Addins/WebSyncService/Api/NoteInfo.cs | 84 +++++++++++++++++-----------
+ 1 file changed, 50 insertions(+), 34 deletions(-)
+
+commit 64d31fa3e214e284d7df124b246f2c7421c2270c
+Author: Alex Tereschenko <frozen.and.blue at gmail.com>
+Date:   Wed Oct 30 20:58:20 2013 +0100
+
+    Fixed .NET framework detection in installer
+    
+    Signed-off-by: Jared Jennings <jared at jaredjennings.org>
+
+ Setup/Setup.wxs | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+commit 06c5cd9bf65dde93e8756a7751583e49af5d58ff
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:   Tue Oct 15 17:21:44 2013 +0200
+
+    Updated Spanish translation
+
+ help/es/es.po | 27 ++++++++++++++++-----------
+ 1 file changed, 16 insertions(+), 11 deletions(-)
+
+commit 800b90bbf01a5924d159615363585eb434136e96
+Author: Marek Černocký <marek at manet.cz>
+Date:   Sun Oct 13 17:42:28 2013 +0200
+
+    Updated Czech translation
+
+ help/cs/cs.po | 51 ++++++++-------------------------------------------
+ 1 file changed, 8 insertions(+), 43 deletions(-)
+
+commit 15e96609fbd94636d10cb04c0bfe61df8597c07e
+Author: Marek Černocký <marek at manet.cz>
+Date:   Sun Oct 13 17:40:40 2013 +0200
+
+    Updated Czech translation
+
+ help/cs/cs.po | 1197 ++++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 802 insertions(+), 395 deletions(-)
+
+commit 307b7fd0f7fc4f8bda49a3561a248776f93324c2
+Author: Marek Černocký <marek at manet.cz>
+Date:   Sun Oct 13 16:32:58 2013 +0200
+
+    Fixed icon name
+
+ help/C/addins-formatting-fixed-width.page | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 90ccfaf27178c77b7235fb6a36faf14b39f551e9
+Author: Marek Černocký <marek at manet.cz>
+Date:   Sun Oct 13 16:32:32 2013 +0200
+
+    Updated Czech translation
+
+ po/cs.po | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 8d28a6c0573e667da8aa0ab940902ed8adda34fc
+Author: Andika Triwidada <andika at gmail.com>
+Date:   Sun Oct 13 16:46:42 2013 +0700
+
+    Updated Indonesian translation
+
+ po/id.po | 319 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 168 insertions(+), 151 deletions(-)
+
+commit 410b6e6c4effd8774e7199cf6f2dd6408d8a1dcb
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:   Thu Oct 10 10:50:19 2013 +0200
+
+    Updated Spanish translation
+
+ help/es/es.po | 158 +++++++++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 100 insertions(+), 58 deletions(-)
+
+commit d06cbbf66664d64bca2a5d29c32bddd984a78ffc
+Author: Sindhu S <sindhus at live.in>
+Date:   Wed Oct 9 17:22:18 2013 +0530
+
+    docs: Update ../help/Makefile.am for commit 48dda96
+
+ help/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 884414fb528c6dd22294e8136698cb01ee583056
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:   Wed Oct 9 17:23:53 2013 +0200
+
+    Updated Spanish translation
+
+ help/es/es.po | 260 ++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 145 insertions(+), 115 deletions(-)
+
+commit 48dda96e839e9fd9f2909dd6610fc8f5713cef04
+Author: Sindhu S <sindhus at live.in>
+Date:   Wed Oct 9 16:40:41 2013 +0530
+
+    docs: Add help to pin notes
+    
+    Added user help on how to pin and un-pin notes to Tomboy
+    message tray icon.
+    Added seealso link to addins-preferences page as it
+    controls the number of items shown in recent list.
+    Recent list is a common topic between pin-notes and
+    addins-preferences pages.
+    Updated TODO file: user help to pin a note added.
+
+ help/C/TODO                    |  1 -
+ help/C/addins-preferences.page |  1 +
+ help/C/pin-notes.page          | 49 ++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 50 insertions(+), 1 deletion(-)
+
+commit 65ce4fdb51193be8c3754c68f61e2edf86bab38f
+Author: Sindhu S <sindhus at live.in>
+Date:   Wed Oct 9 15:51:45 2013 +0530
+
+    docs: Add steps to delete a note
+    
+    Added steps markup and instructions to delete a note.
+    Updated TODO: seealso links are correct in delete-notes.page.
+
+ help/C/TODO              |  1 -
+ help/C/delete-notes.page | 41 +++++++++++++++++++++++++++--------------
+ 2 files changed, 27 insertions(+), 15 deletions(-)
+
+commit fc58d2ff9933c5c5022433d464ca66d1ac0f0e15
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:   Tue Oct 8 18:25:53 2013 +0200
+
+    Updated Spanish translation
+
+ help/es/es.po | 1298 ++++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 859 insertions(+), 439 deletions(-)
+
+commit 88aa70d7b4e191ae4800556f433eaadd14ea4f95
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:   Tue Oct 8 16:53:37 2013 +0200
+
+    Fixed typo in string
+
+ help/C/addins-sync-webdav.page | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d5fc4a3612b457ba2deea7f172ad2a5f10b22b63
+Author: Sindhu S <sindhus at live.in>
+Date:   Tue Oct 8 19:51:01 2013 +0530
+
+    Modify help/Makefile.am entries for commit 438640f
+
+ help/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b9370939cc6578e3b0c4af5bb0a9b63d28ea5ca9
+Author: Rūdolfs Mazurs <rudolfsm at src.gnome.org>
+Date:   Sat Sep 21 23:38:46 2013 +0300
+
+    Updated Latvian translatio
+
+ po/lv.po | 373 ++++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 204 insertions(+), 169 deletions(-)
+
+commit 438640fecfda1a007d4c840b7c91673af064d25c
+Author: Sindhu S <sindhus at live.in>
+Date:   Fri Aug 23 23:25:58 2013 +0530
+
+    Reorganize addins user help
+    
+    New content on addins page, all plugins moved to their own pages.
+    Re-written addins page content.
+
+ help/C/addins-desktop-bugzilla.page       | 32 ++++++++++++++
+ help/C/addins-desktop-printing.page       | 41 +++++++++++++++++
+ help/C/addins-desktop.page                | 51 ---------------------
+ help/C/addins-formatting-fixed-width.page | 41 +++++++++++++++++
+ help/C/addins-formatting-underline.page   | 39 +++++++++++++++++
+ help/C/addins-formatting.page             | 40 -----------------
+ help/C/addins-preferences.page            | 50 +++++++++++++++++++++
+ help/C/addins-sync-local.page             | 21 +++++++++
+ help/C/addins-sync-ssh.page               | 27 ++++++++++++
+ help/C/addins-sync-webdav.page            | 26 +++++++++++
+ help/C/addins-sync-webservice.page        | 22 ++++++++++
+ help/C/addins-sync.page                   | 60 -------------------------
+ help/C/addins-tools-backlinks.page        | 29 ++++++++++++
+ help/C/addins-tools-html-export.page      | 35 +++++++++++++++
+ help/C/addins-tools-note-of-day.page      | 37 ++++++++++++++++
+ help/C/addins-tools-timestamp.page        | 33 ++++++++++++++
+ help/C/addins-tools.page                  | 73 -------------------------------
+ help/C/addins.page                        | 61 ++++++++++++++++++++------
+ help/Makefile.am                          | 22 +++++++---
+ 19 files changed, 497 insertions(+), 243 deletions(-)
+
+commit 1e928f4d345e7511c2cb0a9cb1a790c0a237fcbe
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date:   Thu Sep 5 16:16:38 2013 +0200
+
+    Updated Polish help translation
+
+ help/pl/pl.po | 57 ++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 32 insertions(+), 25 deletions(-)
+
+commit 67ab74c94cde1fcf5eec1307dca42ce6730242f7
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:   Tue Sep 3 14:55:53 2013 +0200
+
+    Updated Spanish translation
+
+ help/es/es.po | 119 ++++++++++++++++++++++++++++++++++++++--------------------
+ 1 file changed, 78 insertions(+), 41 deletions(-)
+
+commit 96360d1125e3bc8621e3ad4341938e32280afeed
+Author: Marek Černocký <marek at manet.cz>
+Date:   Wed Aug 28 11:18:43 2013 +0200
+
+    Updated Czech translation
+
+ help/cs/cs.po | 83 ++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 42 insertions(+), 41 deletions(-)
+
+commit 709b3291eab7c76727f7f2b0f5747473bf97925c
+Author: Sindhu S <sindhus at live.in>
+Date:   Fri Aug 23 23:30:37 2013 +0530
+
+    Replace 'sync' with 'synchronize' in user help
+    
+    Replaces instances of the word 'sync' with 'synchronize'
+    for grammatical correctness.
+
+ help/C/introduction.page |  4 ++--
+ help/C/sync-setup.page   |  8 ++++----
+ help/C/sync.page         | 20 ++++++++++----------
+ help/C/whatsnew.page     |  4 ++--
+ 4 files changed, 18 insertions(+), 18 deletions(-)
+
+commit b44356a3ab4ad9123a51eb782ebbb6e7888d04b9
+Author: Fran Diéguez <fran.dieguez at mabishu.com>
+Date:   Fri Aug 2 16:09:28 2013 +0200
+
+    Updated Galician translations
+
+ po/gl.po | 311 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 165 insertions(+), 146 deletions(-)
+
+commit 266d9cfc2a7fb961e6580016602d71b35a368100
+Author: Aaron Borden <adborden at live.com>
+Date:   Sun Jul 21 15:50:02 2013 -0700
+
+    Use xz compression for dist tarballs
+
+ .gitignore   | 1 +
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+commit b962005173d8a4aa3d6a6845312abd476ac32b82
+Author: Alex Tereschenko <frozen.and.blue at gmail.com>
+Date:   Sun Apr 14 18:19:03 2013 +0200
+
+    Added buffer flushing to disk for changed note
+
+ Tomboy/Note.cs | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+commit 9e053a3dad9db45f9a1e86d38e478c59a6fbd794
+Author: Alex Tereschenko <frozen.and.blue at gmail.com>
+Date:   Tue May 28 22:30:44 2013 +0200
+
+    Fixed installer asking to install gtk# when it's already installed
+    
+    Some systems may have AllwaysInstallElevated property set to "1" and as a
+    result some of the crucial properties our installer uses are not passed
+    between the installation phases, because they're not listed as secure.
+    
+    That causes the installer to think user doesn't have gtk# installed.
+    
+    This patch marks all properties as secure explicitly and fixed that
+    behavior.
+    
+    Signed-off-by: Jared Jennings <jared at jaredjennings.org>
+
+ Setup/Setup.wxs | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 22bd0212751eb01153e309b7ac2c257d303cf8f4
+Author: Aaron Borden <adborden at live.com>
+Date:   Mon May 27 11:57:35 2013 -0700
+
+    Bump version to 1.15.3
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in            | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit d241ed55f9462afcc9ced08ae37efc07989698b4
+Author: Aaron Borden <adborden at live.com>
+Date:   Mon May 27 11:55:50 2013 -0700
+
+    Update NEWS for 1.15.2
+
+ NEWS | 5 +++++
+ 1 file changed, 5 insertions(+)
+
 commit 50eab330bedb355bc8d887f7ab12e4b76008b985
 Author: Valdar Moridin <valdarmoridin at gmail.com>
 Date:   Wed May 22 22:03:46 2013 +1200
diff --git a/Makefile.in b/Makefile.in
index f4c862f..ca048a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,11 +78,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/pot-update.in $(srcdir)/tomboy.spec.in \
-	$(top_srcdir)/configure AUTHORS COPYING NEWS config.guess \
-	config.sub install-sh ltmain.sh missing mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in mkinstalldirs $(srcdir)/pot-update.in \
+	$(srcdir)/tomboy.spec.in AUTHORS COPYING NEWS README \
+	config.guess config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -65,15 +93,28 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = pot-update tomboy.spec
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -81,9 +122,30 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
@@ -123,9 +185,9 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
+DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
@@ -416,14 +478,13 @@ distclean-libtool:
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -444,31 +505,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-cscopelist-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
-	done
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -484,12 +527,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -501,15 +539,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -518,18 +552,16 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-
 cscope: cscope.files
 	test ! -s cscope.files \
 	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-
 clean-cscope:
 	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
 
-cscope.files: clean-cscope cscopelist-recursive cscopelist
-
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -624,7 +656,6 @@ dist-bzip2: distdir
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
-
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
@@ -836,27 +867,24 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	cscopelist-recursive ctags-recursive install-am install-strip \
-	tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-cscope \
-	clean-generic clean-libtool cscope cscopelist \
-	cscopelist-recursive ctags ctags-recursive dist dist-all \
-	dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 run: $(PROGRAM)
diff --git a/NEWS b/NEWS
index 2c55fe6..23730de 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,18 @@ 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.15.4
+* Translation updates: de, po, sl
+
+Version 1.15.3
+* Fix zombie processes when reading proxy settings
+* Better error reporting during note parse (Guido Günther)
+* Documentation: additional add-in pages, pinning, deleting notes (Sindhu S)
+* Use xz compression for dist tarballs
+* Flush to disk on note save (Alex Tereschenko)
+* Windows: GTK#, .NET installer improvements (Alex Tereschenko)
+* Translation updates: cs, es, gl, id, lv, pl, pt_BR
+
 Version 1.15.2
 * Update mac build project (Valdar Moridin)
 * Center Preferences and About window on screen (Valdar Moridin)
diff --git a/Tomboy/Addins/AdvancedPreferences/Makefile.in b/Tomboy/Addins/AdvancedPreferences/Makefile.in
index c09269b..63e7dad 100644
--- a/Tomboy/Addins/AdvancedPreferences/Makefile.in
+++ b/Tomboy/Addins/AdvancedPreferences/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/AdvancedPreferences
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -391,11 +432,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -537,16 +576,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/Backlinks/Makefile.in b/Tomboy/Addins/Backlinks/Makefile.in
index 84d4748..173b3a6 100644
--- a/Tomboy/Addins/Backlinks/Makefile.in
+++ b/Tomboy/Addins/Backlinks/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/Backlinks
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -390,11 +431,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -536,16 +575,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/Bugzilla/Makefile.in b/Tomboy/Addins/Bugzilla/Makefile.in
index 50c8366..8fd0930 100644
--- a/Tomboy/Addins/Bugzilla/Makefile.in
+++ b/Tomboy/Addins/Bugzilla/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/Bugzilla
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -398,11 +439,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -544,16 +583,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/Evolution/Makefile.in b/Tomboy/Addins/Evolution/Makefile.in
index 0dff312..65ee8c2 100644
--- a/Tomboy/Addins/Evolution/Makefile.in
+++ b/Tomboy/Addins/Evolution/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/Evolution
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -396,11 +437,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -542,16 +581,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 @ENABLE_EVOLUTION_TRUE@$(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/ExportToHtml/Makefile.in b/Tomboy/Addins/ExportToHtml/Makefile.in
index 76cabe5..be279ad 100644
--- a/Tomboy/Addins/ExportToHtml/Makefile.in
+++ b/Tomboy/Addins/ExportToHtml/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/ExportToHtml
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -393,11 +434,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -539,16 +578,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/FileSystemSyncService/Makefile.in b/Tomboy/Addins/FileSystemSyncService/Makefile.in
index 9e7bbd2..5aaca97 100644
--- a/Tomboy/Addins/FileSystemSyncService/Makefile.in
+++ b/Tomboy/Addins/FileSystemSyncService/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/FileSystemSyncService
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -392,11 +433,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -538,16 +577,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/FixedWidth/Makefile.in b/Tomboy/Addins/FixedWidth/Makefile.in
index b5f56a8..b0566aa 100644
--- a/Tomboy/Addins/FixedWidth/Makefile.in
+++ b/Tomboy/Addins/FixedWidth/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/FixedWidth
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -391,11 +432,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -537,16 +576,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/GalagoPresence/Makefile.in b/Tomboy/Addins/GalagoPresence/Makefile.in
index 679dde3..e145dab 100644
--- a/Tomboy/Addins/GalagoPresence/Makefile.in
+++ b/Tomboy/Addins/GalagoPresence/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/GalagoPresence
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -390,11 +431,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -536,16 +575,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 @ENABLE_GALAGO_TRUE@$(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/InsertTimestamp/Makefile.in b/Tomboy/Addins/InsertTimestamp/Makefile.in
index 9fd300b..7982732 100644
--- a/Tomboy/Addins/InsertTimestamp/Makefile.in
+++ b/Tomboy/Addins/InsertTimestamp/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/InsertTimestamp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -391,11 +432,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -537,16 +576,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/Makefile.in b/Tomboy/Addins/Makefile.in
index 06f462d..31c2b15 100644
--- a/Tomboy/Addins/Makefile.in
+++ b/Tomboy/Addins/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = Tomboy/Addins
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -60,15 +88,28 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -76,9 +117,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -364,14 +425,13 @@ clean-libtool:
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -392,31 +452,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-cscopelist-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
-	done
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -432,12 +474,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -449,15 +486,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -466,9 +499,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
 
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -640,23 +674,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
-	cscopelist-recursive ctags-recursive install-am install-strip \
-	tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist cscopelist-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-libtool distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
index a2dce28..5e2511b 100644
--- a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
+++ b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/NoteDirectoryWatcher
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -389,11 +430,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -535,16 +574,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/NoteOfTheDay/Makefile.in b/Tomboy/Addins/NoteOfTheDay/Makefile.in
index 2514aab..53f49f6 100644
--- a/Tomboy/Addins/NoteOfTheDay/Makefile.in
+++ b/Tomboy/Addins/NoteOfTheDay/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/NoteOfTheDay
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -392,11 +433,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -538,16 +577,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/PrintNotes/Makefile.in b/Tomboy/Addins/PrintNotes/Makefile.in
index c3f061d..21dcef3 100644
--- a/Tomboy/Addins/PrintNotes/Makefile.in
+++ b/Tomboy/Addins/PrintNotes/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/PrintNotes
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -389,11 +430,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -536,17 +575,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
-	uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic maintainer-clean-local mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-addinsDATA uninstall-am
 
 
 $(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
diff --git a/Tomboy/Addins/RemoveBrokenLinks/Makefile.in b/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
index ca5c5d2..c89d1c1 100644
--- a/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
+++ b/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/RemoveBrokenLinks
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -391,11 +432,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -537,16 +576,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/Sketching/Makefile.in b/Tomboy/Addins/Sketching/Makefile.in
index 79c3bd2..af5ee95 100644
--- a/Tomboy/Addins/Sketching/Makefile.in
+++ b/Tomboy/Addins/Sketching/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/Sketching
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -395,11 +436,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -541,16 +580,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 @ENABLE_SKETCHING_TRUE@$(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/SshSyncService/Makefile.in b/Tomboy/Addins/SshSyncService/Makefile.in
index a8c827b..11c8ada 100644
--- a/Tomboy/Addins/SshSyncService/Makefile.in
+++ b/Tomboy/Addins/SshSyncService/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/SshSyncService
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -392,11 +433,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -538,16 +577,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/StickyNoteImport/Makefile.in b/Tomboy/Addins/StickyNoteImport/Makefile.in
index 28547af..808fac0 100644
--- a/Tomboy/Addins/StickyNoteImport/Makefile.in
+++ b/Tomboy/Addins/StickyNoteImport/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/StickyNoteImport
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -389,11 +430,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -535,16 +574,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/Tasque/Makefile.in b/Tomboy/Addins/Tasque/Makefile.in
index 6c3aa68..0ea6cfb 100644
--- a/Tomboy/Addins/Tasque/Makefile.in
+++ b/Tomboy/Addins/Tasque/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/Tasque
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -395,11 +436,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -541,16 +580,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/Underline/Makefile.in b/Tomboy/Addins/Underline/Makefile.in
index c442d37..f60114b 100644
--- a/Tomboy/Addins/Underline/Makefile.in
+++ b/Tomboy/Addins/Underline/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/Underline
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -391,11 +432,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -537,16 +576,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/WebDavSyncService/Makefile.in b/Tomboy/Addins/WebDavSyncService/Makefile.in
index c788338..1d7f244 100644
--- a/Tomboy/Addins/WebDavSyncService/Makefile.in
+++ b/Tomboy/Addins/WebDavSyncService/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/WebDavSyncService
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -392,11 +433,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -538,16 +577,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Addins/WebSyncService/Api/NoteInfo.cs b/Tomboy/Addins/WebSyncService/Api/NoteInfo.cs
index 5546991..4a12e94 100644
--- a/Tomboy/Addins/WebSyncService/Api/NoteInfo.cs
+++ b/Tomboy/Addins/WebSyncService/Api/NoteInfo.cs
@@ -53,44 +53,60 @@ namespace Tomboy.WebSync.Api
 			note.Guid = (string) jsonObj ["guid"];
 
 			// TODO: Decide how much is required
-			object val;
-
-			if (jsonObj.TryGetValue (TitleElementName, out val))
-				note.Title = (string) val;
-			if (jsonObj.TryGetValue (NoteContentElementName, out val))
-				note.NoteContent = (string) val;
-			if (jsonObj.TryGetValue (NoteContentVersionElementName, out val))
-				note.NoteContentVersion = (double) val;
-			
-			if (jsonObj.TryGetValue (LastChangeDateElementName, out val))
-				note.LastChangeDate = DateTime.Parse ((string) val);
-			if (jsonObj.TryGetValue (LastMetadataChangeDateElementName, out val))
-				note.LastMetadataChangeDate = DateTime.Parse ((string) val);
-			if (jsonObj.TryGetValue (CreateDateElementName, out val))
-				note.CreateDate = DateTime.Parse ((string) val);
-			
-			if (jsonObj.TryGetValue (LastSyncRevisionElementName, out val))
-				note.LastSyncRevision = (int) val;
-			if (jsonObj.TryGetValue (OpenOnStartupElementName, out val))
-				note.OpenOnStartup = (bool) val;
-			if (jsonObj.TryGetValue (PinnedElementName, out val))
-				note.Pinned = (bool) val;
-			
-			if (jsonObj.TryGetValue (TagsElementName, out val)) {
-				Hyena.Json.JsonArray tagsJsonArray =
-					(Hyena.Json.JsonArray) val;
-				note.Tags = new List<string> (tagsJsonArray.Count);
-				foreach (string tag in tagsJsonArray)
-					note.Tags.Add (tag);
+			object val = 0;
+			string key = "<unknown>";
+			try {
+				key = TitleElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.Title = (string) val;
+				key = NoteContentElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.NoteContent = (string) val;
+				key = NoteContentVersionElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.NoteContentVersion = (double) val;
+
+				key = LastChangeDateElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.LastChangeDate = DateTime.Parse ((string) val);
+				key = LastMetadataChangeDateElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.LastMetadataChangeDate = DateTime.Parse ((string) val);
+				key = CreateDateElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.CreateDate = DateTime.Parse ((string) val);
+
+				key = LastSyncRevisionElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.LastSyncRevision = (int) val;
+				key = OpenOnStartupElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.OpenOnStartup = (bool) val;
+				key = PinnedElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.Pinned = (bool) val;
+
+				key = TagsElementName;
+				if (jsonObj.TryGetValue (key, out val)) {
+					Hyena.Json.JsonArray tagsJsonArray =
+						(Hyena.Json.JsonArray) val;
+					note.Tags = new List<string> (tagsJsonArray.Count);
+					foreach (string tag in tagsJsonArray)
+						note.Tags.Add (tag);
+				}
+
+				key = ResourceReferenceElementName;
+				if (jsonObj.TryGetValue (key, out val))
+					note.ResourceReference =
+						ResourceReference.ParseJson ((Hyena.Json.JsonObject) val);
+			} catch (InvalidCastException e) {
+				Logger.Error("Note '{0}': Key '{1}', value  '{2}' failed to parse due to invalid type", note.Guid, key, val);
+				throw e;
 			}
 
-			if (jsonObj.TryGetValue (ResourceReferenceElementName, out val))
-				note.ResourceReference =
-					ResourceReference.ParseJson ((Hyena.Json.JsonObject) val);
-
 			return note;
 		}
-		
+
 		#endregion
 
 		#region Public Methods
diff --git a/Tomboy/Addins/WebSyncService/Api/ProxiedWebRequest.cs b/Tomboy/Addins/WebSyncService/Api/ProxiedWebRequest.cs
index 72cd9a2..671b043 100644
--- a/Tomboy/Addins/WebSyncService/Api/ProxiedWebRequest.cs
+++ b/Tomboy/Addins/WebSyncService/Api/ProxiedWebRequest.cs
@@ -6,7 +6,8 @@ using LibProxy;
 namespace Tomboy.WebSync
 {
 	public static class ProxiedWebRequest
-	{		
+	{
+		private static ProxyFactory proxyFactory = null;
 		private const string useProxyAuthentication =
 			"/system/http_proxy/use_authentication";
 		private const string proxyAuthenticationUser =
@@ -32,9 +33,11 @@ namespace Tomboy.WebSync
 		
 		private static void ApplyProxy (HttpWebRequest webRequest, string uri)
 		{
-			ProxyFactory pf = new LibProxy.ProxyFactory ();
-			string[] proxies = pf.GetProxies (uri);
-			
+			if (proxyFactory == null) {
+				proxyFactory = new LibProxy.ProxyFactory ();
+			}
+
+			string[] proxies = proxyFactory.GetProxies (uri);
 			foreach (string proxy in proxies) {
 				Uri proxyUri = new Uri (proxy);
 				string scheme = proxyUri.Scheme;
diff --git a/Tomboy/Addins/WebSyncService/Makefile.in b/Tomboy/Addins/WebSyncService/Makefile.in
index 1e018e4..3a22434 100644
--- a/Tomboy/Addins/WebSyncService/Makefile.in
+++ b/Tomboy/Addins/WebSyncService/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,8 +78,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 subdir = Tomboy/Addins/WebSyncService
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -97,6 +137,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(addinsdir)"
 DATA = $(addins_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -406,11 +447,9 @@ uninstall-addinsDATA:
 	@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -552,16 +591,17 @@ uninstall-am: uninstall-addinsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-addinsDATA \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-addinsDATA uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-addinsDATA install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-addinsDATA uninstall-am
 
 
 $(TARGET).mdb: $(TARGET)
diff --git a/Tomboy/Makefile.in b/Tomboy/Makefile.in
index bc3a30e..dd34931 100644
--- a/Tomboy/Makefile.in
+++ b/Tomboy/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,8 +79,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.include $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.include $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs
 @ENABLE_PANEL_APPLET_TRUE at am__append_1 = $(PANEL_WRAPPER)
 subdir = Tomboy
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -92,15 +120,28 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(tomboylibdir)"
 SCRIPTS = $(bin_SCRIPTS)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -109,9 +150,29 @@ am__can_run_installinfo = \
 DATA = $(tomboylib_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -617,14 +678,13 @@ uninstall-tomboylibDATA:
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -645,31 +705,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-cscopelist-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
-	done
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -685,12 +727,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -702,15 +739,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -719,9 +752,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
 
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -897,24 +931,21 @@ ps-am:
 
 uninstall-am: uninstall-binSCRIPTS uninstall-tomboylibDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
-	cscopelist-recursive ctags-recursive install-am install-strip \
-	tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist cscopelist-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-libtool distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-binSCRIPTS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip install-tomboylibDATA installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binSCRIPTS \
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binSCRIPTS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip install-tomboylibDATA \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \
 	uninstall-tomboylibDATA
 
 
diff --git a/Tomboy/Note.cs b/Tomboy/Note.cs
index 6423e4d..bd64d36 100644
--- a/Tomboy/Note.cs
+++ b/Tomboy/Note.cs
@@ -1487,8 +1487,11 @@ namespace Tomboy
 		{
 			string tmp_file = write_file + ".tmp";
 
-			using (var xml = XmlWriter.Create (tmp_file, XmlEncoder.DocumentSettings))
-				Write (xml, note);
+			using (FileStream fs = new FileStream(tmp_file, FileMode.Create, FileAccess.Write)) {
+				using (var xml = XmlWriter.Create (fs, XmlEncoder.DocumentSettings))
+					Write (xml, note);
+				fs.Flush(true);
+			}
 
 			if (File.Exists (write_file)) {
 				string backup_path = write_file + "~";
diff --git a/Tomboy/NoteManager.cs b/Tomboy/NoteManager.cs
index e8c2657..43a1939 100644
--- a/Tomboy/NoteManager.cs
+++ b/Tomboy/NoteManager.cs
@@ -477,8 +477,7 @@ Ciao!");
 			string temp_title;
 
 			while (true) {
-				temp_title = String.Format (Catalog.GetString ("New Note {0}"),
-				                            ++new_num);
+                temp_title = String.Format (Catalog.GetString ("Note from {0}"), DateTime.Now.ToString ( Catalog.GetString ("yyyy-MM-dd HH:mm:ss.fff")));
 				if (Find (temp_title) == null)
 					break;
 			}
diff --git a/Tomboy/PreferencesDialog.cs b/Tomboy/PreferencesDialog.cs
index 5e6a489..5a67ffd 100644
--- a/Tomboy/PreferencesDialog.cs
+++ b/Tomboy/PreferencesDialog.cs
@@ -626,7 +626,7 @@ namespace Tomboy
 			sw.Add (tree);
 			sw.Show ();
 			Gtk.LinkButton get_more_link =
-				new Gtk.LinkButton ("http://live.gnome.org/Tomboy/PluginList",
+				new Gtk.LinkButton ("https://wiki.gnome.org/Apps/Tomboy/PluginList",
 				                    Catalog.GetString ("Get More Add-Ins..."));
 			get_more_link.Show ();
 			Gtk.VBox tree_box = new Gtk.VBox (false, 0);
diff --git a/Tomboy/Synchronization/SyncManager.cs b/Tomboy/Synchronization/SyncManager.cs
index b90f6b5..663b536 100644
--- a/Tomboy/Synchronization/SyncManager.cs
+++ b/Tomboy/Synchronization/SyncManager.cs
@@ -430,7 +430,8 @@ namespace Tomboy.Sync
 				// to prevent this situation.
 				string serverId = server.Id;
 				if (client.AssociatedServerId != serverId) {
-					client.Reset ();
+				        Logger.Debug("ServerID is {0}, expected {1}", serverId, client.AssociatedServerId);
+					ResetClient ();
 					client.AssociatedServerId = serverId;
 				}
 
diff --git a/Tomboy/Synchronization/TomboySyncClient.cs b/Tomboy/Synchronization/TomboySyncClient.cs
index bf9cb21..44abb7f 100644
--- a/Tomboy/Synchronization/TomboySyncClient.cs
+++ b/Tomboy/Synchronization/TomboySyncClient.cs
@@ -116,7 +116,7 @@ namespace Tomboy.Sync
 					try {
 						lastSyncRev = int.Parse (node.InnerText);
 					} catch {
-					Logger.Error ("Unparsable last-sync-rev element in " + manifestPath);
+					Logger.Error ("Unparsable last-sync-rev '" + node.InnerText + "' in " + manifestPath);
 					}
 				}
 
@@ -127,7 +127,7 @@ namespace Tomboy.Sync
 					try {
 						lastSyncDate = DateTime.Parse (node.InnerText);
 					} catch {
-					Logger.Error ("Unparsable last-sync-date element in " + manifestPath);
+					Logger.Error ("Unparsable last-sync-date '" + node.InnerText + "' in " + manifestPath);
 					}
 				}
 			} finally {
diff --git a/aclocal.m4 b/aclocal.m4
index c244806..42bcca3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.12.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
@@ -753,31 +754,6 @@ fi
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
 IT_PO_SUBDIR([po])
 
 ])
@@ -837,8 +813,8 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -847,8 +823,8 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -982,6 +958,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -1467,7 +1445,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -1631,6 +1609,7 @@ AC_DEFUN([LT_LANG],
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -1652,6 +1631,29 @@ m4_defun([_LT_LANG],
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -1682,6 +1684,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -1784,7 +1790,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1792,6 +1804,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -1803,6 +1816,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -1820,7 +1834,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1865,8 +1881,8 @@ _LT_EOF
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1877,6 +1893,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -2160,14 +2178,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -2244,13 +2275,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -2430,6 +2461,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -2469,7 +2505,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -3015,7 +3051,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -3024,7 +3060,7 @@ aix3*)
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -3089,7 +3125,7 @@ beos*)
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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'
@@ -3228,7 +3264,7 @@ m4_if([$1], [],[
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -3236,10 +3272,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -3247,7 +3279,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -3278,7 +3310,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -3298,17 +3330,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -3369,7 +3402,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -3385,7 +3418,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -3422,9 +3455,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3487,7 +3520,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -3556,7 +3589,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3581,7 +3614,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
@@ -3605,7 +3638,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -3636,7 +3669,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3646,7 +3679,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
@@ -4068,7 +4101,7 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -4488,6 +4521,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -5072,7 +5106,9 @@ m4_if([$1], [CXX], [
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -5164,18 +5200,33 @@ m4_if([$1], [CXX], [
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -5335,7 +5386,9 @@ m4_if([$1], [CXX], [
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -5360,7 +5413,6 @@ m4_if([$1], [CXX], [
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -5611,8 +5663,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5907,6 +5958,7 @@ _LT_EOF
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5953,10 +6005,6 @@ _LT_EOF
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5969,7 +6017,7 @@ _LT_EOF
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -6008,7 +6056,6 @@ _LT_EOF
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -6450,9 +6497,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -6606,7 +6650,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6976,7 +7019,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -7737,12 +7780,18 @@ public class foo {
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7939,7 +7988,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -8072,7 +8120,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -8255,6 +8302,73 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -8324,6 +8438,13 @@ dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -8988,9 +9109,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -9162,15 +9298,15 @@ m4_define([lt_dict_filter],
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
@@ -9522,7 +9658,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])# PKG_CHECK_VAR
 
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9534,10 +9670,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.12'
+[am__api_version='1.13'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.12.6], [],
+m4_if([$1], [1.13.4], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9553,14 +9689,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.6])dnl
+[AM_AUTOMAKE_VERSION([1.13.4])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9613,7 +9749,7 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9644,7 +9780,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9835,7 +9971,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9846,7 +9982,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -9875,7 +10011,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
@@ -9909,18 +10045,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9941,7 +10068,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -9971,8 +10098,7 @@ AC_SUBST([CYGPATH_W])
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
 [AC_DIAGNOSE([obsolete],
-[$0: two- and three-arguments forms are deprecated.  For more info, see:
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
+             [$0: two- and three-arguments forms are deprecated.])
 m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
@@ -10026,18 +10152,15 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 		  [_AM_DEPENDENCIES([OBJC])],
 		  [m4_define([AC_PROG_OBJC],
 			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
-dnl but we still cater to Autoconf 2.62.
-m4_ifdef([AC_PROG_OBJCXX],
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 		  [_AM_DEPENDENCIES([OBJCXX])],
 		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
@@ -10071,7 +10194,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10092,7 +10215,7 @@ if test x"${install_sh}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10114,7 +10237,7 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10147,11 +10270,9 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 ]
 )
 
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10201,7 +10322,7 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10216,8 +10337,8 @@ AC_SUBST($1)])
 
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -10230,17 +10351,46 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
   AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
+#  -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
+AC_CONFIG_HEADERS($@)])
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should simply use the 'AC][_PROG_CC' macro instead.
+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+but upon 'ac_cv_prog_cc_stdc'.])])
+
+AC_DEFUN([AM_C_PROTOTYPES],
+         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
+
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10269,7 +10419,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10288,7 +10438,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10369,7 +10519,67 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10397,7 +10607,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10416,7 +10626,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10435,76 +10645,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
diff --git a/configure b/configure
index 5ab6ddc..200ef49 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.69 for tomboy 1.15.2.
+# Generated by GNU Autoconf 2.69 for tomboy 1.15.4.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tomboy'
 PACKAGE_TARNAME='tomboy'
-PACKAGE_VERSION='1.15.2'
-PACKAGE_STRING='tomboy 1.15.2'
+PACKAGE_VERSION='1.15.4'
+PACKAGE_STRING='tomboy 1.15.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -707,6 +707,7 @@ PO_IN_DATADIR_TRUE
 INTLLIBS
 INSTOBJEXT
 GMOFILES
+DATADIRNAME
 CATOBJEXT
 CATALOGS
 MSGFMT_OPTS
@@ -740,7 +741,6 @@ LIBTOOL
 EGREP
 GREP
 CPP
-DATADIRNAME
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -804,12 +804,15 @@ HELP_DIR
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-AM_DEFAULT_VERBOSITY
 LN_S
 ACLOCAL_AMFLAGS
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -874,6 +877,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_maintainer_mode
 with_help_dir
 with_omf_dir
@@ -1477,7 +1481,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.15.2 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.15.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1551,7 +1555,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tomboy 1.15.2:";;
+     short | recursive ) echo "Configuration of tomboy 1.15.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1559,6 +1563,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-maintainer-mode
                           enable make rules and dependencies not useful (and
                           sometimes confusing) to the casual installer
@@ -1594,7 +1600,7 @@ Optional Packages:
   --with-omf-dir=DIR      path to OMF files
   --with-help-formats=FORMATS
                           list of formats
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1721,7 +1727,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tomboy configure 1.15.2
+tomboy configure 1.15.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1819,73 +1825,6 @@ fi
 
 } # ac_fn_c_try_link
 
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-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
-
-} # ac_fn_c_check_func
-
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -1996,6 +1935,73 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_header_compile
 
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+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
+
+} # ac_fn_c_check_func
+
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -2086,7 +2092,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.15.2, which was
+It was created by tomboy $as_me 1.15.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2435,7 +2441,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.12'
+am__api_version='1.13'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2648,8 +2654,8 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
@@ -2889,6 +2895,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -2911,7 +2956,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tomboy'
- VERSION='1.15.2'
+ VERSION='1.15.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2952,86 +2997,125 @@ mkdir_p='$(MKDIR_P)'
 AMTAR='$${TAR-tar}'
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
-$as_echo_n "checking how to create a ustar tar archive... " >&6; }
-# Loop over all known methods to create a tar archive until one works.
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar plaintar pax cpio none'
-_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      { echo "$as_me:$LINENO: $_am_tar --version" >&5
+
+# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
+      if test $am_uid -le $am_max_uid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+         _am_tools=none
+      fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
+      if test $am_gid -le $am_max_gid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        _am_tools=none
+      fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        { echo "$as_me:$LINENO: $_am_tar --version" >&5
    ($_am_tar --version) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && break
-    done
-    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x ustar -w "$$tardir"'
-    am__tar_='pax -L -x ustar -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
-    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
-    am__untar='cpio -i -H ustar -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
+      done
+      am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x ustar -w "$$tardir"'
+      am__tar_='pax -L -x ustar -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+      am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+      am__untar='cpio -i -H ustar -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_ustar}" && break
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_ustar}" && break
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
    (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
    ($am__untar <conftest.tar) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
+      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+   (cat conftest.dir/file) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
 
-if ${am_cv_prog_tar_ustar+:} false; then :
+  if ${am_cv_prog_tar_ustar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_prog_tar_ustar=$_am_tool
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
 $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
@@ -3039,6 +3123,7 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -3316,1007 +3401,26 @@ fi
 $as_echo "$USE_NLS" >&6; }
 
 
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
 
 
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
+case "$am__api_version" in
+    1.01234)
+	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+    ;;
+    *)
+    ;;
 esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
 
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-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; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-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; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-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; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    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 run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-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; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-
-
-case "$am__api_version" in
-    1.01234)
-	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-    ;;
-    *)
-    ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "0.35"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35" >&5
-$as_echo_n "checking for intltool >= 0.35... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error $? "Your intltool is too old.  You need intltool 0.35 or later." "$LINENO" 5
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+if test -n "0.35"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35" >&5
+$as_echo_n "checking for intltool >= 0.35... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	as_fn_error $? "Your intltool is too old.  You need intltool 0.35 or later." "$LINENO" 5
 fi
 
 # Extract the first word of "intltool-update", so it can be a program name with args.
@@ -4821,44 +3925,6 @@ fi
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  DATADIRNAME=share
-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 :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-
-
 
 
 
@@ -5141,55 +4207,305 @@ $as_echo "no" >&6; }
 fi
 
 
-  test -n "$ac_ct_CC" && break
-done
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+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; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+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; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+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; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-    CC=$ac_ct_CC
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    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 run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
   fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-fi
-
+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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-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; }
+int
+main ()
+{
 
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  (eval "$ac_compile") 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
 done
+else
+  $as_echo "$as_me: failed program was:" >&5
+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; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+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 :
@@ -5400,6 +4716,69 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
 
 depcc="$CC"   am_compiler_list=
 
@@ -5529,6 +4908,7 @@ else
 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 :
@@ -6005,8 +5385,8 @@ esac
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -6710,6 +6090,11 @@ else
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6749,7 +6134,7 @@ else
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -7178,7 +6563,7 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -7818,13 +7203,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -7971,6 +7356,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -8359,7 +7745,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -8370,7 +7756,20 @@ sparc*-*solaris*)
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -9010,7 +8409,13 @@ else
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -9021,6 +8426,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $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 :
@@ -9053,6 +8459,7 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -9074,7 +8481,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -9199,7 +8608,22 @@ fi
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -9277,6 +8701,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9732,7 +9160,9 @@ lt_prog_compiler_static=
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -9823,18 +9253,33 @@ lt_prog_compiler_static=
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -10196,7 +9641,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -10446,8 +9890,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10826,6 +10269,7 @@ fi
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -10871,6 +10315,7 @@ fi
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10899,10 +10344,6 @@ fi
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10915,7 +10356,7 @@ fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10954,7 +10395,6 @@ fi
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -11578,11 +11018,6 @@ esac
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -11672,7 +11107,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -11681,7 +11116,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -11746,7 +11181,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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'
@@ -11885,7 +11320,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11893,10 +11328,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11904,7 +11335,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11935,7 +11366,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11955,17 +11386,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -12026,7 +11458,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -12042,7 +11474,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -12079,9 +11511,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12163,7 +11595,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -12232,7 +11664,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12257,7 +11689,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
@@ -12281,7 +11713,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -12312,7 +11744,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12322,7 +11754,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
@@ -13104,6 +12536,8 @@ CC="$lt_save_CC"
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -16265,7 +15699,6 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -16308,18 +15741,14 @@ if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FAL
   as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16781,7 +16210,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.15.2, which was
+This file was extended by tomboy $as_me 1.15.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16847,7 +16276,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.15.2
+tomboy config.status 1.15.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -16984,6 +16413,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -17066,7 +16496,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -17122,6 +16551,7 @@ _LTECHO_EOF'
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -17172,7 +16602,6 @@ with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -17887,7 +17316,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -17938,7 +17367,7 @@ $as_echo X"$mf" |
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
@@ -18000,8 +17429,8 @@ $as_echo X"$file" |
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -18055,6 +17484,9 @@ SHELL=$lt_SHELL
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -18356,10 +17788,6 @@ no_undefined_flag=$lt_no_undefined_flag
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
diff --git a/configure.in b/configure.in
index dc7e263..2e94081 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-AC_INIT(tomboy, 1.15.2)
+AC_INIT(tomboy, 1.15.4)
 AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
-AM_INIT_AUTOMAKE([foreign tar-ustar])
+AM_INIT_AUTOMAKE([dist-xz foreign no-dist-gzip tar-ustar])
 AM_MAINTAINER_MODE
 
 GNOME_COMMON_INIT
diff --git a/data/Makefile.in b/data/Makefile.in
index b9a6d92..982f072 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/tomboy-addins.pc.in $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs $(srcdir)/tomboy-addins.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,15 +89,28 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = tomboy-addins.pc
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -113,9 +154,29 @@ DATA = $(dbusservice_DATA) $(desktop_DATA) $(mime_DATA) $(noinst_DATA) \
 	$(pkgconfig_DATA) $(schemas_DATA) $(server_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -593,14 +654,13 @@ uninstall-serverDATA:
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -621,31 +681,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-cscopelist-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
-	done
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -661,12 +703,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -678,15 +715,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -695,9 +728,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
 
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -714,19 +748,6 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -895,26 +916,24 @@ uninstall-am: uninstall-dbusserviceDATA uninstall-desktopDATA \
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 uninstall-man: uninstall-man1
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
-	cscopelist-recursive ctags-recursive install-am \
-	install-data-am install-strip tags-recursive uninstall-am
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist cscopelist-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-libtool distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-data-hook \
-	install-data-local install-dbusserviceDATA install-desktopDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-man1 install-mimeDATA install-pdf \
-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-	install-schemasDATA install-serverDATA install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
+.MAKE: $(am__recursive_targets) install-am install-data-am \
+	install-strip uninstall-am
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-data-local install-dbusserviceDATA \
+	install-desktopDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man1 install-mimeDATA \
+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+	install-ps-am install-schemasDATA install-serverDATA \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-dbusserviceDATA uninstall-desktopDATA uninstall-hook \
 	uninstall-man uninstall-man1 uninstall-mimeDATA \
 	uninstall-pkgconfigDATA uninstall-schemasDATA \
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 63756c1..f2661f7 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -61,6 +89,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -69,6 +109,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -363,11 +404,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -505,16 +544,17 @@ uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-local
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-local
 
 
 update-icon-cache:
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/WebSyncServiceAddin.dll.config b/debian/WebSyncServiceAddin.dll.config
deleted file mode 100644
index 2fa084c..0000000
--- a/debian/WebSyncServiceAddin.dll.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<configuration>
-	<dllmap dll="proxy" target="libproxy.so.1"/>
-</configuration>
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 285bbce..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,1202 +0,0 @@
-tomboy (1.15.2-2) experimental; urgency=low
-
-  * [408c915] Update libproxy DllMap for new SONAME (Closes: #725495)
-
- -- Iain Lane <laney at debian.org>  Mon, 04 Nov 2013 12:31:50 +0000
-
-tomboy (1.15.2-1) experimental; urgency=low
-
-  * [91d5baf] Track unstable versions
-  * [6aa1bf6] Imported Upstream version 1.15.2
-    + Center Preferences and About window on screen
-    + Compatibility fix for Rainy
-    + Fix HTML export with colon
-    + Add preference for startup notes
-
- -- Iain Lane <laney at debian.org>  Sun, 09 Jun 2013 19:35:47 +0100
-
-tomboy (1.14.1-1) unstable; urgency=low
-
-  * [5449ff8] debian/watch: Use GNOME ftp and track stable releases only
-  * [b0bcc4b] Imported Upstream version 1.14.1
-    + Improve note naming conflict dialog on sync
-    + Fix behavior of max. notes in tray preference
-    + Improved logic for window placement
-    + Update screenshots and links in docs
-    + Add missing documentation
-    + Accept command line args when Tomboy is running
-    + Preferences dialog should not be modal
-  * [a82a4c4] Bump S-V to 3.9.4; BD on debhelper >= 8.1.0 accordingly
-
- -- Iain Lane <laney at debian.org>  Sun, 09 Jun 2013 19:12:48 +0100
-
-tomboy (1.12.0-1) experimental; urgency=low
-
-  * [9c1e942] Compress deb data member with xz (Closes: #688706)
-  * [43258af] Imported Upstream version 1.12.0
-    + Translation updates
-
- -- Iain Lane <laney at debian.org>  Tue, 25 Sep 2012 10:40:40 +0100
-
-tomboy (1.11.5-1) experimental; urgency=low
-
-  * [b67c86c] Imported Upstream version 1.11.5
-    - Fix Evolution add-in gmime dependency
-    - Add match count in note search
-    - Sanitize sync url
-  * [3b08591] Delete 40_use_gmime_2.6.patch: applied upstream.
-
- -- Iain Lane <laney at debian.org>  Mon, 06 Aug 2012 17:56:45 +0100
-
-tomboy (1.11.2-1) experimental; urgency=low
-
-  * [9be0acb] Imported Upstream version 1.11.2
-    - Performance fix for note deletion
-    - Bump Mono profile to 4.0
-    - Ignore acronyms in spell-check
-    - Update documentation, command-line usage
-  * [b8da4f4] Drop obsolete 30_fix_manpage_syntax patch
-  * [aea1cb8] Refresh other patches
-
- -- Iain Lane <laney at debian.org>  Tue, 05 Jun 2012 14:28:12 +0100
-
-tomboy (1.11.1-1) experimental; urgency=low
-
-  * [decde44] gbp.conf back to exp branches
-  * [4e4e74f] Imported Upstream version 1.11.1
-    - Allow cmdline args to be passed to add-ins
-    - Fix for multi-monitor configurations and notes off the screen
-    - Fix Typo in manpage '---note-path'
-    - Fix for RemoveBrokenLinks-with-search
-
- -- Iain Lane <laney at debian.org>  Thu, 03 May 2012 20:15:51 +0100
-
-tomboy (1.10.0-2) unstable; urgency=low
-
-  * [9c1e942] Compress deb data member with xz (Closes: #688706)
-
- -- Iain Lane <laney at debian.org>  Tue, 25 Sep 2012 09:56:42 +0100
-
-tomboy (1.10.0-1) unstable; urgency=low
-
-  * [277fd7f] Imported Upstream version 1.10.0
-    - Remember last open notes on hard shutdown
-  * [b863565] Stable release; update gbp.conf branches
-
- -- Iain Lane <laney at debian.org>  Wed, 28 Mar 2012 11:32:48 +0100
-
-tomboy (1.9.10-1) unstable; urgency=low
-
-  * [91a0237] Imported Upstream version 1.9.10
-    - Fix doc errors for sync 
-    - New and updated (doc) translations
-
- -- Iain Lane <laney at debian.org>  Tue, 20 Mar 2012 22:34:39 +0000
-
-tomboy (1.9.9-2) experimental; urgency=low
-
-  * Merge from unstable
-  * [b6e36a3] Use GMime 2.6 instead of 2.4; the latter is being dropped.
-    (Closes: #663216)
-  * [934f580] Use dh sequence explicitly instead of via deprecated cli.make
-    include
-  * [7cb46e3] Standards-Version → 3.9.3, no changes required
-
- -- Iain Lane <laney at debian.org>  Mon, 12 Mar 2012 21:44:18 +0000
-
-tomboy (1.9.9-1) experimental; urgency=low
-
-  * New upstream release 1.9.9 (still no pristine-tar)
-    - Fix link names after HTML export 
-    - fix Export All to HTML
-
- -- Iain Lane <laney at debian.org>  Tue, 06 Mar 2012 19:00:41 +0000
-
-tomboy (1.9.5-1) experimental; urgency=low
-
-  * [ceb1079] Update watchfile to look for xz tarballs
-  * [ef866ec] Imported Upstream version 1.9.5 (note: no pristine-tar data for
-    this yet, due to missing pristine-xz)
-    * Fix validation errors in docs
-    * Fix delayed logouts with GnomeSession (Closes: #645990)
-    * Sync thread improvements
-    * Add missing commandline options to man pages (#665532)
-    * Add 256x256 icon for GNOME 3
-  * [fcde26a] Drop deprecated cli.make and use --with cli directly
-
- -- Iain Lane <laney at debian.org>  Wed, 18 Jan 2012 13:16:27 +0000
-
-tomboy (1.9.3-1) experimental; urgency=low
-
-  * [7e76896] Imported Upstream version 1.9.3
-    + Translation updates
-
- -- Iain Lane <laney at debian.org>  Tue, 22 Nov 2011 14:49:18 +0000
-
-tomboy (1.9.2-1) experimental; urgency=low
-
-  * [72d7885] Update gbp.conf for experimental
-  * [fca59c6] Imported Upstream version 1.9.2
-    + Add support for latest versions of Firefox
-    + Translation updates
-
- -- Iain Lane <laney at debian.org>  Wed, 16 Nov 2011 16:02:47 +0000
-
-tomboy (1.8.3-2) unstable; urgency=low
-
-  * [b6e36a3] Use GMime 2.6 instead of 2.4; the latter is being dropped.
-    (Closes: #663216)
-  * [934f580] Use dh sequence explicitly instead of via deprecated cli.make include
-  * [7cb46e3] Standards-Version → 3.9.3, no changes required
-
- -- Iain Lane <laney at debian.org>  Mon, 12 Mar 2012 21:28:55 +0000
-
-tomboy (1.8.3-1) unstable; urgency=low
-
-  * [6d2edf9] Imported Upstream version 1.8.3
-    + Translation updates
-
- -- Iain Lane <laney at debian.org>  Wed, 16 Nov 2011 15:58:39 +0000
-
-tomboy (1.8.0-1) unstable; urgency=low
-
-  * Upload to unstable
-  * [74507b7] Imported Upstream stable version 1.8.0
-    + Translation Updates
-  * [9ccc75f] Remove merge conflict marker in debian/changelog
-  * [d583cfa] Change branches in gbp.conf to unstable
-
- -- Iain Lane <laney at debian.org>  Mon, 26 Sep 2011 22:26:48 +0100
-
-tomboy (1.7.6-1) experimental; urgency=low
-
-  * [e29c8c1] Imported Upstream version 1.7.6
-    + Translation updates
-
- -- Iain Lane <laney at debian.org>  Tue, 06 Sep 2011 17:04:32 +0100
-
-tomboy (1.7.4-1) experimental; urgency=low
-
-  * [aae3ba7] Delete debian/ltmain-as-needed.sh. Not necessary any more.
-  * [d4687c3] Remove Ubuntu customisation from debian/rules; done differently now
-  * [6e75a5b] Imported Upstream version 1.7.4
-    + Name note being deleted in confirmation dialog
-    + Autolinking notes should not update modification time
-    + Fix translation string in Export All Notes Addin
-    + Don't create nested links
-    + Save button in Sync Preferences should be insensitive until fields a
-      filled
-    + Tune down autosync frequency
-    + Keep selection after Notebook rename
-    + Allow renaming of template notes
-    + Improve template note functionality
-
- -- Iain Lane <laney at debian.org>  Tue, 23 Aug 2011 22:09:33 +0100
-
-tomboy (1.7.3-1) experimental; urgency=low
-
-  * [25db012] Imported Upstream version 1.7.3
-    + Make NUNIT conditional
-  * [c2709c3] Remove 10_disable_unit_tests patch; now supported via configure
-    flag
-
- -- Iain Lane <laney at debian.org>  Mon, 15 Aug 2011 22:20:55 +0100
-
-tomboy (1.7.2-1) experimental; urgency=low
-
-  * [6a8551d] Imported Upstream version 1.7.2
-    + New addin for advanced preferences
-    + Remove minumum size on Search All Notes window
-    + Fix note title matching in TrieTree
-    + Enforce minimum size on Name column in Search All Notes window
-
- -- Iain Lane <laney at debian.org>  Tue, 26 Jul 2011 16:44:05 +0100
-
-tomboy (1.7.1-1) experimental; urgency=low
-
-  * [dbee52f] Imported Upstream version 1.7.1
-   + New addin to Export All Notes
-   + Drop dependency for gconf-sharp-peditors
-   + Fix delete key behavior in bullet lists
-   + Resolve relative paths when exporting notes
-   + Fix string in Preferences UI
-   + Handle ending slashes in sync URLs
-   + Don't allow rename of special notebooks
-   + Don't open URL twice in Addin preferences
-   + Handle invalid files when loading notes
-   + Add UI for no search results in notebook
-   + Update copyright to 2011
-   + Handle matching brackets in links
-  * [e324eb0] Drop gnome# BD in line with upstream's configure
-  * [d31575d] Disable schema install in the build
-
- -- Iain Lane <laney at debian.org>  Tue, 05 Jul 2011 23:17:55 +0100
-
-tomboy (1.7.0-1) experimental; urgency=low
-
-  * [de22824] Modify watch file to look for bz2 orig files
-    + Search does not give preference to note title 
-    + Cleanup strings in sync dialog dialogs 
-    + Context-menu key now opens next to selected notes 
-    + Fix string references to *Search All Notes* window 
-    + Disable Delete action when note list not in focus 
-    + Allow the user to open multiple notes via keypress or menu 
-    + Update tar usage to ensure OpenBSD compatibility 
-    + Switch from NDesk Dbus to dbus-sharp 
-    + Specify utf8 encoding for sync confirmation page 
-    + Fix focus chain in Search All Notes window 
-    + New addin for removing broken links from notes 
-    + Remove unmanaged window present code 
-    + Improvements for translators 
-    + Don't save unchanged new notes 
-  * [aafe1b2] Imported Upstream version 1.7.0
-  * [309d0af] Switch BDs from ndesk-dbus to dbus-sharp
-  * [0e77616] Disable panel applet, panel will be deprecated with GNOME 3
-  * [645383d] Convert to 3.0 (quilt) for bz2 orig support
-
- -- Iain Lane <laney at debian.org>  Tue, 21 Jun 2011 16:42:35 +0100
-
-tomboy (1.6.1-1) unstable; urgency=low
-
-  * [e32a2d3] Imported Upstream version 1.6.1
-    + Hungarian and Catalan translation updates
-  * [780d74b] Standards-Version → 3.9.2, no changes required
-  * [a296fa0] Update to use my d.o email address
-
- -- Iain Lane <laney at debian.org>  Wed, 25 May 2011 15:24:52 +0100
-
-tomboy (1.6.0-2) unstable; urgency=low
-
-  * [8a1e57b] Drop dh_autoreconf, no longer necessary and causes FTBFS due to
-    a bug somewhere (Closes: #622207)
-  * [fb9dcfe] Disable unit tests in a way that doesn't require autoreconfing
-  * [bf19fc0] Patch tomboy.exe dllmap to use DLL names as in the source
-
- -- Iain Lane <laney at ubuntu.com>  Mon, 11 Apr 2011 21:15:28 +0100
-
-tomboy (1.6.0-1) unstable; urgency=low
-
-  * [3460d94] Imported Upstream version 1.6.0
-    + Changed GetSelectedNotebook from private to public so it can be used by
-    add-ins
-    + Fix tomboy insecure LD_LIBRARY_PATH
-    + Fix CVE-2010-4005
-    + Fix Remove title format from add-ins descriptions
-    + Fix Replace Computer Name with Login Name in SSH sync setup
-  * [71513fe] Add BD on libproxy-dev for proxy support
-  * [e6de4c3] Remove no longer needed PrintNotes DLLMap
-  * [e88f9be] Add DLLMap for WebSyncServiceAddin to map libproxy
-
- -- Iain Lane <laney at ubuntu.com>  Thu, 07 Apr 2011 23:00:15 +0100
-
-tomboy (1.2.2-2) unstable; urgency=high
-
-  * [bc0695b] Fix insecure LD_LIBRARY_PATH. A vulnerability existed
-    where if LD_LIBRARY_PATH were set but empty, a trailing : as a path
-    separator would still be appended to the path, exposing an
-    insecure/invalid search path. Using :+: instead of +: prevents this
-    as ${X:+:$X} returns X iff X is set and not empty whereas ${X+:$X}
-    returns X iff X is set (it may be empty). References: CVE-2010-4005
-    (Closes: #605096)
-
- -- Iain Lane <laney at ubuntu.com>  Mon, 29 Nov 2010 18:59:02 +0000
-
-tomboy (1.5.2-1) experimental; urgency=low
-
-  * [40c7e88] Imported Upstream version 1.3.4
-    + Stop building libtomboy with *DISABLE_DEPRECATED flags (for now)
-  * [d8bee18] Imported Upstream version 1.5.2
-    + Fix potential sync dataloss bug for former Gnote users
-    + Documentation fixes
-    + Fix windows crash when libproxy not available
-    + Stop using deprecated GDK API in libtomboy
-    + Various documentation bugs fixed
-
- -- Iain Lane <laney at ubuntu.com>  Tue, 26 Oct 2010 21:26:50 +0100
-
-tomboy (1.2.2-1) unstable; urgency=low
-
-  * New upstream bugfix release 1.2.2:
-    + Fix potential sync dataloss bug for former Gnote users
-    + Support latest GTK# installer on Windows
-    + Translation updates: hu, id
-
- -- Iain Lane <laney at ubuntu.com>  Tue, 26 Oct 2010 20:26:32 +0100
-
-tomboy (1.3.3-1) experimental; urgency=low
-
-  * [c12a7eb] Imported Upstream version 1.3.2
-    + Fix ExportToHtml to export linked notes on Windows
-    + Fix GtkPopup focus problems on Windows
-    + Various help text fixes
-    + Fix Windows installer to require .Net 3.5 support upgrades
-    + Don't open the search dialog if tray is not ready
-    + Allow empty username field for SSH sync
-    + Fix Windows installer to detect GTK# >=2.12.10
-  * [980af20] Imported Upstream version 1.3.3
-    + Update Print add-in license to LGPL (not GPL)
-  * [7656f59] Standards-Version → 3.9.1, no changes required
-
- -- Iain Lane <laney at ubuntu.com>  Tue, 14 Sep 2010 00:02:37 +0100
-
-tomboy (1.3.1-1) experimental; urgency=low
-
-  * New upstream release 1.3.1
-   + Disable panel applet support by default
-   + New topic-based help
-   + Add libproxy support to web sync
-   + Support LaTeX add-in on Mac
-   + Fix `make run` for developers
-   + Document --debug option in manpage
-  * New upstream release 1.3.0
-   + Use GNOME Session D-Bus API for session management
-   + Fix indentation of bullet list items when printing
-   + Fix keyboard navigation in bullet lists
-   + Applet now uses correct icon
-   + Add hidden preference for quiet note deletion
-   + Add hidden preference for disabling tray icon
-   + HIG menu item clean-ups on Mac
-   + Proper formatting when typing in timestamp text
-   + Allow building with -DGSEAL_ENABLE
-   + Fix crash in autosync when certain server types are unavailable
-   + Clean up stream usage in attempt to fix LP#556628
-  * [803d6e9] Add debian/gbp.conf to build for exp
-  * [d5362ee] Update build-deps to match new configure checks
-  * [1e80e86] Enable panel applet
-  * [10012c1] debian/patches/*: Add patch headers
-  * [5c308ae] 30_fix_manpage_syntax: Remove line in manpage which causes
-    warning
-  * [b57ab2b] debian/{control,rules}: Replace manual autoreconf with dh-
-    autoreconf
-  * [2fe5306] Increase Standards-Version to 3.9.0, no changes required
-
- -- Iain Lane <laney at ubuntu.com>  Sun, 04 Jul 2010 19:07:59 +0100
-
-tomboy (1.2.1-1) unstable; urgency=low
-
-  * New upstream release 1.2.1:
-    + Fix bullet list indentation when printing (Closes: #551059)
-    + Add timestamp to logger messages, useful for watching autosync output, etc
-  * debian/watch: Remove unnecessary "debian"
-
- -- Iain Lane <laney at ubuntu.com>  Wed, 28 Apr 2010 11:56:27 +0100
-
-tomboy (1.2.0-1) unstable; urgency=low
-
-  * New upstream release 1.2.0
-    + Handle new application/x-note mimetype
-    + Add a text/path-list target when drag-and-dropping from Search window,
-      allowing basic note transfer via Empathy
-    + Allow icon themes to customize the panel/tray icon separately
-    + Fix errors when using GTK+ >= 2.19.7
-  * New upstream release 1.1.4
-   + Autosync improvements:
-     - Enable the preference in the UI
-     - Try to only sync when idle (to avoid interrupting your writing)
-     - Do not attempt to sync when the server is unavailable
-     - Fix focus/cursor issues that were occurring after autosync
-  * New upstream realease 1.1.2
-   + Experimental automatic background synchronization support
-   + Allow user to decide if links are updated when renaming a note
-   + Fix crashers related to new Jump List feature
-  * New upstream release 1.1.1
-   + Copy rich text from notes to apps like Evolution and OpenOffice.org Writer.
-     Feature requires gtk-sharp 2.12.10
-   + Rearrange Tomboy startup so icon appears within 0.5-1.0 seconds
-   + Prevent crash when entering empty notebook name 
-  * New upstream release 1.1.0
-   + Add support for Ubuntu One and others using OAuth 1.0a
-   + Add CreateNamedNoteWithUri method to dbus interface
-   + Add dbus methods for working with notebooks
-   + Always show icons for note items in recent notes menu
-   + Add Sync menu item to panel applet
-   + Stop cutting off message text in the Sync dialog
-  * debian/rules: Pass --disable-update-mimdb to configure as it doesn't make
-    sense to update the mimedb in a buildd build.
-  * debian/control: Increase Standards-Version to 3.8.4, no changes required
-  * debian/source/format: Specify 1.0 explicitly (hello there Lintian, old
-    friend)
-
-
- -- Iain Lane <laney at ubuntu.com>  Fri, 02 Apr 2010 23:31:19 +0100
-
-tomboy (1.0.1-4) unstable; urgency=low
-
-  * debian/patches/20_remove_pcfile_requires: Remove requires from
-    tomboy-addins.pc.in. These are not needed for linkage. (Closes: #564372)
-  * debian/control: Update CLI library deps to use new -dev packages which
-    contain pcfiles now. 
-
- -- Iain Lane <laney at ubuntu.com>  Sat, 09 Jan 2010 14:52:59 +0000
-
-tomboy (1.0.1-3) unstable; urgency=low
-
-  * The "Won't somebody think of the dep chain" release
-  * debian/patches/10_disable_unit_tests.patch: Disable unit tests
-    unconditionally as they cause a non-deterministic build depending on
-    whether nunit is present or not.
-  * debian/control: Remove all build-deps from `mono' source package and
-    instead rely on mono-devel (>= 2.4.3) to pull them in. 
-
- -- Iain Lane <laney at ubuntu.com>  Thu, 17 Dec 2009 22:25:15 +0000
-
-tomboy (1.0.1-2) unstable; urgency=low
-
-  * debian/ltmain-as-needed.sh: Update, as a version mismatch with
-    Debian's libtool caused FTBFS (Closes: #560664)
-
- -- Iain Lane <laney at ubuntu.com>  Wed, 16 Dec 2009 16:04:59 +0000
-
-tomboy (1.0.1-1) unstable; urgency=low
-
-  * New upstream release 1.0.1:
-    - Add support for Ubuntu One and others using OAuth 1.0a (Rodrigo Moya)
-    - Always show icons for note items in recent notes menu
-  * debian/patches/02_support_oauth_1.0a.patch: Drop, now upstream
-  * debian/control: Switch to gmime2.4 - Tomboy got support for this at
-    0.15.0. (Closes: #556412) 
-  * debian/control: Bump cli-common-dev version requirement to that which
-    provides the DH7 integration 
-
- -- Iain Lane <laney at ubuntu.com>  Tue, 24 Nov 2009 14:17:51 +0000
-
-tomboy (1.0.0-2) unstable; urgency=low
-
-  [ Iain Lane ]
-  * debian/rules: Update the translation template after the build, doesn't
-    affect Debian but is required for Ubuntu. Reduces the delta.
-  * debian/patches/02_support_oauth_1.0a.patch: Add upstream/Ubuntu patch to
-    support new OAuth protocol required by some services such as U1.
-
-  [ Stefan Ebner ]
-  * debian/rules:
-    + Directly convert and install the icon
-    + Remove debian/clean
-    + Remove debian/tomboy.install
-  * Added debian/dirs
-  * debian/watch: Bump version to 3
-
- -- Iain Lane <laney at ubuntu.com>  Wed, 07 Oct 2009 16:01:38 +0100
-
-tomboy (1.0.0-1) unstable; urgency=low
-
-  * New upstream version 1.0.0:
-    - Fix crash when showing Search from panel applet 
-    - Redirect complete applet output to ~/.config/tomboy/tomboy-panel.log.
-    - Every patch contributor goes in the About dialog now.
-    - Add Underline add-in to Windows/Mac builds.
-    - WebSync fixes on Windows.
-  * New upstream version 0.15.7:
-    - Update for latest (hopefully final) REST API spec (Rodrigo Moya).
-    - Initial support for OAuth 1.0a servers 
-    - Drop heavy System.Web dependency by bundling HttpUtility class.
-    - Fix parsing bug that caused Tomboy to upload empty notes to the server.
-    - More streamlined initial auth procedure (less clicks).
-    - Fix error when connecting before logged in to Snowy 
-    - Prevent crash on PPC and ARM when showing menus 
-    - Don't connect to session manager when running as applet 
-    - When closing search window, do not quit if Tomboy icon is visible 
-  * New upstream version 0.15.6:
-    - Migrate notes from ~/.tomboy, following Free Desktop standards on Linux
-      and appropriate conventions on Windows and Mac OS X 
-    - Don't force port 22 when no port is specified for SSH sync 
-    - Add preference in GConf for maximum width of note menu Jeff Tickle).
-  * New upstream version 0.15.5:
-    - Option to sync from Tomboy icon's contextual menu (#468459, Buchner
-      Johannes).
-    - Rename notebooks from the Search window (#435734).
-    - Clean up wasted space in Search and Preferences windows
-    - Maintain scroll position when notes change while Search window open
-    - Fix Notebook toolbar button appearance with 'text beside icons' setting.
-  * New upstream version 0.15.4:
-    - Improved behavior when changing font sizes (Stefan Schweizer).
-    - Builds fixes on Windows and Mac OS X (Matt Johnston, Sandy Armstrong).
-    - Require gtk+ 2.14 and stop using obsolete libgnome APIs.
-  * debian/control: Bump gtk build-dep to 2.14.0 per configure
-  * debian/rules: Remove some unnecessary variables and exports 
-  * debian/README.source: Add, thanks Lintian 
-  * debian/control: Add myself to Uploaders 
-  * debian/control: Update standards-version to 3.8.3, no changes 
-  * debian/control: Use mono-csc instead of csc as compiler, bump mono-devel
-    build-dep version for this 
-  * debian/control: Update Vcs-Browser to point to new correct URL 
-
- -- Iain Lane <laney at ubuntu.com>  Fri, 25 Sep 2009 20:55:58 +0100
-
-tomboy (0.15.3-1) experimental; urgency=low
-
-  * New upstream version 0.15.3:
-   - New underline formatting add-in (disabled by default) from Mark Wakim.
-   - Add ctrl +/- shortcuts for changing font size (Stefan Schweizer).
-   - Fix bullet display in HTML export (Stefan Schweizer).
-   - Update WebSync to use OAuth for authentication, and use the latest REST API.
-   - Fix i18n issue in WebSync (Anders Petersson).
-   - Add "Get More Add-Ins..." link in the Add-Ins tab of Preferences.
-   - Reduce command line output when not running Tomboy with --debug.
-   - Fix tarball for those that need panelapplet-sharp bundled.
-   - Documentation updates (Paul Culter).
-   - New Translations: vi
-   - Translation updates: bn_IN, es, et, he, sv, ta, th, uk, zh_CN
-
- -- Iain Lane <laney at ubuntu.com>  Wed, 15 Jul 2009 19:46:45 +0100
-
-tomboy (0.15.2-1) experimental; urgency=low
-
-  * New upstream release 0.15.1:
-   - New WebSync add-in syncs to any server that implements the Tomboy Web REST API,
-     such as Snowy [http://live.gnome.org/Snowy].  Baby-eating preview release.
-   - Require Mono 1.9.1 to *build* Tomboy. Should still run on older Mono.
-   - Prevent PATH problems on Windows from breaking Tomboy.
-   - Search for phrases by quoting search text.
-   - Fix drag&drop & middle-click paste of linked text.
-   - Save width of notebook pane in Search window.
-   - Disable sync menu items until backend configured.
-   - Close note find bar on escape, even when not focused.
-   - Support FUSE being built-in to kernel.
-   - Prevent crashes when reading unexpected note XML.
-   - Change "Open New Note Template" LinkButton to Button to prevent error.
-   - Focus search field every time Search window summoned.
-   - Only show Start Here note on first run if not running as applet.
-   - HIG compliance in Sync preferences.
-   - Use correct "info" icon in add-in info windows.
-   - Use relative path to load help.
-   - Cache frequently-used text tags in one place instead of five.
-   - Documentation updates.
-   - Translation updates: el, es, et, gl
-  * New upstream release 0.15.2:
-   - Fix HTML Export on Mac OS X.
-   - Translation updates: es, et, nb, sv, zh_CN
-  * debian/control: Add help/ as GFDL 1.1+ 
-  * debian/rules: Remove --repack; not necessary as upstream is a .tar.gz and
-    could cause rule to be nondeterministic
-
- -- Iain Lane <laney at ubuntu.com>  Mon, 01 Jun 2009 22:08:22 +0100
-
-tomboy (0.15.0-0ubuntu1) karmic; urgency=low
-
-  * New upstream release
-  * debian/rules:
-    + Add get-orig-source rule
-  * debian/watch:
-    + Do not run "uupdate" as it does not permit preparing Debian
-      revision on Ubuntu
-  * debian/patches/02_configurable_compiler.patch:
-    + Deleted, merged upstream
-  * debian/patches/03_03_sm-name.patch:
-    + Deleted, no longer relevant
-
- -- Jo Shields <directhex at apebox.org>  Wed, 06 May 2009 23:37:55 +0100
-
-tomboy (0.14.3-1) unstable; urgency=low
-
-  [ Stefan Ebner ]
-  * Replace the tomboy icon misery with a proper method:
-    + debian/control: 
-      - Replace b-p on shareutils with imagemagick.
-      - Bump Standards-Version to 3.8.2
-    + debian/rules: Convert the icons at build time.
-    + Delete tomboy.dirs and tomboy-{16/32}.xpm.uu.
-    + Add debian/tomboy.install to install the generated icons properly.
-    + Add debian/clean to remove the generated xpm files.
-
-  [ Iain Lane ]
-  * debian/rules: Remove --repack; not necessary as upstream is a .tar.gz
-    and this could cause rule to be nondeterministic
-  * Update watch file to scan for stable releases only 
-  * New upstrem release 0.14.3
-    - Fix build for those with gnome-sharp < 2.23.90 (Stefan Schweizer).
-    - Fix HTML Export add-in on Mac OS X.
-    - Translation updates: el, es
-
- -- Iain Lane <laney at ubuntu.com>  Mon, 13 Jul 2009 18:32:54 +0100
-
-tomboy (0.14.2-2) unstable; urgency=low
-
-  [ Mirco Bauer ]
-  * The "Squeeze it!" release
-    + The installed package size was reduced from 13MB to 8MB.
-  * debian/rules
-    debian/control
-    debian/compat:
-    + Rewrote for dh7 (automatically uses dh_clistrip).
-  * debian/paches/*
-    debian/control:
-    + Switched to quilt.
-  * debian/rules:
-    debian/control:
-    + Use pngquant to optimize the file size of the PNG files.
-  * debian/rules:
-    + autoreconf, update gnome-doc-utils.make (for symlinking the same
-      picture files) and put patched ltmain.sh in place for --as-needed
-      magic before build.
-    + Removed --with-mono-addins parameter from configure call, as the
-      parameter no longer exist.
-
-  [ Iain Lane ]
-  * debian/control: Update VCS info to point to git repo
-
- -- Mirco Bauer <meebey at debian.org>  Sat, 13 Jun 2009 02:10:01 +0200
-
-tomboy (0.14.2-1) unstable; urgency=low
-
-  [ Jo Shields ]
-  * New upstream release
-  * debian/rules:
-    + Add get-orig-source rule
-  * debian/watch:
-    + Do not run "uupdate" as it does not permit preparing Debian
-      revision on Ubuntu
-  * debian/patches/02_configurable_compiler.patch:
-    + Deleted, merged upstream
-  * debian/patches/03_03_sm-name.patch:
-    + Deleted, no longer relevant
-
-  [ Sebastian Dröge ]
-  * debian/control:
-    + Update build dependencies.
-    + Change maintainer to pkg-cli-apps.
-
- -- Sebastian Dröge <slomo at debian.org>  Thu, 14 May 2009 08:23:41 +0200
-
-tomboy (0.12.2-5) unstable; urgency=low
-
-  [ Stefan Ebner ]
-  * Update libgnome-cil build-dependency for GNOME# 2.24 transition
-  * Bump Standards version to 3.8.1
-
-  [ Mirco Bauer ]
-  * debian/control:
-    + Added libgnomepanel2.24-cil to build-deps.
-
- -- Stefan Ebner <sebner at ubuntu.com>  Sun, 22 Mar 2009 14:54:14 +0100
-
-tomboy (0.12.2-4) unstable; urgency=low
-
-  * debian/control:
-    + Build depend on libgmime2.2a-cil.
-
- -- Sebastian Dröge <slomo at debian.org>  Sat, 21 Mar 2009 11:24:05 +0100
-
-tomboy (0.12.2-3) unstable; urgency=low
-
-  [ Jo Shields ]
-  * debian/control:
-    + Add Vcs-* fields
-
-  [ Sebastian Dröge ]
-  * Upload to unstable (Closes: #518414).
-  * debian/control:
-    + Use Gnome# 2.20 for now.
-
- -- Sebastian Dröge <slomo at debian.org>  Fri, 06 Mar 2009 11:02:03 +0100
-
-tomboy (0.12.2-2) experimental; urgency=low
-
-  * debian/control:
-    + Build against Gnome# 2.24 and GnomeDesktop# 2.24.
-
- -- Sebastian Dröge <slomo at debian.org>  Sat, 24 Jan 2009 20:53:58 +0100
-
-tomboy (0.12.2-1) experimental; urgency=low
-
-  [ Pedro Fragoso ]
-  * Wrap Build-deps Deps and Suggests
-  * Don't install la files
-  * Update debian/copyright to reflect tomboykeybinder tomboyutil
-
-  [ Iain Lane ]
-  * debian/rules, debian/control,
-    debian/patches/02_configurable_compiler.patch:
-    + Update for Mono 2.0 transition (Closes: #509056).
-    + Replace mono-gmcs build-dep with mono-devel to pull in csc
-    + Remove obsolote libmono-dev build-dep
-    + Pass GMCS=/usr/bin/csc to configure to use csc for the build
-    + Patch the build system to respect the passed compiler (Patch from James
-      Westby)
-
-  [ Sebastian Dröge ]
-  * New upstream bugfix release.
-  * debian/patches/03_sm-name.patch:
-    + Register as "tomboy" to the session manager instead
-      of "Tomboy" (Closes: #508995). Thanks to Josselin Mouette
-      for the patch idea.
-
- -- Sebastian Dröge <slomo at debian.org>  Sat, 20 Dec 2008 12:58:35 +0100
-
-tomboy (0.12.1-1) experimental; urgency=low
-
-  * New upstream stable release:
-    + debian/control:
-      - Add gnomeprint and gnomeprintui to build depends.
-  * debian/watch:
-    + Fix URL for the upstream taraball for the
-      new versions (Closes: #500284).
-
- -- Sebastian Dröge <slomo at debian.org>  Thu, 20 Nov 2008 13:11:00 +0100
-
-tomboy (0.11.3-1) experimental; urgency=low
-
-  * New upstream development release.
-
- -- Sebastian Dröge <slomo at debian.org>  Fri, 22 Aug 2008 10:15:20 +0200
-
-tomboy (0.11.1-1) experimental; urgency=low
-
-  * New upstream development release:
-    + debian/control:
-      - Update build dependencies.
-      - Update Standards-Version to 3.8.0.
-      - Suggest tasque.
-
- -- Sebastian Dröge <slomo at debian.org>  Sat, 09 Aug 2008 14:58:30 +0200
-
-tomboy (0.10.2-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
- -- Sebastian Dröge <slomo at debian.org>  Tue, 20 May 2008 11:05:10 +0200
-
-tomboy (0.10.1-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
- -- Sebastian Dröge <slomo at debian.org>  Mon, 07 Apr 2008 21:40:51 +0200
-
-tomboy (0.10.0-1) unstable; urgency=low
-
-  * New upstream stable release:
-    + Upload to unstable.
-
- -- Sebastian Dröge <slomo at debian.org>  Mon, 10 Mar 2008 19:34:31 +0100
-
-tomboy (0.9.8-1) experimental; urgency=low
-
-  * New upstream release:
-    + debian/patches/02_link-libX11.patch,
-      debian/patches/99_autoreconf.patch:
-      - Dropped, not needed anymore.
-  * debian/rules,
-    debian/PrintNotes.dll.config:
-    + Install dll mappings for the Print Notes addin.
-
- -- Sebastian Dröge <slomo at debian.org>  Tue, 04 Mar 2008 11:46:34 +0100
-
-tomboy (0.9.7-2) experimental; urgency=low
-
-  * Rebuild against gtk-sharp2 2.10.4-2 (Closes: #468906).
-
- -- Sebastian Dröge <slomo at debian.org>  Mon, 03 Mar 2008 05:06:13 +0100
-
-tomboy (0.9.7-1) experimental; urgency=low
-
-  * New upstream development release:
-    + debian/control:
-      - Updated build dependencies.
-    + debian/patches/01_external-mono-addins.patch:
-      - Dropped, merged upstream.
-    + debian/watch:
-      - Updated for the new release series.
-    + debian/patches/01_dllmaps.patch:
-      - Fix dllmap to point to the correct path.
-  * debian/rules,
-    debian/patches/99_ltmain_as-needed.patch:
-    + Link the native libraries with --as-needed to get fewer dependencies.
-  * debian/patches/02_link-libX11.patch:
-    + Link libtomboy with libX11.
-  * debian/patches/99_autoreconf.patch:
-    + Regenerated for the above change.
-  * debian/control:
-    + Update Standards-Version to 3.7.3, no additional changes needed.
-    + Use Homepage field.
-    + Build depend on autotools-dev.
-
- -- Sebastian Dröge <slomo at debian.org>  Fri, 29 Feb 2008 08:02:26 +0100
-
-tomboy (0.8.2-1) unstable; urgency=low
-
-  * New upstream bugfix release:
-    + debian/patches/02_CVE-2005-4790-insecure-search-path.patch:
-      - Dropped, merged upstream.
-    + debian/patches/99_autoreconf.patch:
-      - Updated for the new version.
-
- -- Sebastian Dröge <slomo at debian.org>  Mon, 26 Nov 2007 17:05:20 +0100
-
-tomboy (0.8.1-2) unstable; urgency=high
-
-  * debian/patches/02_CVE-2005-4790-insecure-search-path.patch:
-    + SECURITY, CVE-2005-4790:
-      Multiple untrusted search path vulnerabilities in SUSE Linux 9.3 and
-      10.0, and possibly other distributions, cause the working directory to
-      be added to LD_LIBRARY_PATH, which might allow local users to execute
-      arbitrary code via (1) beagle, (2) tomboy, or (3) blam.
-      NOTE: in August 2007, the tomboy vector was reported for other
-      distributions.
-      Patch taken from upstream SVN.
-  * debian/tomboy.menu:
-    + Fix section. It's now "Applications/Data Management".
-
- -- Sebastian Dröge <slomo at debian.org>  Wed, 14 Nov 2007 05:34:45 +0100
-
-tomboy (0.8.1-1) unstable; urgency=low
-
-  * New upstream bugfix release, with many translation updates.
-  * debian/patches/99_autoreconf.patch:
-    + Updated for the new version.
-
- -- Sebastian Dröge <slomo at debian.org>  Tue, 16 Oct 2007 12:58:54 +0200
-
-tomboy (0.8.0-2) unstable; urgency=low
-
-  * debian/patches/01_external-mono-addins.patch,
-    debian/patches/99_autoreconf.patch,
-    debian/control.in,
-    debian/rules:
-    + Build against an external Mono.Addins. Patch taken from upstream SVN.
-
- -- Sebastian Dröge <slomo at debian.org>  Sat, 22 Sep 2007 11:23:05 +0200
-
-tomboy (0.8.0-1) unstable; urgency=low
-
-  * New upstream release (Closes: #436809):
-    + Adds sync support (Closes: #313302).
-    + debian/patches/01_define.cs.patch:
-      - Dropped, merged upstream.
-    + debian/tomboy.desktop:
-      - Dropped, upstream's desktop file is usable now and we use it since
-        some time already anyway.
-
- -- Sebastian Dröge <slomo at debian.org>  Mon, 17 Sep 2007 15:41:26 +0200
-
-tomboy (0.6.3-2) unstable; urgency=low
-
-  * debian/patches/01_define.cs.patch:
-    + Fix FTBFS caused by having an "[assembly: ..." attribute in the end.
-      It's only allowed directly after "using ..." (Closes: #441657).
-  * debian/rules:
-    + Call dh_clifixperms to get proper permissions on all files.
-
- -- Sebastian Dröge <slomo at debian.org>  Wed, 12 Sep 2007 07:04:21 +0200
-
-tomboy (0.6.3-1) unstable; urgency=low
-
-  * New maintainer with permission of the old maintainer. Thanks to Dave
-    Beckett for the work on this package in the past.
-  * New upstream release (Closes: #418566, #415420):
-    + DBus support is fixed and tomboy is single-instance
-      again (Closes: #407744, #313298, #400552)
-    + Fixes crash when opening preferences (Closes: #386271)
-    + Ship fixed width plugin (Closes: #372776)
-    + Fixes interaction with session manager (Closes: #356833)
-    + Fixes bad interaction with different linking mechanisms (Closes: #396177)
-    + debian/control:
-      - Update build dependencies. Tomboy uses C# 2.0 now and also uses the
-        external ndesk-dbus packages.
-      - Suggest evolution as tomboy has a evolution plugin which allows
-        dragging mails from evolution to notes and adds a nice link to the
-        mail in the note.
-    + debian/patches/01-dbus0.9.patch:
-      - Dropped, not needed anymore with the new version.
-  * Acknowledge NMU by Michael Ablassmeier (Closes: #388205)
-  * debian/control:
-    + Set me as maintainer.
-  * debian/rules,
-    debian/tomboy.desktop:
-    + Use upstream's desktop file now as it has proper translations.
-  * debian/rules:
-    + Drop now unecessary restoring of config.{sub,guess} as it is done
-      properly by cdbs since some time already.
-    + Drop unecessary cleaning of the plugins as upstream's build system cares
-      for this now.
-  * debian/watch:
-    + Update watch file for the 0.6 series.
-
- -- Sebastian Dröge <slomo at debian.org>  Sat, 14 Apr 2007 17:09:41 +0200
-
-tomboy (0.5.0-1) experimental; urgency=low
-
-  * New upstream release
-  * Added new plugins: Bugzilla, FixedWidth, NoteOfTheDay
-
- -- Dave Beckett <dajobe at debian.org>  Thu, 16 Nov 2006 13:58:37 -0800
-
-tomboy (0.4.1-2) unstable; urgency=low
-
-  * Added Build-Depends: on libdbus-glib-1-dev to get D-Bus remote
-    control enabled (Closes: #393484)
-  * Updated Build-Depends: for cli-common-dev to >= 0.4.4
-
- -- Dave Beckett <dajobe at debian.org>  Thu, 19 Oct 2006 00:02:29 -0700
-
-tomboy (0.4.1-1) unstable; urgency=low
-
-  * New upstream release
-  * Upstream sources now DFSG as last old icon removed.
-    - removed 01_image_name patch
-  * Added D-BUS API change patch 04_dbus0.9.patch. (Closes: #385382)
-  * Acknowledge NMU in 0.3.9+dfsg-2.1 for previous patch.
-  * Depend on libdbus-1-dev (>= 0.90), no longer use libdbus-cil
-  * Packaged new Sticky Notes import plugin
-
- -- Dave Beckett <dajobe at debian.org>  Sat, 23 Sep 2006 19:30:03 -0700
-
-tomboy (0.3.9+dfsg-2.1) unstable; urgency=high
-
-  * Non-maintainer upload.
-  * Add Patch for deprecated dbus functions (Closes: #385382) 
-
- -- Michael Ablassmeier <abi at debian.org>  Tue, 19 Sep 2006 09:11:38 +0200
-
-tomboy (0.3.9+dfsg-2) unstable; urgency=medium
-
-  * Added postint to rebuild broken scrollkeeper database using
-    patch to fix it from Loïc Minier - Thanks (Closes: #383201)
-  * Fixes RC bug, thus urgency medium.
-
- -- Dave Beckett <dajobe at debian.org>  Sun,  3 Sep 2006 09:48:52 -0700
-
-tomboy (0.3.9+dfsg-1) unstable; urgency=medium
-
-  * Provide DFSG version of sources
-  * Disable scrollkeeper from installing into /var (Closes: #382800)
-  
- -- Dave Beckett <dajobe at debian.org>  Sun, 13 Aug 2006 12:36:00 -0700
-
-tomboy (0.3.9-1) unstable; urgency=medium
-
-  * New upstream release
-    - Builds against GTK 2.0, removed patch 02_gtk-sharp2.patch
-    - Builds against dbus directly rather than using dbus-sharp.  Change 
-      from Build-Depends on libdbus-cil-1 to libdbus-glib-1-2
-    - Preference dialog modality fixed (Closes: #313295)
-    - Italic pasting fixed (Closes: #329476)
-    - Added StickyNoteImport plugin
-    - Uses gnome document tools. Add Build-Depends on gnome-doc-utils and
-      scrollkeeper
-  * Upstream application icon changed "due to legal restrictions"
-    - Remove the replacement third-party images we were using.
-    - Continue to remove one use of the old icon from the source tarball.
-    - Updated patch 01_image_name to remove the last use of the old icon
-    - Added XPM versions of the new icons
-  * Standards version 3.7.2 (no changes)
-  * Updated to latest Debian Mono Policy.  Build-Depend on cli-common-dev
-  * Build depend on libgmime2.2-cil replacing libgmime2.1-cil which was
-    removed from Debian yesterday fixing FTBFS on arm (Closes: #382653)
-  * Urgency medium due to FTBFS fix.
-
- -- Dave Beckett <dajobe at debian.org>  Sat, 12 Aug 2006 09:43:31 -0700
-
-tomboy (0.3.5-2) unstable; urgency=low
-
-  * Add dependencies to native library (Closes: #364778)
-  * Enable Evolution plugin (Closes: #364779)
-
- -- Dave Beckett <dajobe at debian.org>  Tue, 25 Apr 2006 20:59:25 -0700
-
-tomboy (0.3.5-1) unstable; urgency=low
-
-  * New upstream release (Closes: #352531)
-  * Require dbus 0.61-3 to get a non-broken assembly version (see bug #354798)
-  * Packaging updates from Ubuntu 0.3.5-0ubuntu1 thanks to Sebastian Dröge
-  * 02_Trie.cs_mcs119.patch deleted as merged into upstream.
-
- -- Dave Beckett <dajobe at debian.org>  Sat, 18 Mar 2006 19:47:02 -0800
-
-tomboy (0.3.5-0ubuntu1) dapper; urgency=low
-
-  * New upstream release
-  * 01_image_name.patch:
-    + Updated for new upstream version
-  * 02_gtk-sharp2.patch:
-    + Use Gtk#2 instead of Gtk#
-  * Tightened and adjusted Build-Depends
-  * Added ${misc:Depends} to Depends
-  * Updated debhelper compat version to 5
-
- -- Sebastian Dröge <slomo at ubuntu.com>  Fri, 24 Feb 2006 17:01:15 +0100
-
-tomboy (0.3.3-3) unstable; urgency=low
-
-  * Build against libdbus-1-cil (Closes: #338495)
-
- -- Dave Beckett <dajobe at debian.org>  Thu, 12 Jan 2006 19:41:41 -0800
-
-tomboy (0.3.3-2) unstable; urgency=low
-
-  * Added patch from CVS to fix Mono 1.1.9.x build (Closes: 337356)
-    -  02_Trie.cs_mcs119.patch from CVS
-
- -- Dave Beckett <dajobe at debian.org>  Thu,  3 Nov 2005 19:59:02 -0800
-
-tomboy (0.3.3-1) unstable; urgency=low
-
-  * New upstream release
-  * New ExportToHTML plugin
-  * Updated image name fixing patch 01_image_name.patch
-  * Removed Mono 1.1.8.x build patches merged upstream:
-    - 02_mono118_Trie.patch
-    - 03_mono118_AppletFactory.patch
-
- -- Dave Beckett <dajobe at debian.org>  Wed, 10 Aug 2005 19:33:28 +0100
-
-tomboy (0.3.2-9) unstable; urgency=low
-
-  * Removed obsolete Build-Depend: on mono-jit and mono-utils
-  * Updated debian/watch file to new location.
-  * Added 24x24 icon from same author as the other icons, cleaned up by
-    Gordon Ingram to help the toolbar icon look better (Closes: 316765)
-  * Rebuild for mono 1.1.8.1
-  * Applied patches from CVS to fix 1.1.8.x builds:
-    02_mono118_Trie.patch and 03_mono118_AppletFactory.patch
-  * Add MONO_SHARED_DIR to stop monodis core dumping when called
-    inside dh_clideps
-
- -- Dave Beckett <dajobe at debian.org>  Mon, 11 Jul 2005 17:13:26 +0100
-
-tomboy (0.3.2-8) unstable; urgency=low
-
-  * Added 16x16 and 32x32 pixmap xpm icons
-  * Added menu and tomboy.desktop linked to the icons
-
- -- Dave Beckett <dajobe at debian.org>  Tue, 14 Jun 2005 23:07:01 +0100
-
-tomboy (0.3.2-7) unstable; urgency=low
-
-  * Upload to unstable
-  * Depend on libdbus-cil 0.23.4-3 built with mono in unstable
-  * Remove dependency on mono-mint (Closes: 311956)
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 10 Jun 2005 16:22:59 +0100
-
-tomboy (0.3.2-6) experimental; urgency=low
-
-  * Merge with ubuntu up to 0.3.2-4ubuntu5:
-    - changed the uudecode line from update-config to post-patches in 
-      debian/rules
-    - not applying Tomboy/Trie.cs patch
-
- -- Dave Beckett <dajobe at debian.org>  Wed,  1 Jun 2005 20:13:48 +0100
-
-tomboy (0.3.2-5) experimental; urgency=low
-
-  * Rebuild package with source inside changes
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 27 May 2005 13:20:41 +0100
-
-tomboy (0.3.2-4) experimental; urgency=low
-
-  * Upload of tomboy to experimental (Closes: 272264)
-  * Require mono 1.1.6+
-  * Build-Depends on sharutils for uudecode
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 27 May 2005 13:09:47 +0100
-
-tomboy (0.3.2-3) experimental; urgency=low
-
-  * Standards-Version 3.6.1.0 and depend on newer debhelper for cdbs
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 15 Apr 2005 22:21:52 +0100
-
-tomboy (0.3.2-2) experimental; urgency=low
-
-  * Rebuild against mono 1.1 packages.
-  * Require cli-common
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 15 Apr 2005 22:04:15 +0100
-
-tomboy (0.3.2-1) experimental; urgency=low
-
-  * New upstream release
-
- -- Dave Beckett <dajobe at debian.org>  Sun, 10 Apr 2005 15:48:23 +0100
-
-tomboy (0.3.1-1) experimental; urgency=low
-
-  * Port of the packaging from Ubuntu to Debian
-  * Removed non-distributable image from orig.tar.gz and
-    added debian/README.Debian-source to explain this
-  * Added replacement image debian/tomboy.png.uu from Jacub Steiner
-  * Added patches/01_image_name.patch to rename mentions to the image
-
- -- Dave Beckett <dajobe at debian.org>  Sun, 10 Apr 2005 15:29:35 +0100
-
-tomboy (0.3.1-0ubuntu6) hoary; urgency=low
-
-  * Rebuilt against new libdbus-cil.
-
- -- Daniel Holbach <dh at mailempfang.de>  Wed, 16 Mar 2005 21:11:11 +0100
-
-tomboy (0.3.1-0ubuntu5) hoary; urgency=low
-
-  * Rebuild with current libs.
-
- -- Sebastien Bacher <seb128 at canonical.com>  Sat, 19 Feb 2005 14:57:09 +0100
-
-tomboy (0.3.1-0ubuntu4) hoary; urgency=low
-
-  * Er, libpanel-applet2-dev
-
- -- Matt Zimmerman <mdz at ubuntu.com>  Wed,  2 Feb 2005 20:49:44 -0800
-
-tomboy (0.3.1-0ubuntu3) hoary; urgency=low
-
-  * Build-Depend on libpanel-applet-dev, not libpanel-applet2-0
-
- -- Matt Zimmerman <mdz at ubuntu.com>  Wed,  2 Feb 2005 11:01:26 -0800
-
-tomboy (0.3.1-0ubuntu2) hoary; urgency=low
-
-  * debian/control
-    build-dep on libpanel-applet2-0 to fix FTBFS.
-
- -- Brandon Hale <brandon at smarterits.com>  Mon, 31 Jan 2005 23:52:04 -0500
-
-tomboy (0.3.1-0ubuntu1) hoary; urgency=low
-
-  * New upstream release
-    - Made the move to Gnome Panel applet. (TrayIcon mode is still supported).
-    - New plugin system, so anyone can customize their Tomboy notes.
-    - A Note printing plugin
-    - A new preferences dialog
-  * debian/control
-    - Add libdbus-cil to build-deps
-
- -- Brandon Hale <brandon at smarterits.com>  Thu, 27 Jan 2005 18:35:41 -0500
-
-tomboy (0.2.2-1ubuntu1) hoary; urgency=low
-
-  * Update Build-Dep and fix FTBFS.
-
- -- Fabio M. Di Nitto <fabbione at fabbione.net>  Mon, 22 Nov 2004 13:10:03 +0100
-
-tomboy (0.2.2-1) hoary; urgency=low
-
-  * New upstream release
-
- -- Brandon Hale <brandon at localhost.localdomain>  Sun, 21 Nov 2004 15:35:03 -0500
-
-tomboy (0.2.0-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Brandon Hale <brandon at smarterits.com>  Mon, 11 Oct 2004 09:31:35 -0400
-
-tomboy (0.1.2-2) unstable; urgency=low
-
-  * Fix up build-depends in debian/control, use ${net:Depends} and dh_netdeps
-  as well.
-
- -- Brandon Hale <brandon at smarterits.com>  Thu,  7 Oct 2004 11:14:29 -0400
-
-tomboy (0.1.2-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Brandon Hale <brandon.hale at gmail.com>  Sat, 25 Sep 2004 08:59:36 -0400
-
-tomboy (0.1.1-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Brandon Hale <brandon.hale at gmail.com>  Mon, 20 Sep 2004 20:08:46 -0400
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 80fa921..0000000
--- a/debian/control
+++ /dev/null
@@ -1,44 +0,0 @@
-Source: tomboy
-Section: gnome
-Priority: optional
-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>, Iain Lane <laney at debian.org>
-Build-Depends: debhelper (>= 8.1.0),
-               dh-autoreconf,
-               gnome-common,
-               intltool,
-               pngquant,
-               mono-devel (>= 2.4.3),
-               libgtk2.0-cil-dev (>= 2.10.4),
-               libgconf2-dev,
-               libgconf2.0-cil-dev (>= 2.24),
-               libgtkspell-dev (>= 2.0.9),
-               cli-common-dev (>= 0.5.7),
-               imagemagick,
-               libgtk2.0-dev (>= 2.14.0),
-               libatk1.0-dev (>= 1.2.4),
-               libgmime2.6-cil-dev,
-               gnome-doc-utils (>= 0.3.2),
-               scrollkeeper,
-               libdbus1.0-cil-dev (>= 0.4),
-               libdbus-glib1.0-cil-dev (>= 0.3),
-               libmono-addins-cil-dev (>= 0.3),
-               libmono-addins-gui-cil-dev (>= 0.3),
-               libproxy-dev
-Standards-Version: 3.9.4
-Homepage: http://www.gnome.org/projects/tomboy/
-Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/tomboy.git
-Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/tomboy.git
-
-Package: tomboy
-Architecture: any
-Depends: ${cli:Depends}, 
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: evolution,
-          tasque
-Description: desktop note taking program using Wiki style links
- Tomboy is a desktop note-taking application which is simple and easy to
- use. It lets you organise your notes intelligently by allowing you to
- easily link ideas together with Wiki style interconnects.
-
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 2cbc20d..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,94 +0,0 @@
-This package was debianized by Brandon Hale <brandon.hale at gmail.com> on
-Mon, 20 Sep 2004 20:08:46 -0400.
-
-It was downloaded from http://www.beatniksoftware.com/tomboy/
-
-Upstream Author: Alex Graveley <alex at beatniksoftware.com>
-	Sandy Armstrong <sanfordarmstrong at gmail.com>
-	Boyd Timothy <btimothy at gmail.com>
-
-Copyright (C) 2004-2008 Alex Graveley <alex at beatniksoftware.com>
-	(C) 2006-2009 Sandy Armstrong <sanfordarmstrong at gmail.com>
-	(C) 2006-2008 Boyd Timothy <btimothy at gmail.com>
-
-Tomboy is licensed under the LGPL V2.1, see COPYING for more details.
-On Debian systems, the complete text of the GNU Lesser General Public
-License V2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
-
----
-
-tomboykeybinder.{c,h} and tomboyutil.{c,h} are MIT/X11 (BSD like)
-
-Copyright:
-
-	 Copyright (C) 2008 Alex Graveley
-
-License:
-
-	Permission is hereby granted, free of charge, to any person obtaining 
-	a copy of this software and associated documentation files (the 
-	"Software"), to deal in the Software without restriction, including 
-	without limitation the rights to use, copy, modify, merge, publish, 
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions: 
-  
-	The above copyright notice and this permission notice shall be 
-	included in all copies or substantial portions of the Software. 
-  
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-	IABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-    F CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-
----
-
-help/* are under the GFDL version 1.1+
-
-Copyright:
-	Alex Graveley <alex at beatniksoftware.com> 
-	Boyd Timothy <btimothy at gmail.com> 
-	Brent Smith <gnome at nextreality.net> 
-	Christophe Bliard <christophe.bliard at trux.info> 
-	Claude Paroz <claude at 2xlibre.net> 
-	Daniel Nylander <po at danielnylander.se> 
-	David Lodge <dave at cirt.net> 
-	Francisco Javier F. Serrador
-	Inaki Larranaga Murgoitio <dooteo at euskalgnu.org>
-	Jochen Skulj <jochen at jochenskulj.de> 
-	Jonh Wendell <jwendell at gnome.org> 
-	Jorge Gonzalez <jorgegonz at svn.gnome.org> 
-	Luca Ferretti <elle.uca at libero.it> 
-	Maslov <conma at yandex.ru>  
-	Maxim Dziumanenko <dziumanenko at gmail.com> 
-	Milo Casagrande <milo at ubuntu.com> 
-	Nickolay V. Shmyrev <nshmyrev at yandex.ru>
-	Philip Withnall <philip at tecnocode.co.uk> 
-	Sandy Armstrong <sanfordarmstrong at gmail.com> 
-	Simos Xenitellis <simos at gnome.org> 
-	Vasiliy Faronov <qvvx at yandex.ru> 
-	Wadim Dziedzic <wadimd at svn.gnome.org> 
-	Yannig Marchegay <yannig at marchegay.org> 
-
-License:
-    This program is free software: you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation, either
-    version 1.1 of the License, or (at your option) any later version.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-The tomboy-16.xpm.uu, tomboy-32.xpm.uu, tomboy.png.uu and
-tomboy-24.png.uu files are uuencodings of icons in PNG format that are:
-
-  Copyright Jakub Steiner, Copyright Novell
-  from http://jimmac.musichall.cz/i.php?i=tomboy
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index c1da623..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/pixmaps
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index c499001..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-debian-branch = experimental
-upstream-branch = upstream-experimental
-compression = xz
diff --git a/debian/patches/01_dllmaps.patch b/debian/patches/01_dllmaps.patch
deleted file mode 100644
index b832db4..0000000
--- a/debian/patches/01_dllmaps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Update libtomboy dllmap to use absolute path
-Index: tomboy.git/Tomboy/Tomboy.exe.config.in
-===================================================================
---- tomboy.git.orig/Tomboy/Tomboy.exe.config.in	2011-04-12 19:37:20.634328063 +0100
-+++ tomboy.git/Tomboy/Tomboy.exe.config.in	2011-04-12 19:37:48.253245653 +0100
-@@ -1,7 +1,7 @@
- <configuration>
--  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
-+  <dllmap dll="glib-2.0.dll" target="libglib-2.0.so.0"/>
-   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>	
-   <dllmap dll="libgtkspell" target="libgtkspell.so.0"/>
--  <dllmap dll="libtomboy" target="libtomboy.so"/>
-+  <dllmap dll="libtomboy" target="/usr/lib/tomboy/libtomboy.so"/>
-   <dllmap dll="panel-applet-2" target="libpanel-applet-2.so.0"/>
- </configuration>
diff --git a/debian/patches/20_remove_pcfile_requires b/debian/patches/20_remove_pcfile_requires
deleted file mode 100644
index 289e565..0000000
--- a/debian/patches/20_remove_pcfile_requires
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove unnecessary Requires: from gtk-sharp in tomboy-addins pcfile
-Forwarded: not-needed
-Origin: vendor
-Author: Iain Lane <laney at ubuntu.com>
-
-Index: tomboy.git/data/tomboy-addins.pc.in
-===================================================================
---- tomboy.git.orig/data/tomboy-addins.pc.in	2010-01-09 14:21:26.260959442 +0000
-+++ tomboy.git/data/tomboy-addins.pc.in	2010-01-09 14:21:30.890958275 +0000
-@@ -5,6 +5,5 @@
- 
- Name: Tomboy Addin Library
- Description: Library providing the interfaces for Tomboy addins
--Requires: gtk-sharp-2.0
- Version: @VERSION@
- Libs: -r:${libdir}/tomboy/Tomboy.exe
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index de69945..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01_dllmaps.patch
-20_remove_pcfile_requires
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 1332826..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/make -f
-
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
-MAKEFILE = $(firstword $(MAKEFILE_LIST))
-DEBIAN_DIR = $(dir $(MAKEFILE))
-DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
-DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)   
-VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
-
-override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf /usr/bin/gnome-autogen.sh
-
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		--disable-scrollkeeper \
-		--disable-update-mimedb \
-		--disable-panel-applet \
-		--disable-schemas-install \
-		--disable-tests \
-		LDFLAGS="$(LDFLAGS)" \
-		GMCS=/usr/bin/mono-csc
-
-override_dh_auto_install:
-	dh_auto_install -- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	convert $(CURDIR)/data/icons/hicolor_apps_16x16_tomboy.png $(CURDIR)/debian/tomboy/usr/share/pixmaps/tomboy-16.xpm
-	convert $(CURDIR)/data/icons/hicolor_apps_32x32_tomboy.png $(CURDIR)/debian/tomboy/usr/share/pixmaps/tomboy-32.xpm
-	rm -rf debian/tomboy/usr/lib/tomboy/*.la
-	# crush it good
-	find $(CURDIR)/debian/tomboy/usr/share/gnome/help/tomboy -type f -name "*.png" -exec sh -c 'pngquant 256 < {} > {}.crushed; mv {}.crushed {}' \;
-
-# disable tests
-override_dh_auto_test:
-
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
-get-orig-source:
-	uscan \
-		--package $(DEB_SOURCE_NAME) \
-		--watchfile $(DEBIAN_DIR)/watch \
-		--upstream-version $(VERSION) \
-		--download-version $(VERSION) \
-		--destdir . \
-		--force-download \
-		--rename
-
-%:
-	dh $@ --with autoreconf,cli
-
-.PHONY: get-orig-source
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches
diff --git a/debian/tomboy.docs b/debian/tomboy.docs
deleted file mode 100644
index 9eafbe1..0000000
--- a/debian/tomboy.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-NEWS
diff --git a/debian/tomboy.install b/debian/tomboy.install
deleted file mode 100644
index acfb4f5..0000000
--- a/debian/tomboy.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/WebSyncServiceAddin.dll.config /usr/lib/tomboy/addins/
diff --git a/debian/tomboy.menu b/debian/tomboy.menu
deleted file mode 100644
index d3ab500..0000000
--- a/debian/tomboy.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(tomboy):needs="X11" section="Applications/Data Management" \
-  title="Tomboy" command="/usr/bin/tomboy" \
-  longtitle="Tomboy notetaker" \
-  description="Take notes on the desktop" \
-  icon16x16="/usr/share/pixmaps/tomboy-16.xpm" \
-  icon32x32="/usr/share/pixmaps/tomboy-32.xpm"
diff --git a/debian/tomboy.postinst b/debian/tomboy.postinst
deleted file mode 100644
index 8ed2373..0000000
--- a/debian/tomboy.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-# version 0.3.9-1 started shipping /var/lib/scrollkeeper erroneously, hence
-# the database was overwritten and needs a full rebuild
-#
-# this fix was added in version 0.3.9+dfsg-2
-if [ "$1" = "configure" ] && dpkg --compare-versions "$2" ge "0.3.9-1" && dpkg --compare-versions "$2" lt "0.3.9+dfsg-2" && which scrollkeeper-rebuilddb >/dev/null 2>&1; then
-    echo "Upgrade from broken Tomboy version detected, running scrollkeeper-rebuilddb..."
-    scrollkeeper-rebuilddb -q
-fi
-
-#DEBHELPER#
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index a86bd79..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,4 +0,0 @@
-# watch file for tomboy
-version=3
-http://ftp.gnome.org/pub/GNOME/sources/tomboy/([\d\.]+)/ \
-        tomboy-(.*)\.tar\.xz
diff --git a/help/C/addins-desktop-bugzilla.page b/help/C/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..4c8b26f
--- /dev/null
+++ b/help/C/addins-desktop-bugzilla.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-desktop-bugzilla">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/C/addins-desktop-printing.page b/help/C/addins-desktop-printing.page
new file mode 100644
index 0000000..17aa39d
--- /dev/null
+++ b/help/C/addins-desktop-printing.page
@@ -0,0 +1,41 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-desktop-printing">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/C/addins-desktop.page b/help/C/addins-desktop.page
deleted file mode 100644
index d7c4068..0000000
--- a/help/C/addins-desktop.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide" style="task"
-      id="addins-desktop">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/C/addins-formatting-fixed-width.page b/help/C/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..59ed292
--- /dev/null
+++ b/help/C/addins-formatting-fixed-width.page
@@ -0,0 +1,41 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-formatting-fixed-width">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/C/addins-formatting-underline.page b/help/C/addins-formatting-underline.page
new file mode 100644
index 0000000..09d23c5
--- /dev/null
+++ b/help/C/addins-formatting-underline.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-formatting-underline">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/C/addins-formatting.page b/help/C/addins-formatting.page
deleted file mode 100644
index 923953f..0000000
--- a/help/C/addins-formatting.page
+++ /dev/null
@@ -1,40 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide" style="task"
-      id="addins-formatting">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/C/addins-preferences.page b/help/C/addins-preferences.page
new file mode 100644
index 0000000..498d47e
--- /dev/null
+++ b/help/C/addins-preferences.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="addins-preferences">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
\ No newline at end of file
diff --git a/help/C/addins-sync-local.page b/help/C/addins-sync-local.page
new file mode 100644
index 0000000..d474267
--- /dev/null
+++ b/help/C/addins-sync-local.page
@@ -0,0 +1,21 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-sync-local">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/C/addins-sync-ssh.page b/help/C/addins-sync-ssh.page
new file mode 100644
index 0000000..b14789a
--- /dev/null
+++ b/help/C/addins-sync-ssh.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-sync-ssh">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/C/addins-sync-webdav.page b/help/C/addins-sync-webdav.page
new file mode 100644
index 0000000..cbbd7b2
--- /dev/null
+++ b/help/C/addins-sync-webdav.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-sync-webdav">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/C/addins-sync-webservice.page b/help/C/addins-sync-webservice.page
new file mode 100644
index 0000000..f8efaf1
--- /dev/null
+++ b/help/C/addins-sync-webservice.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-sync-webservice">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/C/addins-sync.page b/help/C/addins-sync.page
deleted file mode 100644
index be730b1..0000000
--- a/help/C/addins-sync.page
+++ /dev/null
@@ -1,60 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide" style="task"
-      id="sync-addins-sync">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/C/addins-tools-backlinks.page b/help/C/addins-tools-backlinks.page
new file mode 100644
index 0000000..091acb7
--- /dev/null
+++ b/help/C/addins-tools-backlinks.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-tools-backlinks">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/C/addins-tools-html-export.page b/help/C/addins-tools-html-export.page
new file mode 100644
index 0000000..ffcf710
--- /dev/null
+++ b/help/C/addins-tools-html-export.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-tools-html-export">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Export to HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/C/addins-tools-note-of-day.page b/help/C/addins-tools-note-of-day.page
new file mode 100644
index 0000000..3648636
--- /dev/null
+++ b/help/C/addins-tools-note-of-day.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-tools">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Note of the Day</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/C/addins-tools-timestamp.page b/help/C/addins-tools-timestamp.page
new file mode 100644
index 0000000..cbc2e99
--- /dev/null
+++ b/help/C/addins-tools-timestamp.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task"
+      id="addins-tools-timestamp">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/C/addins-tools.page b/help/C/addins-tools.page
deleted file mode 100644
index 1926f88..0000000
--- a/help/C/addins-tools.page
+++ /dev/null
@@ -1,73 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide" style="task"
-      id="addins-tools">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Export to HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Note of the Day</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/C/addins.page b/help/C/addins.page
index e69484b..a68748d 100644
--- a/help/C/addins.page
+++ b/help/C/addins.page
@@ -6,28 +6,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/C/delete-notes.page b/help/C/delete-notes.page
index 904c722..9be5f75 100644
--- a/help/C/delete-notes.page
+++ b/help/C/delete-notes.page
@@ -9,11 +9,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME Documentation Project</name>
       <years>2010</years>
@@ -21,15 +24,25 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 1e39890..f184c76 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -34,8 +34,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/C/pin-notes.page b/help/C/pin-notes.page
new file mode 100644
index 0000000..231fa37
--- /dev/null
+++ b/help/C/pin-notes.page
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:e="http://projectmallard.org/experimental/"
+      type="topic" style="task"
+      id="pin-notes">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/C/sync-setup.page b/help/C/sync-setup.page
index 6b0a15f..6b5fb8c 100644
--- a/help/C/sync-setup.page
+++ b/help/C/sync-setup.page
@@ -30,8 +30,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -68,7 +68,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -124,7 +124,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/C/sync.page b/help/C/sync.page
index ebee723..cd849f3 100644
--- a/help/C/sync.page
+++ b/help/C/sync.page
@@ -26,7 +26,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -45,13 +45,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict" /> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -64,8 +64,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/C/whatsnew.page b/help/C/whatsnew.page
index b8c3733..9f05ba7 100644
--- a/help/C/whatsnew.page
+++ b/help/C/whatsnew.page
@@ -34,8 +34,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/Makefile.am b/help/Makefile.am
index 813ee1b..84581d4 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -25,23 +25,34 @@ DOC_FIGURES = \
 	figures/tomboy-tools.png
 
 DOC_PAGES = \
-	addins-desktop.page \
-	addins-formatting.page \
+	addins-desktop-bugzilla.page \
+	addins-desktop-printing.page \
+	addins-formatting-fixed-width.page \
+	addins-formatting-underline.page \
+	addins-preferences.page \
+	addins-sync-local.page \
+	addins-sync-ssh.page \
+	addins-sync-webdav.page \
+	addins-sync-webservice.page \
+	addins-tools-backlinks.page \
+	addins-tools-html-export.page \
+	addins-tools-note-of-day.page \
+	addins-tools-timestamp.page \
 	addins.page \
-	addins-sync.page \
-	addins-tools.page \
-	create-notebook.page \
 	create-note.page \
+	create-notebook.page \
 	delete-notes.page \
 	edit-note.page \
 	hotkeys.page \
 	index.page \
 	introduction.page \
+	legal.xml \
 	note-edit-prefs.page \
+	pin-notes.page \
 	prefs.page \
 	search.page \
-	sync.page \
 	sync-setup.page \
+	sync.page \
 	whatsnew.page
 
 DOC_LINGUAS = ca cs de el en_GB es eu fr gl hu it lt lv oc pl pt_BR ru sl sv uk vi zh_CN
diff --git a/help/Makefile.in b/help/Makefile.in
index e16a8db..9867e46 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -38,23 +38,51 @@
 
 ################################################################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -73,9 +101,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs \
-	ChangeLog
+DIST_COMMON = $(top_srcdir)/gnome-doc-utils.make $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs ChangeLog
 subdir = help
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -85,6 +112,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -92,6 +131,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -428,23 +468,34 @@ DOC_FIGURES = \
 	figures/tomboy-tools.png
 
 DOC_PAGES = \
-	addins-desktop.page \
-	addins-formatting.page \
+	addins-desktop-bugzilla.page \
+	addins-desktop-printing.page \
+	addins-formatting-fixed-width.page \
+	addins-formatting-underline.page \
+	addins-preferences.page \
+	addins-sync-local.page \
+	addins-sync-ssh.page \
+	addins-sync-webdav.page \
+	addins-sync-webservice.page \
+	addins-tools-backlinks.page \
+	addins-tools-html-export.page \
+	addins-tools-note-of-day.page \
+	addins-tools-timestamp.page \
 	addins.page \
-	addins-sync.page \
-	addins-tools.page \
-	create-notebook.page \
 	create-note.page \
+	create-notebook.page \
 	delete-notes.page \
 	edit-note.page \
 	hotkeys.page \
 	index.page \
 	introduction.page \
+	legal.xml \
 	note-edit-prefs.page \
+	pin-notes.page \
 	prefs.page \
 	search.page \
-	sync.page \
 	sync-setup.page \
+	sync.page \
 	whatsnew.page
 
 DOC_LINGUAS = ca cs de el en_GB es eu fr gl hu it lt lv oc pl pt_BR ru sl sv uk vi zh_CN
@@ -488,11 +539,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -635,17 +684,18 @@ uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local dist-hook distclean distclean-generic \
-	distclean-libtool distclean-local distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic maintainer-clean-local mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	clean-local cscopelist-am ctags-am dist-hook distclean \
+	distclean-generic distclean-libtool distclean-local distdir \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-local
 
 
 DOC_H_FILE ?=
diff --git a/help/ca/addins-desktop-bugzilla.page b/help/ca/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..6658a4e
--- /dev/null
+++ b/help/ca/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Enllaços de Bugzilla</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/ca/addins-desktop-printing.page b/help/ca/addins-desktop-printing.page
new file mode 100644
index 0000000..cd69b78
--- /dev/null
+++ b/help/ca/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Capacitat d'impressió</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/ca/addins-desktop.page b/help/ca/addins-desktop.page
deleted file mode 100644
index 399a6b3..0000000
--- a/help/ca/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="ca">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Connectors que s'integren amb d'altres aplicacions i llocs web.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Complements d'integració amb l'escriptori</title>
-
-	<p>Els complements d'integració amb l'escriptori interactuen entre el Tomboy i altres aplicacions o llocs web.</p>
-
-<section id="bugzilla">
-  <title>Enllaços de Bugzilla</title>
-  <p>El complement enllaços de Bugzilla us permet arrossegar un URL de Bugzilla des del navegador al Tomboy. Després d'arrossegar l'enllaç a una nota, el Tomboy us mostrarà el número de l'error com un enllaç actiu al costat d'una icona d'error per mostrar-vos que és un enllaç de Bugzilla. Si feu clic a l'enllaç en una nota del Tomboy, s'obrirà la pàgina de Bugzilla en una finestra del navegador.</p>
-</section>
-
-<section id="evolution">
-  <title>Integració del correu electrònic de l'Evolution</title>
-  <p>El connector d'integració del correu electrònic de l'Evolution permet deixar anar un correu electrònic de l'Evolution a una nota del Tomboy. Aquesta nota mostrarà una icona amb un sobre i a l'assumpte de la nota es mostrarà com un enllaç. Si feu clic en aquest enllaç obrireu el correu electrònic a l'Evolution.</p>
-</section>
-
-<section id="printing">
-  <title>Capacitat d'impressió</title>
-  <p>Aquest complement ja ve activat per defecte i us permet imprimir les notes. Si inhabiliteu aquest complement ja no podreu imprimir les notes.</p>
-</section>
-
-
- </page>
diff --git a/help/ca/addins-formatting-fixed-width.page b/help/ca/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..96472de
--- /dev/null
+++ b/help/ca/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/ca/addins-formatting-underline.page b/help/ca/addins-formatting-underline.page
new file mode 100644
index 0000000..4985e6e
--- /dev/null
+++ b/help/ca/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/ca/addins-formatting.page b/help/ca/addins-formatting.page
deleted file mode 100644
index 104d5ed..0000000
--- a/help/ca/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="ca">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Connectors que afegeixen formatació addicional a les notes.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Complements de formatació</title>
-
-<section id="fixedwidth">
-  <title>Complement d'amplada fixa</title>
-  <p>El complement d'amplada fixa converteix el text a una amplada fixa a la nota del Tomboy. Aquest complement està desactivat per defecte. Per activar-lo, premeu el botó <gui>Habilita</gui>.</p>
-</section>
-
-<section id="underline">
-  <title>Complement de subratllat</title>
-  <p>El complement de subratllat permet subratllar un text específic en una nota si feu clic a la icona <gui>Text</gui> a la barra de tasques d'una nota. Aquest complement està desactivat per defecte. Per activar-lo premeu el botó <gui>Habilita</gui>. Per subratllar el text, realceu-lo i premeu la icona <gui>Text</gui> de la barra de tasques de la nota i trieu <gui>Subratllat</gui> o premeu <keyseq><key>Ctrl + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/ca/addins-preferences.page b/help/ca/addins-preferences.page
new file mode 100644
index 0000000..444f369
--- /dev/null
+++ b/help/ca/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/ca/addins-sync-local.page b/help/ca/addins-sync-local.page
new file mode 100644
index 0000000..85511e8
--- /dev/null
+++ b/help/ca/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servei de sincronització de la carpeta local</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/ca/addins-sync-ssh.page b/help/ca/addins-sync-ssh.page
new file mode 100644
index 0000000..ea348e1
--- /dev/null
+++ b/help/ca/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servei de sincronització SSH</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/ca/addins-sync-webdav.page b/help/ca/addins-sync-webdav.page
new file mode 100644
index 0000000..251963c
--- /dev/null
+++ b/help/ca/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servei de sincronització WebDAV</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/ca/addins-sync-webservice.page b/help/ca/addins-sync-webservice.page
new file mode 100644
index 0000000..43fdab6
--- /dev/null
+++ b/help/ca/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servei de sincronització web</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/ca/addins-sync.page b/help/ca/addins-sync.page
deleted file mode 100644
index 84dde40..0000000
--- a/help/ca/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="ca">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Activació de formes addicionals per sincronitzar les notes amb d'altres dispositius.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Complements de sincronització</title>
-
-	<p>Amb els complements de sincronització podeu triar mètodes i llocs diferents per sincronitzar les notes del Tomboy. Per tenir més informació sobre la configuració de la sincronització, visiteu la pàgina d'ajuda <link xref="sync-notes"/>.</p>
-
-
-<section id="local">
-  <title>Servei de sincronització de la carpeta local</title>
-  <p>El servei de sincronització de la carpeta local està activat per defecte i permet al Tomboy sincronitzar les notes amb d'altres carpetes de l'ordinador, cosa que és útil per crear còpies de seguretat de les notes.</p>
-</section>
-
-<section id="ssh">
-  <title>Servei de sincronització SSH</title>
-  <p>El servei de sincronització SSH permet sincronitzar les notes amb un altre ordinador mitjançant el protocol SSH. Aquest connector està desactivat per defecte. Perquè funcioni heu instal·lar el paquet <em>sshfs</em> de la vostra distribució de Linux.</p>
-</section>
-
-<section id="webdav">
-  <title>Servei de sincronització WebDAV</title>
-  <p>El complement de servei de sincronització WebDAV ja ve activat per defecte i permet sincronitzar les notes amb un servidor remot WebDAV. Heu d'instal·lar el paquet <em>wdfs FUSE file system</em> de la vostra distribució de Linux perquè funcioni.</p>
-</section>
-
-<section id="webservice">
-  <title>Servei de sincronització web</title>
-  <p>El complement de servei de sincronització web permet sincronitzar les notes amb un servidor remot o un servei web com el Tomboy Online. Mentre s'estava escrivint aquest manual, el servei del Tomboy Online encara no funcionava.</p>
-</section>
-
- </page>
diff --git a/help/ca/addins-tools-backlinks.page b/help/ca/addins-tools-backlinks.page
new file mode 100644
index 0000000..416b44c
--- /dev/null
+++ b/help/ca/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Retroenllaços</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/ca/addins-tools-html-export.page b/help/ca/addins-tools-html-export.page
new file mode 100644
index 0000000..a329116
--- /dev/null
+++ b/help/ca/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Exporta a HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/ca/addins-tools-note-of-day.page b/help/ca/addins-tools-note-of-day.page
new file mode 100644
index 0000000..ef52b41
--- /dev/null
+++ b/help/ca/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Nota del dia</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/ca/addins-tools-timestamp.page b/help/ca/addins-tools-timestamp.page
new file mode 100644
index 0000000..48b8f3e
--- /dev/null
+++ b/help/ca/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Inserció de marca horària</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/ca/addins-tools.page b/help/ca/addins-tools.page
deleted file mode 100644
index edcd4b1..0000000
--- a/help/ca/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="ca">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Activació de les funcions addicionals de les notes.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Els complements del Tomboy</title>
-
-	<p>Els complements afegeixen funcions addicionals a les notes del Tomboy.</p>
-
-  <section id="backlinks">
-    <title>Retroenllaços</title>
-	<p>El complement <gui>Retroenllaços</gui> ja ve activat per defecte i permet comprovar quines notes estan enllaçades amb la nota que esteu visualitzant.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Exporta a HTML</title>
-  <p>El complement <gui>Exporta a HTML</gui> ja ve activat per defecte i exporta una nota a HTML.</p>
-	<p>Per exportar una nota a HTML premeu la icona <gui>Eines</gui> i trieu <gui>Exporta a HTML</gui>. A continuació se us mostrarà un diàleg per desar la nota. Trieu la carpeta on voleu desar la nota i canvieu el nom de la nota per al nou fitxer html si voleu que sigui diferent al nom de la nota. Llavors la nota es desarà com un fitxer HTML i es mostrarà al navegador.</p>
-</section>
-
-<section id="timestamp">
-  <title>Inserció de marca horària</title>
-  <p>El complement <gui>Inserció de marca horària</gui> està desactivat per defecte. Per activar-lo trieu el complement <gui>Inserció de marca horària</gui> i després premeu <gui>Habilita</gui> a les preferències del Tomboy.</p>
-	<p>Per afegir una marca horària a les notes premeu la icona <gui>Eines</gui> a la barra de tasques de la nota i trieu <gui>Insereix marca horària</gui> o premeu <gui>Ctrl + D</gui>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Nota del dia</title>
-  <p>El complement <gui>Nota del dia</gui> està desactivat per defecte. Per activar-lo trieu el complement <gui>Nota del dia</gui> i després premeu <gui>Habilita</gui> a les preferències del Tomboy.</p>
-	<p>El complement <gui>Nota del dia</gui> crearà diàriament una nota nova amb un títol com, per exemple, <em>Avui:dijous, 21 gener 2010</em>. La nota també afegirà automàticament les línies de <em>Tasques</em> i <em>Cites</em>.</p>
-</section>
-
-<section id="watcher">
-  <title>Seguiment de la carpeta de notes</title>
-  <p>El complement de seguiment de la carpeta de notes fa un seguiment de la carpeta on es desen les notes. Si el complement detecta canvis a les notes, els aplicarà i aquests es mostraran a les notes. Aquest complement l'utilitzen habitualment els serveis de sincronització de tercers com el Dropbox. Aquest manual d'ajuda no cobreix la configuració de serveis de sincronització de tercers.</p>
-</section>
-
- </page>
diff --git a/help/ca/addins.page b/help/ca/addins.page
index a890f37..ce0782c 100644
--- a/help/ca/addins.page
+++ b/help/ca/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Incorporació de funcions addicionals al Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Complements del Tomboy</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Complements del Tomboy</title>
-    </info>
-    <title>Gestió dels complements del Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/ca/delete-notes.page b/help/ca/delete-notes.page
index 0daaf8a..ebce6be 100644
--- a/help/ca/delete-notes.page
+++ b/help/ca/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Supressió d'una nota del Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME Documentation Project</name>
       <years>2010</years>
@@ -19,13 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Supressió d'una nota</title>    
-  
-  <p>Per suprimir una nota premeu la icona <gui>Suprimeix aquesta nota</gui> de la barra de tasques de la nota que desitgeu suprimir.</p>
-  
-<note style="warning">
-	<p>La supressió d'una nota és permanent. La nota no es pot recuperar quan s'ha suprimit.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Supressió d'una nota</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/ca/introduction.page b/help/ca/introduction.page
index cfa26fc..6b68935 100644
--- a/help/ca/introduction.page
+++ b/help/ca/introduction.page
@@ -22,7 +22,10 @@
 
   <p>El <app>Tomboy</app> és una aplicació per prendre notes a l'escriptori GNOME, al Microsoft Windows i al Mac OS X. El <app>Tomboy</app> és fàcil d'utilitzar i us ajudarà a organitzar les vostres idees i la informació amb què treballeu cada dia.</p>
   <p>El <app>Tomboy</app> inclou funcions que us ajudaran a organitzar la informació i a recordar-la millor, també permet enllaçar les vostres notes entre elles per cercar la informació i ordenar-la més fàcilment. Facilita l'organització de les notes en blocs de notes per agrupar-les amb més comoditat.</p>
-  <p>També podeu sincronitzar les notes entre diversos ordinadors, cosa que us facilitarà prendre notes des de qualsevol lloc.</p>
+  <p>
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
+  </p>
 
   <figure>
     <title>Finestra del <gui>Notes del Tomboy</gui></title>
diff --git a/help/ca/pin-notes.page b/help/ca/pin-notes.page
new file mode 100644
index 0000000..b1e2d72
--- /dev/null
+++ b/help/ca/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="ca">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/ca/sync-setup.page b/help/ca/sync-setup.page
index a95dd59..1542a00 100644
--- a/help/ca/sync-setup.page
+++ b/help/ca/sync-setup.page
@@ -24,7 +24,14 @@
 	
 	<p>El <app>Tomboy</app> pot sincronitzar les notes entre diversos ordinadors. Això permet tenir una còpia de seguretat de les notes en un altre ordinador o bé compartir-les entre ordinadors per així tenir-les sempre disponibles.</p>
 	
-	<p>Per habilitar la sincronització obriu les <gui>Preferències del Tomboy</gui> fent clic amb el botó secundari a la icona del Tomboy al quadre, a la barra de tasques o al llançador d'aplicacions, trieu <gui>Preferències</gui> i després seleccioneu la pestanya <gui>Sincronització</gui>.També podeu obrir les <gui>Preferències del Tomboy</gui> des del diàleg <gui>Cerca totes les notes</gui>: <guiseq><gui>Edita</gui><gui>Preferències</gui></guiseq>.</p>
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </section>
 
@@ -42,7 +49,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -80,7 +87,17 @@
 	
 	<p>És recomanable utilitzar un tercer ordinador o servidor com a ordinador remot per desar les notes sincronitzades que s'han de sincronitzar entre diversos ordinadors.</p>
 
-	<p>Obriu l'aplicació <app>Contrasenyes i claus</app> des d'<guiseq><gui>Aplicacions</gui><gui>Accessoris</gui><gui>Contrasenyes i claus</gui></guiseq>. Obriu l'aplicació des del menú <guiseq><gui>Remot</gui><gui>Configura la clau per a l'intèrpret d'ordres</gui></guiseq> i introduïu el nom del domini i l'adreça IP de l'ordinador amb què voleu sincronitzar el vostre ordinador al camp <gui>Nom de l'ordinador</gui>. Introduïu el nom d'usuari a l'ordinador remot a <app>Nom d'usuari:</app> i [...]
+	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
+	<guiseq><gui>Applications</gui><gui>Accessories</gui>
+	<gui>Passwords and Encryption Keys</gui></guiseq>.  
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
+	</p>
 	
 	<p>Al Tomboy, trieu <gui>SSH</gui> a la llista desplegable <gui>Servei</gui>. Empleneu la informació de la connexió del servidor i llavors feu clic al botó <gui>Desa</gui>. Encara que sigui opcional, el <gui>Camí de la carpeta</gui> ha d'apuntar a una carpeta buida. Així el Tomboy estarà preparat per sincronitzar les notes.</p>
 
diff --git a/help/ca/sync.page b/help/ca/sync.page
index b22a109..89f3951 100644
--- a/help/ca/sync.page
+++ b/help/ca/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Sincronització manual de les notes</title>
 	
-	<p>Podeu sincronitzar les notes de tres maneres:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>Des de qualsevol nota feu clic a la icona <gui>Eines</gui> i trieu <gui>Sincronitza les notes</gui>.</p></item>
@@ -38,13 +38,26 @@
  
  	<title>Sincronització automàtica de les notes</title>
  	
- 	<p>El Tomboy pot sincronitzar automàticament les notes en un segon pla. És recomanable que configureu com voleu gestionar els conflictes de les notes abans d'habilitar la sincronització automàtica. Trobareu més informació sobre la gestió de conflictes de notes a la pàgina <link xref="sync-setup#conflict"/>.</p>
- 	
- 	<p>Per habilitar la sincronització obriu les <gui>Preferències del Tomboy</gui> fent clic amb el botó secundari a la icona del Tomboy al quadre, a la barra de tasques o al llançador d'aplicacions, trieu <gui>Preferències</gui> i després seleccioneu la pestanya <gui>Sincronització</gui>.També podeu obrir les <gui>Preferències del Tomboy</gui> des del diàleg <gui>Cerca totes les notes</gui>: <guiseq><gui>Edita</gui><gui>Preferències</gui></guiseq>.</p>
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 	
 	<p>Per habilitar la sincronització automàtica, activeu la casella <gui>Sincronitza automàticament en segon pla cada x minuts</gui> que es troba a la part inferior de la pestanya Sincronització.</p>
 	
-	<p>L'opció per defecte del Tomboy és sincronitzar les notes cada 10 minuts. Per canviar la freqüència de sincronització del Tomboy, introduïu un número o utilitzeu el ratolí per augmentar o disminuir el número de minuts en el diàleg corresponent.</p>
+	<p>Tomboy's default option is to autosync every 10 minutes.  To change
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>Per inhabilitar la sincronització automàtica, desactiveu la casella <gui>Sincronitza automàticament en segon pla cada x minuts</gui>.</p>
 	
diff --git a/help/ca/whatsnew.page b/help/ca/whatsnew.page
index e47f127..2f41934 100644
--- a/help/ca/whatsnew.page
+++ b/help/ca/whatsnew.page
@@ -22,7 +22,10 @@
 
   <p>El <app>Tomboy</app> porta una gran quantitat de millores. És possible que el Tomboy s'iniciï més ràpid amb les millores que s'han introduït a l'engegada.</p>
   <p>Les funcions de copiar i enganxar des del Tomboy a d'altres aplicacions han millorat la compatibilitat amb la formatació d'aplicacions que admeten HTML com l'Evolution i l'OpenOffice.org.</p>
-  <p>Ara el <app>Tomboy</app> pot sincronitzar les notes automàticament quan s'habilita la funció de sincronització.</p>
+  <p>
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
+  </p>
 
   <p>S'ha afegit la compatibilitat amb les llistes de salts del Microsoft Windows 7 per poder accedir, buscar o crear notes noves de forma més ràpida des de la barra de tasques del Windows.</p>
 
diff --git a/help/cs/addins-desktop-bugzilla.page b/help/cs/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..6827022
--- /dev/null
+++ b/help/cs/addins-desktop-bugzilla.page
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Zásuvný modul, který automaticky vytváří odkazy do systému bugzilla.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Odkazy do systému Bugzilla</title>
+
+  <p>Doplněk Odkazy do systému Bugzilla umožňuje přetáhnout URL Bugzilly z vašeho webového prohlížeče do poznámky <app>Tomboy</app>.</p>
+
+  <steps>
+    <item>
+        <p>Přetáhněte odkaz do systému bugzilla, který obsahuje číslo chyby, ze svého webového prohlížeče to poznámky <app>Tomboy</app>.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> zobrazí číslo chyby jako aktivní odkaz vedle ikony brouka, čímž dává najevo, že se jedná o odkaz do systému <app>Bugzilla</app>. Kliknutím na takovýto odkaz si jej můžete otevřít ve svém webovém prohlížeči.</p>
+
+</page>
diff --git a/help/cs/addins-desktop-printing.page b/help/cs/addins-desktop-printing.page
new file mode 100644
index 0000000..7de6146
--- /dev/null
+++ b/help/cs/addins-desktop-printing.page
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Jak poslat poznámku k tisku.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Podpora tisku</title>
+
+    <note style="important">
+      <p>Abyste mohli z poznámek <app>Tomboy</app> tisknout, musíte mít připojenou a správně nastavenou tiskárnu. Pokud tak nemáte, podívejte se prosím <link href="help:gnome-help/printing">do nápovědy k tisku v GNOME</link>.</p>
+    </note>
+
+    <p>Své poznámky <app>Tomboy</app> můžete tisknout na své tiskárně. Tento doplněk je ve výchozím stavu povolen.</p>
+
+    <steps>
+      <title>Když chcete poznámku vytisknout:</title>
+      <item>
+        <p>Otevřete požadovanou poznámku.</p>
+      </item>
+      <item>
+        <p>Pod ikonou ozubených kol na nástrojové liště vyberte <gui style="menuitem">Vytisknout</gui>. Případně můžete použít klávesovou zkratku <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>V případě, že tento doplněk zakážete, nebude možné poznámky <app>Tomboy</app> tisknout.</p>
+    </note>
+
+ </page>
diff --git a/help/cs/addins-desktop.page b/help/cs/addins-desktop.page
deleted file mode 100644
index b9abdb7..0000000
--- a/help/cs/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="cs">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Zásuvný modul pro integraci s ostatními aplikacemi a weby.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Rozšíření pro integraci do pracovního prostředí</title>
-
-	<p>Rozšíření pro integraci do pracovního prostředí komunikují mezi dalšími aplikacemi, případně weby, a aplikací Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Odkazy do systému Bugzilla</title>
-  <p>Rozšíření <gui>Odkazy do systému Bugzilla</gui> vám umožní přetahovat adresy URL systému Bugzilla z vašeho webového prohlížeče do aplikace Tomboy. Po přetažení odkazu do poznámky Tomboy se v poznámce zobrazí číslo chyby v podobě aktivního odkazu následovaného ikonou symbolizující, že se jedná o odkaz do systému Bugzilla. Kliknutím na odkaz v poznámce Tomboy se otevře okno webového prohlížeče s příslušnou stránkou systému Bugzilla.</p>
-</section>
-
-<section id="evolution">
-  <title>Integrace pošty Evolution</title>
-  <p>Zásuvný modul <gui>Integrace pošty Evolution</gui> vám umožňuje přetahovat e-maily z aplikace Evolution do poznámek Tomboy. Vaše poznámka zobrazí ikonu obálky a předmět zprávy v podobě odkazu. Kliknutím na odkaz se otevře e-mailová zpráva pomocí aplikace Evolution.</p>
-</section>
-
-<section id="printing">
-  <title>Podpora tisku</title>
-  <p>Toto rozšíření je standardně zapnuté a umožňuje tisk poznámek. Pokud jej vypnete, nebudete moci poznámky tisknout.</p>
-</section>
-
-
- </page>
diff --git a/help/cs/addins-formatting-fixed-width.page b/help/cs/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..f43c88a
--- /dev/null
+++ b/help/cs/addins-formatting-fixed-width.page
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Jak nastavit písmu v poznámkách pevnou šířku.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pevná šířka</title>
+
+  <p>Doplněk Pevná šířka nastavuje textu ve vašich poznámkách <app>Tomboy</app> pevnou šířku. Tento doplněk je ve výchozím stavu zakázán.</p>
+
+  <steps>
+    <title>Když chcete ve své poznámce <app>Tomboy</app> použít písmo s pevnou šířkou:</title>
+    <item>
+      <p><link xref="addins">Povolte</link> doplněk Pevná šířka.</p>
+    </item>
+    <item>
+      <p>V poznámce <app>Tomboy</app> vyberte požadovaný text.</p>
+    </item>
+    <item>
+      <p>Pod ikonou <gui style="button">Text</gui> v poznámce vyberte <gui style="menuitem">Pevná šířka</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>Rychlým způsobem, jak nastavit vybraný text do písma s pevnou šířkou, je zmáčknout <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/cs/addins-formatting-underline.page b/help/cs/addins-formatting-underline.page
new file mode 100644
index 0000000..92fbb2e
--- /dev/null
+++ b/help/cs/addins-formatting-underline.page
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Jak podtrhávat text v poznámkách.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Doplněk pro podtrhávání</title>
+
+  <p>Doplněk Podtržení vám umožní podtrhávat určený text ve vašich poznámkách. Ve výchozím stavu je tento doplněk zakázán.</p>
+
+  <steps>
+    <title>Když chcete použít doplněk pro podtrhávání:</title>
+    <item>
+      <p><link xref="addins">Povolte</link> doplněk Podtržení.</p>
+    </item>
+    <item>
+      <p>Vyberte požadovaný text.</p>
+    </item>
+    <item>
+      <p>Pod ikonou <gui style="button">Text</gui> v poznámce vyberte <gui style="menuitem">Podtrhnout</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>Rychlý způsob, jak podtrhnout vybraný text, je zmáčknout <keyseq><key>Ctrl</key> <key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/cs/addins-formatting.page b/help/cs/addins-formatting.page
deleted file mode 100644
index 43c41ab..0000000
--- a/help/cs/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="cs">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Zásuvný modul přidávající rozšiřující formátování poznámek.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Rozšíření formátování</title>
-
-<section id="fixedwidth">
-  <title>Rozšíření pro pevnou šířku</title>
-  <p>Rozšíření <gui>Pevná šířka</gui> mění váš text tak, aby měl v poznámce Tomboy pevnou šířku. Standardně je toto rozšíření vypnuté. Pokud jej chcete zapnout, zmáčkněte tlačítko <gui>Povolit</gui>.</p>
-</section>
-
-<section id="underline">
-  <title>Rozšíření pro podtrhávání</title>
-  <p>Rozšíření <gui>Podtržení</gui> vám umožní části textu ve vaší poznámce podtrhávat pomocí ikony <gui>Text</gui> na liště nástrojů. Toto rozšíření je standardně vypnuté. Pokud jej chcete zapnout, zmáčkněte tlačítko <gui>Povolit</gui>. Označte text, který si přejete podtrhnout a zmáčkněte ikonu <gui>Text</gui> na liště nástrojů u poznámky a zvolte <gui>Podtrhnout</gui> nebo zmáčkněte <keyseq><key>Control + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/cs/addins-preferences.page b/help/cs/addins-preferences.page
new file mode 100644
index 0000000..23e7299
--- /dev/null
+++ b/help/cs/addins-preferences.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Doplněk umožňující pokročilé volby.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Pokročilé předvolby</title>
+
+  <p>Doplněk <gui>Pokročilé předvolby</gui> umožňuje nastavit počet naposledy použitých poznámek, které se mají zobrazit v nedávných poznámkách. Abyste tak mohli učinit, musí být doplněk <link xref="addins">povolen</link>.</p>
+
+ <section id="recent-notes">
+  <title>Ovládání nedávných poznámek</title>
+    <p>Můžete nastavit minimální a maximální počet naposledy použitých poznámek, které se mají zobrazit po kliknutí na ikonu <app>Tomboy</app> v oznamovací oblasti:</p>
+    <steps>
+      <item>
+        <p>Vyberte <guiseq><gui style="menu">Upravit</gui><gui style="menuitem">Předvolby</gui><gui style="tab">Pokročilé</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Nastavte minimální a maximální počet poznámek, které se mají zobrazit v seznamu nedávných poznámek.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Poznámky při spuštění</title>
+
+    <steps>
+      <title>Jestli chcete, aby se při spuštění otevřely poznámky:</title>
+      <item>
+        <p>Klikněte na ikonu <app>Tomboy</app> a vyberte <guiseq><gui style="menuitem">Předvolby</gui> <gui style="tab">Pokročilé</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Vyberte <gui style="checkbox">Otevřít poznámky při spuštění</gui></p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/cs/addins-sync-local.page b/help/cs/addins-sync-local.page
new file mode 100644
index 0000000..64fe780
--- /dev/null
+++ b/help/cs/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Jak synchronizovat své poznámky do místní složky</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Služba synchronizace přes místní složku</title>
+
+  <p>Služba synchronizace do místní složky umožňuje aplikaci <app>Tomboy</app> synchronizovat poznámky do jiné složky ve vašem počítači. To je užitečné pro vytváření záloh vašich poznámek. Tento doplněk je ve výchozím stavu povolen.</p>
+
+</page>
diff --git a/help/cs/addins-sync-ssh.page b/help/cs/addins-sync-ssh.page
new file mode 100644
index 0000000..b5755bd
--- /dev/null
+++ b/help/cs/addins-sync-ssh.page
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Jak synchronizovat své poznámky do jiného počítače skrz SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Služba synchronizace přes SSH</title>
+
+  <p>Doplněk pro synchronizaci do služby SSH vám umožňuje synchronizovat své poznámky s jiným počítačem pomocí protokolu SSH. Ve výchozím stavu je tento doplněk zakázán.</p>
+
+  <p>Aby šlo používat tento doplněk, musíte mít nainstalován balíček <em>sshfs</em> pro svoji linuxovoou distribuci. Nápověda, jak nastavit SSH, ale přesahuje rámec tohoto dokumentu.</p>
+
+</page>
diff --git a/help/cs/addins-sync-webdav.page b/help/cs/addins-sync-webdav.page
new file mode 100644
index 0000000..f756296
--- /dev/null
+++ b/help/cs/addins-sync-webdav.page
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Jak synchronizovat své poznámky do serveru WebDav.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Služba synchronizace přes WebDav</title>
+
+  <p>Doplněk pro synchronizaci do služby WebDav vám umožňuje synchronizovat své poznámky se vzdáleným serverem WebDav. Ve výchozím stavu je tento doplněk povolen.</p>
+
+  <p>Aby šlo používat službu synchronizace do WebDav, musíte mít nainstalován balíček <em>souborového systému wdfs FUSE</em> pro svoji linuxovou distribuci. Nápověda, jak to udělat, ale to přesahuje rámec tohoto dokumentu.</p>
+
+ </page>
diff --git a/help/cs/addins-sync-webservice.page b/help/cs/addins-sync-webservice.page
new file mode 100644
index 0000000..3f669a0
--- /dev/null
+++ b/help/cs/addins-sync-webservice.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Jak synchronizovat své poznámky do služby na Internetu.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Služba synchronizace přes Web</title>
+
+  <p>Doplněk pro synchronizaci do webové služby vám umožňuje synchronizovat své poznámky do vzdáleného webového serveru nebo jiné kompatibilní webové služby.</p>
+
+ </page>
diff --git a/help/cs/addins-sync.page b/help/cs/addins-sync.page
deleted file mode 100644
index 9fb0635..0000000
--- a/help/cs/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="cs">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Zapíná rozšiřující způsoby synchronizace vašich poznámek s ostatními zařízeními.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Rozšíření synchronizace</title>
-
-	<p>Rozšíření synchronizace vám umožní zvolit si různé způsoby a místa pro synchronizaci vašich poznámek Tomboy. Pokud chcete o nastavení synchronizace více informací, podívejte se na stránku nápovědy <link xref="sync-notes"/>.</p>
-
-
-<section id="local">
-  <title>Služba synchronizace přes místní složku</title>
-  <p>Služba synchronizace přes místní složku je standardně zapnutá a umožňuje aplikaci Tomboy synchronizovat poznámky do jiné složky ve vašem počítači. To je užitečné pro vytváření záloh vašich poznámek.</p>
-</section>
-
-<section id="ssh">
-  <title>Služba synchronizace přes SSH</title>
-  <p>Služba synchronizace přes SSH vám umožňuje synchronizovat své poznámky s jiným počítačem přes protokol SSH. Zásuvný modul je standardně vypnutý. Aby toto rozšíření fungovalo, budete možná muset nainstalovat balíček <em>sshfs</em> ve vaší distribuci, ale to přesahuje rámec této nápovědy.</p>
-</section>
-
-<section id="webdav">
-  <title>Služba synchronizace přes WebDav</title>
-  <p>Služba synchronizace přes WebDav je standardně zapnutá a umožňuje vám synchronizovat své poznámky se vzdáleným serverem WebDav. Aby toto rozšíření fungovalo, budete možná muset nainstalovat balíček <em>souborového systému wdfs FUSE</em> ve vaší distribuci, ale to přesahuje rámec této nápovědy.</p>
-</section>
-
-<section id="webservice">
-  <title>Služba synchronizace přes Web</title>
-  <p>Služba synchronizace přes Web vám umožňuje synchronizovat své poznámky přes webovou službu nebo službu jako je Tomboy Online. V době psaní nebyla služba Tomboy Online spuštěna.</p>
-</section>
-
- </page>
diff --git a/help/cs/addins-tools-backlinks.page b/help/cs/addins-tools-backlinks.page
new file mode 100644
index 0000000..6fe696b
--- /dev/null
+++ b/help/cs/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Jak mít přehled, která poznámka se odkazuje na kterou.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Zpětné odkazy</title>
+
+	<p>Rozšíření <gui>Zpětné odkazy</gui> je standardně zapnuté. Umožňuje vám vidět, které poznámky se odkazují na poznámku, kterou máte právě zobrazenou. Takovéto odkazy na poznámku se nazývají <em>zpětné odkazy</em>.</p>
+
+  <steps>
+    <title>Když chcete vytvořit a zobrazit zpětné odkazy na poznámku:</title>
+    <item>
+      <p>Začněte v libovolné poznámce psát název poznámky.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>Aby <app>Tomboy</app> automaticky vytvořil odkazy na existující poznámku, musí text přesně odpovídat názvu této existující poznámky.</p>
+  </note>
+ </page>
diff --git a/help/cs/addins-tools-html-export.page b/help/cs/addins-tools-html-export.page
new file mode 100644
index 0000000..87fd44a
--- /dev/null
+++ b/help/cs/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Jak exportovat poznámky do HTML</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Export do HTML</title>
+
+  <p>Jednotlivé poznámky <app>Tomboy</app> můžete exportovat jako stránky HTML za pomoci doplňku <gui>Export do HTML</gui>. Tento doplněk je ve výchozím stavu povolen.</p>
+
+  <steps>
+    <title>Když chcete poznámku exportovat do HTML:</title>
+    <item>
+      <p>Pod ikonou ozubených kol v nástrojové liště poznámky vyberte <gui style="menuitem">Export do HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Vyhledejte a vyberte složku, do které chcete poznámku uložit. Pokud chcete soubor HTML nazvat jinak, než se nazývá poznámka, můžete tak učinit.</p>
+    </item>
+    <item>
+      <p>Zmáčkněte <gui style="button">Uložit</gui>.</p>
+    </item>
+  </steps>
+
+   <p>Poznámka pak bude uložena jako soubor HTML a otevřena ve vašem výchozím webovém prohlížeči.</p>
+
+</page>
diff --git a/help/cs/addins-tools-note-of-day.page b/help/cs/addins-tools-note-of-day.page
new file mode 100644
index 0000000..a781125
--- /dev/null
+++ b/help/cs/addins-tools-note-of-day.page
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Jak si nechat automaticky vytvářet poznámky pro každý den.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Poznámka pro dnešek</title>
+
+  <p>Můžete si nechat automaticky vytvářet poznámky pro jednotlivé dny. Tyto poznámky budete mít připraveny s textem obsahujícím datum. Například: <em>Dnes: čtvrtek, 21. ledna 2010</em>. Tento doplněk je ve výchozím stavu zakázán.</p>
+
+  <steps>
+    <title>Pro otevření poznámky pro dnešek:</title>
+    <item>
+      <p>Klikněte na ikonu <gui>Tomboy</gui> v oznamovací liště.</p>
+    </item>
+    <item>
+      <p>V seznamu poznámek vyberte poznámku s aktuálním datem.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>Poznámka rovněž automaticky přidá řádky <em>Úkoly</em> a <em>Události</em>.</p>
+  </note>
+
+</page>
diff --git a/help/cs/addins-tools-timestamp.page b/help/cs/addins-tools-timestamp.page
new file mode 100644
index 0000000..d0862f5
--- /dev/null
+++ b/help/cs/addins-tools-timestamp.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Jak vložit datum a čas do své poznámky.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Vkládání časového razítka</title>
+
+  <p>Doplněk <gui>Vložit časové razítko</gui> umožňuje vkládat do vašich poznámek datum a čas. Ve výchozím stavu je tento doplněk zakázán.</p>
+
+  <steps>
+    <title>Když chcete použít doplněk <gui>Vložit časové razítko</gui>:</title>
+    <item>
+      <p>Pod ikonou ozubených kol na nástrojové liště vyberte <gui style="menuitem">Vložit časové razítko</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>Rychlým způsobem, jako do poznámky vložit časové razítko, je zmáčknout <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/cs/addins-tools.page b/help/cs/addins-tools.page
deleted file mode 100644
index 333eb82..0000000
--- a/help/cs/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="cs">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Zapíná rozšiřující funkcionalitu poznámek.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Rozšiřující nástroje Tomboy</title>
-
-	<p>Rozšiřující nástroje přidávají rozšiřující funkcionalitu do vašich poznámek Tomboy.</p>
-
-  <section id="backlinks">
-    <title>Zpětné odkazy</title>
-	<p>Rozšíření <gui>Zpětné odkazy</gui> je standardně zapnuté a umožňuje vám vidět, které poznámky se odkazují na poznámku, kterou máte právě zobrazenou.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Export do HTML</title>
-  <p>Rozšíření  <gui>Export to HTML</gui> je standardně zapnuté a provádí export jednotlivých poznámek do HTML.</p>
-	<p>Pokud chcete poznámku exportovat do HTML, zmáčkněte ikonu <gui>Nástroje</gui> na liště nástrojů a zvolte <gui>Exportovat to HTML</gui>. Ihned se vám zobrazí dialogové okno pro uložení poznámky. Zvolte složku, do které si přejete poznámku uložit a změňte název nového souboru html, pokud chcete, aby se jmenoval jinak než je název poznámky. Poznámka bude uložena do souboru HTML a automaticky zobrazena ve vašem webovém prohlížeči.</p>
-</section>
-
-<section id="timestamp">
-  <title>Vkládání časového razítka</title>
-  <p>Rozšíření <gui>Vkládání časového razítka</gui> je standardně vypnuté. Jestli jej chcete zapnout, zvolte rozšíření <gui>Vkládání časového razítka</gui> a zmáčkněte <gui>Povolit</gui> v předvolbách aplikace Tomboy.</p>
-	<p>Když chcete do své poznámky přidat časové razítko, zmáčkněte ikonu <gui>Nástroje</gui> na liště nástrojů a zvolte <gui>Vložit časové razítko</gui> nebo zmáčkněte <key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Poznámka pro dnešek</title>
-  <p>Rozšíření <gui>Poznámka pro dnešek</gui> je standardně vypnuté. Jestli jej chcete zapnout, zvolte rozšíření <gui>Poznámka pro dnešek</gui> a zmáčkněte tlačítko <gui>Povolit</gui> v předvolbách aplikace Tomboy.</p>
-	<p>Rozšíření <gui>Poznámka pro dnešek</gui> bude denně vytvářet nové poznámky s názvem kupříkladu <em>Dnes: úterý, 21. leden 2010</em>. Rovněž se do poznámky automaticky přidají řádky <em>Úkoly</em> a <em>Události</em>.</p>
-</section>
-
-<section id="watcher">
-  <title>Sledování složky s poznámkami</title>
-  <p>Rozšíření <gui>Sledování složky s poznámkami</gui> sleduje složku, ve které jsou uložené vaše poznámky Tomboy. Jakmile rozšíření zjistí ve vašich poznámkách změny, použije tyto změny a zobrazí je ve vašich poznámkách. Toto rozšíření se typicky používá ve spolupráci se synchronizačními službami třetích stran, jako je třeba Dropbox. Nastavení synchronizačních služeb třetích stran je mimo rámec této nápovědy.</p>
-</section>
-
- </page>
diff --git a/help/cs/addins.page b/help/cs/addins.page
index 88267c1..3b8fd20 100644
--- a/help/cs/addins.page
+++ b/help/cs/addins.page
@@ -4,28 +4,60 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Jak přidat rozšiřující funkcionalitu do aplikace Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Rozšíření pro aplikaci Tomboy</title>
+  <title>Doplňky pro aplikaci Tomboy</title>
+
+  <p><gui>Doplňky</gui> jsou zásuvné moduly aplikace <app>Tomboy</app>, které vám doplní další vlastnosti a funkcionalitu, která není přítomna jako výchozí.</p>
+
+  <steps>
+    <title>Pro povolení doplňku:</title>
+    <item>
+      <p>Vyberte <guiseq><gui style="menu">Upravit</gui> <gui style="menuitem">Předvolby</gui> <gui style="tab">Doplňky</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Kliknutím na <gui>+</gui> rozbalte kategorii doplňků.</p>
+    </item>
+    <item>
+      <p>Vyberte doplněk, které si přejete povolit.</p>
+    </item>
+    <item>
+      <p>Zmáčkněte <gui style="button">Povolit</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>Jestli chcete získat další doplňky z Internetu, klikněte v okně <gui>Předvolby <app>Tomboy</app></gui> na kartě <gui style="tab">Doplňky</gui> na <gui style="button">Získat více doplňků…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Předvolby</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Rozšíření pro aplikaci Tomboy</title>
-    </info>
-    <title>Správa rozšíření pro Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Nástroje</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Integrace do pracovního prostředí</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronizace</title>
+    <p>Doplněk pro synchronizaci vám umožní zvolit si různé způsoby a místa pro synchronizaci vašich poznámek Tomboy.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formátování</title>
+  </section>
 </page>
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 644939b..d44a7c8 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -3,45 +3,41 @@
 # This file is distributed under the same license as the tomboy help.
 #
 # Petr Kovar <pknbe at volny.cz>, 2009.
-# Marek Černocký <marek at manet.cz>, 2009, 2011, 2012.
+# Marek Černocký <marek at manet.cz>, 2009, 2011, 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy gnome-2-28\n"
-"POT-Creation-Date: 2012-12-11 15:04+0000\n"
-"PO-Revision-Date: 2012-12-27 22:07+0100\n"
+"POT-Creation-Date: 2013-10-13 15:40+0000\n"
+"PO-Revision-Date: 2013-10-13 17:41+0200\n"
 "Last-Translator: Marek Černocký <marek at manet.cz>\n"
-"Language-Team: čeština <gnome-cs-list at gnome.org>\n"
+"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
 "Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.5\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: C/whatsnew.page:9(desc)
 msgid "What's new in <app>Tomboy Notes</app>."
 msgstr "Co je nového v aplikaci <app>Poznámky Tomboy</app>"
 
-#: C/whatsnew.page:13(name) C/sync-setup.page:11(name) C/sync.page:11(name)
+#: C/whatsnew.page:13(name) C/sync.page:11(name) C/sync-setup.page:11(name)
 #: C/search.page:12(name) C/prefs.page:9(name) C/note-edit-prefs.page:11(name)
 #: C/introduction.page:12(name) C/index.page:9(name) C/hotkeys.page:11(name)
-#: C/edit-note.page:13(name) C/delete-notes.page:14(name)
-#: C/create-note.page:13(name) C/create-notebook.page:13(name)
-#: C/addins-tools.page:10(name) C/addins-sync.page:10(name)
-#: C/addins.page:11(name) C/addins-formatting.page:10(name)
-#: C/addins-desktop.page:10(name)
+#: C/edit-note.page:13(name) C/delete-notes.page:13(name)
+#: C/create-notebook.page:11(name) C/create-note.page:13(name)
+#: C/addins.page:11(name)
 msgid "Paul Cutler"
 msgstr "Paul Cutler"
 
-#: C/whatsnew.page:14(email) C/sync-setup.page:12(email) C/sync.page:12(email)
+#: C/whatsnew.page:14(email) C/sync.page:12(email) C/sync-setup.page:12(email)
 #: C/search.page:13(email) C/prefs.page:10(email)
 #: C/note-edit-prefs.page:12(email) C/introduction.page:13(email)
 #: C/index.page:10(email) C/hotkeys.page:12(email) C/edit-note.page:14(email)
-#: C/delete-notes.page:15(email) C/create-note.page:14(email)
-#: C/create-notebook.page:14(email) C/addins-tools.page:11(email)
-#: C/addins-sync.page:11(email) C/addins.page:12(email)
-#: C/addins-formatting.page:11(email) C/addins-desktop.page:11(email)
+#: C/delete-notes.page:14(email) C/create-notebook.page:12(email)
+#: C/create-note.page:14(email) C/addins.page:12(email)
 msgid "pcutler at gnome.org"
 msgstr "pcutler at gnome.org"
 
@@ -71,7 +67,7 @@ msgstr ""
 #: C/whatsnew.page:36(p)
 msgid ""
 "<app>Tomboy</app> can now synchronize your notes automatically for you when "
-"you when you have sync enabled."
+"you when you have synchronize enabled."
 msgstr ""
 "<app>Tomboy</app> nyní umí synchronizovat vaše poznámky automaticky, stačí "
 "synchronizaci jen povolit."
@@ -86,17 +82,118 @@ msgstr ""
 "usnadnění přístupu k vašim poznámkám a hledání a vytváření nových poznámek "
 "rychle přímo z pruhu úloh Windows."
 
+#: C/sync.page:8(desc)
+msgid "Sync your Tomboy notes with other computers."
+msgstr "Jak synchronizovat vaše poznámky Tomboy s jinými počítači."
+
+#: C/sync.page:23(title)
+msgid "Sync your notes"
+msgstr "Synchronizace vašich poznámek"
+
+#: C/sync.page:27(title)
+msgid "Manually Syncing Notes"
+msgstr "Ruční synchronizace poznámek"
+
+#: C/sync.page:29(p)
+msgid "You can synchronize your notes one of three ways:"
+msgstr "Své poznámky můžete synchronizovat jedním ze tří způsobů:"
+
+#: C/sync.page:32(p)
+msgid ""
+"From any note click the <gui>Tools</gui> icon and choose <gui>Synchronize "
+"Notes</gui>."
+msgstr ""
+"V kterékoliv poznámce klikněte na ikonu <gui>Nástroje</gui> a zvolte "
+"<gui>Synchronizovat poznámky</gui>."
+
+#: C/sync.page:34(p)
+msgid ""
+"In the <gui>Search All Notes</gui> dialog choose <guiseq><gui>Tools</"
+"gui><gui>Synchronize Notes</gui></guiseq>."
+msgstr ""
+"V dialogovém okně <gui>Hledat ve všech poznámkách</gui> zvolte "
+"<guiseq><gui>Nástroje</gui><gui>Synchronizovat poznámky</gui></guiseq>."
+
+#: C/sync.page:37(p)
+msgid ""
+"Using your mouse, right click on the Tomboy icon in your panel, taskbar or "
+"dock and choose <gui>Synchronize All Notes </gui>."
+msgstr ""
+"Použijte svoji myš, klikněte pravým tlačítkem na ikonu Tomboy na svém "
+"panelu, na pruhu úloh nebo v doku a zvolte <gui>Synchronizovat všechny "
+"poznámky</gui>."
+
+#: C/sync.page:46(title)
+msgid "Sync Your Notes Automatically"
+msgstr "Automatická synchronizace vašich poznámek"
+
+#: C/sync.page:48(p)
+msgid ""
+"Tomboy can automatically synchronize your notes for you in the background.It "
+"is recommended that you configure how you handle note conflicts before "
+"enabling syncing automatically. You can learn about handling note conflicts "
+"in the <link xref=\"sync-setup#conflict\"/> page."
+msgstr ""
+"Tomboy může vaše poznámky synchronizovat automaticky na pozadí. Je "
+"doporučeno, abyste před tím, než automatické synchronizace zapnete, "
+"nastavili, jak se mají řešit konflikty poznámek. O řešení konfliktů mezi "
+"poznámkami se můžete poučit na stránce <link xref=\"sync-setup#conflict\"/>."
+
+#: C/sync.page:54(p) C/sync-setup.page:33(p)
+msgid ""
+"You can enable synchronize by opening <gui>Tomboy Preferences</gui> by using "
+"your mouse to right click on the Tomboy icon in your panel, taskbar or dock "
+"and choose <gui>Preferences</gui> and then select the <gui>Synchronization</"
+"gui> tab. You can also open <gui> Tomboy Preferences</gui> from the "
+"<gui>Search All Notes</gui> dialog. From the menu choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq>."
+msgstr ""
+"Synchronizaci můžete zapnout otevřením <gui>Předvoleb Tomboy</gui> pomocí "
+"kliknutí pravým tlačítkem myši na svém panelu, na pruhu úloh nebo na doku a "
+"zvolením <gui>Předvolby</gui> a následným výběrem karty <gui>Synchronizace</"
+"gui>. <gui>Předvolby Tomboy</gui> můžete otevřít také z dialogového okna "
+"<gui>Hledat ve všech poznámkách</gui>. V nabídce zvolte "
+"<guiseq><gui>Upravit</gui><gui>Předvolby</gui></guiseq>."
+
+#: C/sync.page:63(p)
+msgid ""
+"To enable autosync, check the <gui>Automatically Sync in Background Every x "
+"Minutes</gui> box at the bottom of the Synchronization tab."
+msgstr ""
+"Pokud chcete zapnout automatické synchronizace, zaškrtněte políčko "
+"<gui>Automaticky synchronizovat na pozadí každých x minut</gui> na kartě "
+"Synchronizace."
+
+#: C/sync.page:66(p)
+msgid ""
+"Tomboy's default option is to autosync every 10 minutes. To change how often "
+"Tomboy should synchronize enter the number of minutes in the dialog or use "
+"your mouse to move the time up or down."
+msgstr ""
+"Výchozí volbou Tomboy je automatická synchronizace každých 10 minut. Jestli "
+"chcete údaj, jak často by se mělo synchronizovat, změnit, zadejte počet "
+"minut v dialogovém okně, případně použijte myši a šipek pro zvýšení/snížení "
+"údaje."
+
+#: C/sync.page:70(p)
+msgid ""
+"To disable autosync, uncheck the <gui>Automatically Sync in Background Every "
+"x Minutes</gui> box."
+msgstr ""
+"Pokud chcete automatickou synchronizaci vypnout, zrušte zaškrtnutí políčka "
+"<gui>Automaticky synchronizovat na pozadí každých x minut</gui>."
+
 #: C/sync-setup.page:8(desc)
 msgid "Configure Tomboy to synchronize your notes."
 msgstr "Jak nastavit aplikaci Tomboy pro synchronizaci poznámek."
 
-#: C/sync-setup.page:15(name) C/delete-notes.page:18(name)
+#: C/sync-setup.page:15(name) C/delete-notes.page:21(name)
 msgid "GNOME Documentation Project"
 msgstr "Dokumentační projekt GNOME"
 
 #: C/sync-setup.page:16(years)
 msgid "2010-2012"
-msgstr "2010 – 2012"
+msgstr "2010 – 2012"
 
 #: C/sync-setup.page:21(title)
 msgid "Configure and Setup Sync"
@@ -116,22 +213,6 @@ msgstr ""
 "počítači. To vám umožňuje pořizovat zálohy svých poznámek na jiné počítače "
 "nebo sdílet své poznámky mezi počítači, takže se k nim dostanete odkudkoliv."
 
-#: C/sync-setup.page:33(p) C/sync.page:54(p)
-msgid ""
-"You can enable sync by opening <gui>Tomboy Preferences</gui> by using your "
-"mouse to right click on the Tomboy icon in your panel, taskbar or dock and "
-"choose <gui>Preferences</gui> and then select the <gui>Synchronization</gui> "
-"tab. You can also open <gui> Tomboy Preferences</gui> from the <gui>Search "
-"All Notes</gui> dialog. From the menu choose <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui></guiseq>."
-msgstr ""
-"Synchronizaci můžete zapnout otevřením <gui>Předvoleb Tomboy</gui> pomocí "
-"kliknutí pravým tlačítkem myši na svém panelu, na pruhu úloh nebo na doku a "
-"zvolením <gui>Předvolby</gui> a následným výběrem karty <gui>Synchronizace</"
-"gui>. <gui>Předvolby Tomboy</gui> můžete otevřít také z dialogového okna "
-"<gui>Hledat ve všech poznámkách</gui>. V nabídce zvolte "
-"<guiseq><gui>Upravit</gui><gui>Předvolby</gui></guiseq>."
-
 #: C/sync-setup.page:46(title)
 msgid "Managing Note Conflict"
 msgstr "Řešení konfliktů poznámek"
@@ -181,8 +262,9 @@ msgstr ""
 #: C/sync-setup.page:70(p)
 msgid ""
 "<gui>Replace my local note with the server's update.</gui> If you have "
-"selected this option, when you sync, Tomboy will overwrite and replace your "
-"note stored on your computer with a copy from the remote computer."
+"selected this option, when you synchronize, Tomboy will overwrite and "
+"replace your note stored on your computer with a copy from the remote "
+"computer."
 msgstr ""
 "<gui>Zaměnit místní poznámku s poznámkou na serveru.</gui> Když máte vybránu "
 "tuto volbu, pak Tomboy při synchronizaci přepíše a nahradí vaši poznámku "
@@ -260,10 +342,10 @@ msgid ""
 "<guiseq><gui>Applications</gui><gui>Accessories</gui><gui>Passwords and "
 "Encryption Keys</gui></guiseq>. Click on your key, and from the menu choose "
 "<guiseq><gui>Remote</gui><gui>Configure Key for Secure Shell</gui></guiseq> "
-"and enter the domain name or IP address of the computer you want to sync to "
-"in <gui>Computer Name</gui>. Enter the username of the remote computer in "
-"<gui>Login Name:</gui> and press <gui>Set Up</gui>. When prompted, enter the "
-"password and setting up your key will be completed."
+"and enter the domain name or IP address of the computer you want to "
+"synchronize to in <gui>Computer Name</gui>. Enter the username of the remote "
+"computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. When "
+"prompted, enter the password and setting up your key will be completed."
 msgstr ""
 "Otevřete aplikaci <app>Hesla a šifrovací klíče</app> volbou "
 "<guiseq><gui>Aplikace</gui><gui>Příslušenství</gui><gui>Hesla a šifrovací "
@@ -311,91 +393,6 @@ msgstr ""
 "<gui>Umístění složky</gui> pro synchronizaci a zmáčkněte tlačítko "
 "<gui>Uložit</gui>. Tím je vše připravené k synchronizaci vašich poznámek."
 
-#: C/sync.page:8(desc)
-msgid "Sync your Tomboy notes with other computers."
-msgstr "Jak synchronizovat vaše poznámky Tomboy s jinými počítači."
-
-#: C/sync.page:23(title)
-msgid "Sync your notes"
-msgstr "Synchronizace vašich poznámek"
-
-#: C/sync.page:27(title)
-msgid "Manually Syncing Notes"
-msgstr "Ruční synchronizace poznámek"
-
-#: C/sync.page:29(p)
-msgid "You can sync your notes one of three ways:"
-msgstr "Své poznámky můžete synchronizovat jedním ze tří způsobů:"
-
-#: C/sync.page:32(p)
-msgid ""
-"From any note click the <gui>Tools</gui> icon and choose <gui>Synchronize "
-"Notes</gui>."
-msgstr ""
-"V kterékoliv poznámce klikněte na ikonu <gui>Nástroje</gui> a zvolte "
-"<gui>Synchronizovat poznámky</gui>."
-
-#: C/sync.page:34(p)
-msgid ""
-"In the <gui>Search All Notes</gui> dialog choose <guiseq><gui>Tools</"
-"gui><gui>Synchronize Notes</gui></guiseq>."
-msgstr ""
-"V dialogovém okně <gui>Hledat ve všech poznámkách</gui> zvolte "
-"<guiseq><gui>Nástroje</gui><gui>Synchronizovat poznámky</gui></guiseq>."
-
-#: C/sync.page:37(p)
-msgid ""
-"Using your mouse, right click on the Tomboy icon in your panel, taskbar or "
-"dock and choose <gui>Synchronize All Notes </gui>."
-msgstr ""
-"Použijte svoji myš, klikněte pravým tlačítkem na ikonu Tomboy na svém "
-"panelu, na pruhu úloh nebo v doku a zvolte <gui>Synchronizovat všechny "
-"poznámky</gui>."
-
-#: C/sync.page:46(title)
-msgid "Sync Your Notes Automatically"
-msgstr "Automatická synchronizace vašich poznámek"
-
-#: C/sync.page:48(p)
-msgid ""
-"Tomboy can automatically sync your notes for you in the background. It is "
-"recommended that you configure how you handle note conflicts before enabling "
-"syncing automatically. You can learn about handling note conflicts in the "
-"<link xref=\"sync-setup#conflict\"/> page."
-msgstr ""
-"Tomboy může vaše poznámky synchronizovat automaticky na pozadí. Je "
-"doporučeno, abyste před tím, než automatické synchronizace zapnete, "
-"nastavili, jak se mají řešit konflikty poznámek. O řešení konfliktů mezi "
-"poznámkami se můžete poučit na stránce <link xref=\"sync-setup#conflict\"/>."
-
-#: C/sync.page:63(p)
-msgid ""
-"To enable autosync, check the <gui>Automatically Sync in Background Every x "
-"Minutes</gui> box at the bottom of the Synchronization tab."
-msgstr ""
-"Pokud chcete zapnout automatické synchronizace, zaškrtněte políčko "
-"<gui>Automaticky synchronizovat na pozadí každých x minut</gui> na kartě "
-"Synchronizace."
-
-#: C/sync.page:66(p)
-msgid ""
-"Tomboy's default option is to autosync every 10 minutes. To change how often "
-"Tomboy should sync enter the number of minutes in the dialog or use your "
-"mouse to move the time up or down."
-msgstr ""
-"Výchozí volbou Tomboy je automatická synchronizace každých 10 minut. Jestli "
-"chcete údaj, jak často by se mělo synchronizovat, změnit, zadejte počet "
-"minut v dialogovém okně, případně použijte myši a šipek pro zvýšení/snížení "
-"údaje."
-
-#: C/sync.page:70(p)
-msgid ""
-"To disable autosync, uncheck the <gui>Automatically Sync in Background Every "
-"x Minutes</gui> box."
-msgstr ""
-"Pokud chcete automatickou synchronizaci vypnout, zrušte zaškrtnutí políčka "
-"<gui>Automaticky synchronizovat na pozadí každých x minut</gui>."
-
 #: C/search.page:9(desc)
 msgid "Search your notes."
 msgstr "Jak hledat své poznámky."
@@ -448,6 +445,90 @@ msgstr "Horké klávesy Tomboy"
 msgid "Syncing Notes"
 msgstr "Synchronizace poznámek"
 
+#: C/pin-notes.page:9(desc)
+msgid "Access notes from <app>Tomboy</app> message tray icon."
+msgstr ""
+"Jak se dostat ke svým poznámkám přes ikonu <app>Tomboy</app> na oznamovací "
+"liště."
+
+#: C/pin-notes.page:12(name) C/delete-notes.page:17(name)
+#: C/addins.page:15(name) C/addins-tools-timestamp.page:10(name)
+#: C/addins-tools-note-of-day.page:10(name)
+#: C/addins-tools-html-export.page:10(name)
+#: C/addins-tools-backlinks.page:10(name)
+#: C/addins-sync-webservice.page:10(name) C/addins-sync-webdav.page:10(name)
+#: C/addins-sync-ssh.page:10(name) C/addins-sync-local.page:10(name)
+#: C/addins-preferences.page:11(name)
+#: C/addins-formatting-underline.page:10(name)
+#: C/addins-formatting-fixed-width.page:10(name)
+#: C/addins-desktop-printing.page:10(name)
+#: C/addins-desktop-bugzilla.page:10(name)
+msgid "Sindhu S"
+msgstr "Sindhu S"
+
+#: C/pin-notes.page:13(email)
+msgid "sindhus at gnome.org"
+msgstr "sindhus at gnome.org"
+
+#: C/pin-notes.page:19(title)
+msgid "Pin a note"
+msgstr "Připíchnutí poznámky"
+
+#: C/pin-notes.page:21(p)
+msgid ""
+"The recent list of <app>Tomboy</app> notes you have accessed are shown when "
+"you click on the <link xref=\"\">message tray icon</link>. This list is "
+"limited to twenty recent notes. If you have more than twenty notes, opening "
+"a note that is not in the recent list will require you to <link xref=\"search"
+"\">search all notes</link>."
+msgstr ""
+"Po kliknutí na <link xref=\"\">ikonu v oznamovací oblasti</link> se vám "
+"zobrazí seznam poznámek <app>Tomboy</app>, které jste použili naposledy. "
+"Tento seznam je omezen na dvanáct poznámek. Pokud máte poznámek více než "
+"dvanáct, musíte k otevření poznámky, která v tomto seznamu není, použít "
+"<link xref=\"\">hledání ve všech poznámkách</link>."
+
+#: C/pin-notes.page:27(p)
+msgid ""
+"To quickly access less frequently used notes, you can <em>pin</em> notes to "
+"the recent list."
+msgstr ""
+"Pokud potřebujete rychlý přístup k některým méně často používaným poznámkám, "
+"můžete si je do seznamu nedávných poznámek <em>připíchnout</em>."
+
+#: C/pin-notes.page:31(title)
+msgid "To pin a note:"
+msgstr "Pro připíchnutí poznámky:"
+
+#: C/pin-notes.page:33(p)
+msgid "Click on the <app>Tomboy</app> icon in the message tray."
+msgstr "Klikněte na ikonu <app>Tomboy</app> na oznamovací liště."
+
+#: C/pin-notes.page:36(p)
+msgid ""
+"In the recent list, click on the gray pin icon to the right hand side of the "
+"note you wish to pin. The pin icon will change to in color to be green."
+msgstr ""
+"V seznamu nedávných poznámek klikněte na šedou ikonu připínáčku napravo od "
+"poznámky, kterou chcete připíchnout. Barva ikony připínáčku se změní na "
+"zelenou."
+
+#: C/pin-notes.page:42(p)
+msgid ""
+"A note with a green pin icon indicates that the note has been <em>pinned</"
+"em> to the list."
+msgstr ""
+"Zelená ikona signalizuje, že daná poznámka je do seznamu <em>připíchnutá</"
+"em>."
+
+#: C/pin-notes.page:45(p)
+msgid ""
+"To remove a note <em>pinned</em> to the recent list, click on the green pin "
+"icon."
+msgstr ""
+"Pro odstranění <em>připíchnuté</em> poznámky ze seznamu stačí kliknout na "
+"zelenou ikonu připínáčku."
+
 #: C/note-edit-prefs.page:8(desc)
 msgid "Note editing preferences."
 msgstr "Předvolby pro úpravy poznámky."
@@ -667,6 +748,26 @@ msgstr ""
 "poznámky vytvoření nové šablony dokončíte. Pokaždé když vytvoříte novou "
 "poznámku, zobrazí se v podobě této nové šablony."
 
+#: C/legal.xml:3(p)
+msgid ""
+"This work is licensed under a <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 Unported "
+"License</link>."
+msgstr ""
+"Toto dílo je licencováno pod <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 Unported "
+"License</link>."
+
+#: C/legal.xml:6(p)
+msgid ""
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
+msgstr ""
+"Jako speciální výjimků vám držitel autorských práv uděluje oprávnění "
+"kopírovat, upravovat a šířit ukázky kódu obsažené v tomto dokumentu a to bez "
+"dalších omezení za podmínek, které si sami zvolíte."
+
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/introduction.page:44(None)
@@ -687,7 +788,7 @@ msgid ""
 "Microsoft Windows, and Mac OS X. <app>Tomboy</app> is easy to use, and helps "
 "you organize the ideas and information you work with everyday."
 msgstr ""
-"<app>Tomboy</app> je aplikace na poznámky na pracovní ploše pro GNOME, "
+"<app>Tomboy</app> je aplikace k psaní poznámek v pracovním prostředí GNOME, "
 "Microsoft Windows a Mac OS X. Je snadno použitelná a pomůže vám uspořádat si "
 "své nápady a informace, se kterými pracujete dennodenně."
 
@@ -698,15 +799,15 @@ msgid ""
 "it easier to find and sort your information. You can also organize multiple "
 "notes in a notebook to make grouping notes together easier."
 msgstr ""
-"<app>Tomboy</app> obsahuje funkce, které vám pomohou si lépe uspořádat a "
+"<app>Tomboy</app> obsahuje funkce, které vám pomohou si lépe roztřídit a "
 "zapamatovat informace a umožní vám provázat poznámky mezi sebou, abyste "
-"informace snadněji nalezli. Poznámky si může uspořádat do sešitu, což slouží "
-"k jejich jednoduchému seskupení."
+"informace snadněji nalezli. Poznámky si může uspořádat do sešitů, což je "
+"jednoduchý způsob, jak si je seskupovat."
 
 #: C/introduction.page:36(p)
 msgid ""
-"You can also sync your notes across multiple computers, making it easy to "
-"take your notes with you wherever you are."
+"You can also synchronize your notes across multiple computers, making it "
+"easy to take your notes with you wherever you are."
 msgstr ""
 "Poznámky můžete rovněž synchronizovat mezi více počítači, takže je máte "
 "snadno dostupné kdekoliv se nacházíte."
@@ -929,77 +1030,70 @@ msgstr ""
 msgid "Delete a note in Tomboy."
 msgstr "Jak v aplikaci Tomboy odstranit poznámku."
 
-#: C/delete-notes.page:19(years)
+#: C/delete-notes.page:18(email) C/addins.page:16(email)
+#: C/addins-tools-timestamp.page:11(email)
+#: C/addins-tools-note-of-day.page:11(email)
+#: C/addins-tools-html-export.page:11(email)
+#: C/addins-tools-backlinks.page:11(email)
+#: C/addins-sync-webservice.page:11(email) C/addins-sync-webdav.page:11(email)
+#: C/addins-sync-ssh.page:11(email) C/addins-sync-local.page:11(email)
+#: C/addins-preferences.page:12(email)
+#: C/addins-formatting-underline.page:11(email)
+#: C/addins-formatting-fixed-width.page:11(email)
+#: C/addins-desktop-printing.page:11(email)
+#: C/addins-desktop-bugzilla.page:11(email)
+msgid "sindhus at live.in"
+msgstr "sindhus at live.in"
+
+#: C/delete-notes.page:22(years)
 msgid "2010"
 msgstr "2010"
 
-#: C/delete-notes.page:24(title)
+#: C/delete-notes.page:27(title)
 msgid "Delete a note"
 msgstr "Odstranění poznámky"
 
-#: C/delete-notes.page:26(p)
+#: C/delete-notes.page:29(p)
 msgid ""
-"You can delete a note by pressing the <gui>Delete</gui> icon in the toolbar "
-"of the note you wish to delete."
+"If you wish to remove notes that you no longer need, you can delete them "
+"from <app>Tomboy</app>."
 msgstr ""
-"Poznámku můžete odstranit zmáčknutím ikony <gui>Odstranit</gui> na liště "
-"nástrojů u poznámky, kterou si přejete odstranit."
+"Pokud si přejete odstranit poznámky, které již nadále nepotřebujete, můžete "
+"je z aplikace <app>Tomboy</app> vymazat."
 
-#: C/delete-notes.page:30(p)
-msgid ""
-"Deleting a note is permanent. After deletion, the note is not recoverable."
-msgstr ""
-"Odstranění poznámky je trvalé. Po jejím odstranění ji již nelze obnovit."
+#: C/delete-notes.page:33(title)
+msgid "To delete a note:"
+msgstr "Pro odstranění poznámky:"
 
-#: C/delete-notes.page:31(p)
-msgid ""
-"You will be prompted <gui>Really delete this note?</gui> when deleting a "
-"note."
-msgstr ""
-"Při odstraňování poznámky budete dotázáni <gui>Opravdu odstranit tuto "
-"poznámku?</gui>."
-
-#: C/create-note.page:10(desc)
-msgid "Create a new note in Tomboy."
-msgstr "Jak v aplikaci Tomboy vytvořit novou poznámku."
-
-#: C/create-note.page:25(title)
-msgid "Create a new note"
-msgstr "Vytvoření nové poznámky"
+#: C/delete-notes.page:35(p) C/addins-desktop-printing.page:27(p)
+msgid "Open the desired note."
+msgstr "Otevřete požadovanou poznámku."
 
-#: C/create-note.page:27(p)
+#: C/delete-notes.page:38(p)
 msgid ""
-"You can create a new note in Tomboy by clicking on the Tomboy icon in the "
-"GNOME panel, Windows taskbar, or OS X dock, and then choosing <gui>Create "
-"New Note</gui>. You can also use the keyboard shortcuts by pressing "
-"<keyseq><key>Alt + F12</key></keyseq>."
+"Click the <gui>Delete</gui> icon from the toolbar. You will be prompted to "
+"confirm the deletion."
 msgstr ""
-"Novou poznámku v aplikaci Tomboy můžete vytvořit kliknutím na ikonu Tomboy "
-"na panelu GNOME, na pruhu úloh Windows nebo v doku OS X a následným výběrem "
-"<gui>Vytvořit novou poznámku</gui>. Můžete také použít klávesovou zkratku "
-"zmáčknutím <keyseq><key>Alt + F12</key></keyseq>."
+"Klikněte na ikonu <gui>Odstranit</gui> na nástrojové liště. Budete vyzváni k "
+"potvrzení smazání."
 
-#: C/create-note.page:32(p)
+#: C/delete-notes.page:44(p)
 msgid ""
-"The new note will display a new window with the title New Note <em>N</em>. "
-"The note contains a toolbar, with options to search your notes, link notes, "
-"format the text within a note, and more. For more information, see <link "
-"xref=\"edit-notes\"/>."
+"Deleting a note is a permanent action. Notes once deleted, cannot be "
+"recovered."
 msgstr ""
-"Nová poznámka se zobrazí v novém okně s názvem Nová poznámka <em>N</em>. "
-"Poznámka obsahuje lištu nástrojů s volbami pro hledání vašich poznámek, "
-"odkazy na poznámky, formátování textu poznámky a další. Více informací viz "
-"<link xref=\"edit-notes\"/>."
+"Odstranění poznámky je trvalé. Jakmile je jednou poznámka smazána, nelze ji "
+"již obnovit."
 
-#: C/create-notebook.page:10(desc)
+#: C/create-notebook.page:8(desc)
 msgid "Create a new notebook in Tomboy."
 msgstr "Jak v aplikaci Tomboy vytvořit nový sešit."
 
-#: C/create-notebook.page:25(title)
+#: C/create-notebook.page:23(title)
 msgid "Create a notebook"
 msgstr "Vytvoření sešitu"
 
-#: C/create-notebook.page:27(p)
+#: C/create-notebook.page:25(p)
 msgid ""
 "Notebooks allow you to group related notes together. You can add a note to a "
 "notebook in the Search All Notes window or directly inside of a Note."
@@ -1008,7 +1102,7 @@ msgstr ""
 "přidat do sešitu v okně Hledat ve všech poznámkách nebo přímo v okně s "
 "poznámkou."
 
-#: C/create-notebook.page:33(p)
+#: C/create-notebook.page:31(p)
 msgid ""
 "Click on the Tomboy note icon present in the GNOME Panel, the taskbar in "
 "Microsoft Windows, or the dock in Mac OS X. A menu will appear."
@@ -1016,22 +1110,22 @@ msgstr ""
 "Klikněte na ikonu Tomboy na panelu GNOME, na pruhu úloh v Microsoft Windows "
 "nebo v doku v Mac OS X. Objeví se nabídka."
 
-#: C/create-notebook.page:43(p)
+#: C/create-notebook.page:41(p)
 msgid "Select <guiseq><gui>Notebooks</gui><gui>New Notebook</gui></guiseq>."
 msgstr "Zvolte <guiseq><gui>Sešity</gui><gui>Nový sešit</gui></guiseq>."
 
-#: C/create-notebook.page:47(p) C/create-notebook.page:66(p)
-#: C/create-notebook.page:79(p)
+#: C/create-notebook.page:45(p) C/create-notebook.page:64(p)
+#: C/create-notebook.page:77(p)
 msgid "Enter a name for the new notebook."
 msgstr "Zadejte název pro nový sešit."
 
-#: C/create-notebook.page:51(p)
+#: C/create-notebook.page:49(p)
 msgid "To create a new notebook from the <gui>Search All Notes</gui> dialog:"
 msgstr ""
 "Postup vytvoření nového sešitu z dialogového okna <gui>Hledat ve všech "
 "poznámkách</gui>:"
 
-#: C/create-notebook.page:56(p)
+#: C/create-notebook.page:54(p)
 msgid ""
 "Open <gui>Search All Notes</gui> by choosing it from the Tomboy icon on the "
 "GNOME Panel, the taskbar in Microsoft Windows, or the dock in Mac OS X, or "
@@ -1041,7 +1135,7 @@ msgstr ""
 "na panelu GNOME, na pruhu úloh v Microsoft Windows nebo v doku v Mac OS X a "
 "nebo kliknutím na tlačítko Hledat v otevřené poznámce."
 
-#: C/create-notebook.page:62(p)
+#: C/create-notebook.page:60(p)
 msgid ""
 "Using your mouse, right click in the left hand box and choose <gui>New "
 "Notebook</gui>."
@@ -1049,11 +1143,11 @@ msgstr ""
 "Pomocí myši klikněte pravým tlačítkem do levé části a zvolte <gui>Nový "
 "sešit</gui>."
 
-#: C/create-notebook.page:70(p)
+#: C/create-notebook.page:68(p)
 msgid "Or:"
 msgstr "Nebo:"
 
-#: C/create-notebook.page:74(p)
+#: C/create-notebook.page:72(p)
 msgid ""
 "With <gui>Search All Notes</gui> open, choose <guiseq><gui>File</"
 "gui><gui>Notebooks</gui><gui>New Notebook</gui></guiseq>."
@@ -1061,325 +1155,604 @@ msgstr ""
 "V otevřeném dialogovém okně <gui>Hledat ve všech poznámkách</gui> zvolte "
 "<guiseq><gui>Soubor</gui><gui>Sešity</gui><gui>Nový sešit</gui></guiseq>."
 
-#: C/addins-tools.page:7(desc)
-msgid "Enable additional note functionality."
-msgstr "Zapíná rozšiřující funkcionalitu poznámek."
+#: C/create-note.page:10(desc)
+msgid "Create a new note in Tomboy."
+msgstr "Jak v aplikaci Tomboy vytvořit novou poznámku."
 
-#: C/addins-tools.page:22(title)
-msgid "Tomboy Tools Addins"
-msgstr "Rozšiřující nástroje Tomboy"
+#: C/create-note.page:25(title)
+msgid "Create a new note"
+msgstr "Vytvoření nové poznámky"
 
-#: C/addins-tools.page:24(p)
-msgid "Tools addins add additional functionality to your Tomboy notes."
+#: C/create-note.page:27(p)
+msgid ""
+"You can create a new note in Tomboy by clicking on the Tomboy icon in the "
+"GNOME panel, Windows taskbar, or OS X dock, and then choosing <gui>Create "
+"New Note</gui>. You can also use the keyboard shortcuts by pressing "
+"<keyseq><key>Alt + F12</key></keyseq>."
 msgstr ""
-"Rozšiřující nástroje přidávají rozšiřující funkcionalitu do vašich poznámek "
-"Tomboy."
+"Novou poznámku v aplikaci Tomboy můžete vytvořit kliknutím na ikonu Tomboy "
+"na panelu GNOME, na pruhu úloh Windows nebo v doku OS X a následným výběrem "
+"<gui>Vytvořit novou poznámku</gui>. Můžete také použít klávesovou zkratku "
+"zmáčknutím <keyseq><key>Alt + F12</key></keyseq>."
 
-#: C/addins-tools.page:27(title)
-msgid "Backlinks"
-msgstr "Zpětné odkazy"
+#: C/create-note.page:32(p)
+msgid ""
+"The new note will display a new window with the title New Note <em>N</em>. "
+"The note contains a toolbar, with options to search your notes, link notes, "
+"format the text within a note, and more. For more information, see <link "
+"xref=\"edit-notes\"/>."
+msgstr ""
+"Nová poznámka se zobrazí v novém okně s názvem Nová poznámka <em>N</em>. "
+"Poznámka obsahuje lištu nástrojů s volbami pro hledání vašich poznámek, "
+"odkazy na poznámky, formátování textu poznámky a další. Více informací viz "
+"<link xref=\"edit-notes\"/>."
 
-#: C/addins-tools.page:28(p)
+#: C/addins.page:8(desc)
+msgid "Add additional functionality to Tomboy."
+msgstr "Jak přidat rozšiřující funkcionalitu do aplikace Tomboy."
+
+#: C/addins.page:21(title)
+msgid "Tomboy add-ins"
+msgstr "Doplňky pro aplikaci Tomboy"
+
+#: C/addins.page:23(p)
 msgid ""
-"The <gui>Backlinks</gui> addin is enabled by default and allows you to see "
-"which notes link to the note you are currently viewing."
+"<gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended "
+"features and functionality which are not available by default."
 msgstr ""
-"Rozšíření <gui>Zpětné odkazy</gui> je standardně zapnuté a umožňuje vám "
-"vidět, které poznámky se odkazují na poznámku, kterou máte právě zobrazenou."
+"<gui>Doplňky</gui> jsou zásuvné moduly aplikace <app>Tomboy</app>, které vám "
+"doplní další vlastnosti a funkcionalitu, která není přítomna jako výchozí."
 
-#: C/addins-tools.page:33(title)
-msgid "Export to HTML"
-msgstr "Export do HTML"
+#: C/addins.page:27(title)
+msgid "To enable an add-in:"
+msgstr "Pro povolení doplňku:"
+
+#: C/addins.page:29(p)
+msgid ""
+"Select <guiseq><gui style=\"menu\">Edit</gui><gui style=\"menuitem"
+"\">Preferences</gui><gui style=\"tab\">Add-ins</gui></guiseq>."
+msgstr ""
+"Vyberte <guiseq><gui style=\"menu\">Upravit</gui> <gui style=\"menuitem"
+"\">Předvolby</gui> <gui style=\"tab\">Doplňky</gui></guiseq>."
+
+#: C/addins.page:32(p)
+msgid "Click on <gui>+</gui> to expand the add-in category."
+msgstr "Kliknutím na <gui>+</gui> rozbalte kategorii doplňků."
+
+#: C/addins.page:35(p)
+msgid "Select the add-in you wish to enable."
+msgstr "Vyberte doplněk, které si přejete povolit."
 
-#: C/addins-tools.page:34(p)
+#: C/addins.page:38(p)
+msgid "Press <gui style=\"button\">Enable</gui>."
+msgstr "Zmáčkněte <gui style=\"button\">Povolit</gui>."
+
+#: C/addins.page:43(p)
 msgid ""
-"The <gui>Export to HTML</gui> addin is enabled by default and will export an "
-"individual note to HTML."
+"To download more add-ins from the internet, from the <gui><app>Tomboy</app> "
+"Preferences</gui> window, in the <gui style=\"tab\">Add-ins</gui> tab, click "
+"on <gui style=\"button\">Get More Add-Ins…</gui>."
 msgstr ""
-"Rozšíření  <gui>Export to HTML</gui> je standardně zapnuté a provádí export "
-"jednotlivých poznámek do HTML."
+"Jestli chcete získat další doplňky z Internetu, klikněte v okně "
+"<gui>Předvolby <app>Tomboy</app></gui> na kartě <gui style=\"tab\">Doplňky</"
+"gui> na <gui style=\"button\">Získat více doplňků…</gui>."
+
+#: C/addins.page:49(title)
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: C/addins.page:53(title)
+msgid "Tools"
+msgstr "Nástroje"
 
-#: C/addins-tools.page:36(p)
+#: C/addins.page:57(title)
+msgid "Desktop Integration"
+msgstr "Integrace do pracovního prostředí"
+
+#: C/addins.page:61(title)
+msgid "Synchronization"
+msgstr "Synchronizace"
+
+#: C/addins.page:62(p)
 msgid ""
-"To export a note to HTML, press the <gui>Tools</gui> icon in the note "
-"toolbar and choose <gui>Export to HTML</gui>. You will immediately be "
-"presented with a dialog to save the note. Choose the directory you wish to "
-"save the note in and change the name of note's new html file if you wish it "
-"to be different than the note name. The note will then be saved as an HTML "
-"file and automatically displayed in your browser."
+"Synchronization add-ins allow you to choose different methods and places to "
+"synchronize your Tomboy notes."
 msgstr ""
-"Pokud chcete poznámku exportovat do HTML, zmáčkněte ikonu <gui>Nástroje</"
-"gui> na liště nástrojů a zvolte <gui>Exportovat to HTML</gui>. Ihned se vám "
-"zobrazí dialogové okno pro uložení poznámky. Zvolte složku, do které si "
-"přejete poznámku uložit a změňte název nového souboru html, pokud chcete, "
-"aby se jmenoval jinak než je název poznámky. Poznámka bude uložena do "
-"souboru HTML a automaticky zobrazena ve vašem webovém prohlížeči."
+"Doplněk pro synchronizaci vám umožní zvolit si různé způsoby a místa pro "
+"synchronizaci vašich poznámek Tomboy."
+
+#: C/addins.page:66(title)
+msgid "Formatting"
+msgstr "Formátování"
 
-#: C/addins-tools.page:45(title)
+#: C/addins-tools-timestamp.page:7(desc)
+msgid "Insert date and time in your notes."
+msgstr "Jak vložit datum a čas do své poznámky."
+
+#: C/addins-tools-timestamp.page:15(title)
 msgid "Insert Timestamp"
 msgstr "Vkládání časového razítka"
 
-#: C/addins-tools.page:46(p)
+#: C/addins-tools-timestamp.page:17(p)
+msgid ""
+"The <gui>Insert Timestamp</gui> add-in allows you to insert date and time "
+"into your notes. This add-in is disabled by default."
+msgstr ""
+"Doplněk <gui>Vložit časové razítko</gui> umožňuje vkládat do vašich poznámek "
+"datum a čas. Ve výchozím stavu je tento doplněk zakázán."
+
+#: C/addins-tools-timestamp.page:21(title)
+msgid "To use the <gui>Insert Timestamp</gui> addin:"
+msgstr "Když chcete použít doplněk <gui>Vložit časové razítko</gui>:"
+
+#: C/addins-tools-timestamp.page:23(p)
 msgid ""
-"The <gui>Insert Timestamp</gui> addin is disabled by default. To enable it, "
-"choose the <gui>Insert Timestamp</gui> addin and then press <gui>Enable</"
-"gui> in the Tomboy Preferences."
+"From the gears icon in the note toolbar, select <gui style=\"menuitem"
+"\">Insert Timestamp</gui>."
 msgstr ""
-"Rozšíření <gui>Vkládání časového razítka</gui> je standardně vypnuté. Jestli "
-"jej chcete zapnout, zvolte rozšíření <gui>Vkládání časového razítka</gui> a "
-"zmáčkněte <gui>Povolit</gui> v předvolbách aplikace Tomboy."
+"Pod ikonou ozubených kol na nástrojové liště vyberte <gui style=\"menuitem"
+"\">Vložit časové razítko</gui>."
 
-#: C/addins-tools.page:49(p)
+#: C/addins-tools-timestamp.page:29(p)
 msgid ""
-"To add a timestamp to your notes, press the <gui>Tools</gui> icon in the "
-"note toolbar and choose <gui>Insert Timestamp</gui> or press <key>Ctrl + D</"
-"key>."
+"To quickly insert a timestamp in a note, press <keyseq><key>Ctrl</"
+"key><key>D</key></keyseq>."
 msgstr ""
-"Když chcete do své poznámky přidat časové razítko, zmáčkněte ikonu "
-"<gui>Nástroje</gui> na liště nástrojů a zvolte <gui>Vložit časové razítko</"
-"gui> nebo zmáčkněte <key>Ctrl + D</key>."
+"Rychlým způsobem, jako do poznámky vložit časové razítko, je zmáčknout "
+"<keyseq><key>Ctrl</key><key>D</key></keyseq>."
+
+#: C/addins-tools-note-of-day.page:7(desc)
+msgid "Automatically create notes for each day."
+msgstr "Jak si nechat automaticky vytvářet poznámky pro každý den."
 
-#: C/addins-tools.page:55(title)
+#: C/addins-tools-note-of-day.page:16(title)
 msgid "Note of the Day"
 msgstr "Poznámka pro dnešek"
 
-#: C/addins-tools.page:56(p)
+#: C/addins-tools-note-of-day.page:18(p)
 msgid ""
-"The <gui>Note of the Day</gui> addin is disabled by default. To enable, "
-"choose the <gui>Note of the Day</gui> addin and then press <gui>Enable</gui> "
-"in the Tomboy Preferences."
+"You can automatically create notes for each day. These notes come ready with "
+"text containing day and date information for the day.Example: <em>Today: "
+"Thursday, January 21 2010</em>. This add-in is disabled by default."
 msgstr ""
-"Rozšíření <gui>Poznámka pro dnešek</gui> je standardně vypnuté. Jestli jej "
-"chcete zapnout, zvolte rozšíření <gui>Poznámka pro dnešek</gui> a zmáčkněte "
-"tlačítko <gui>Povolit</gui> v předvolbách aplikace Tomboy."
+"Můžete si nechat automaticky vytvářet poznámky pro jednotlivé dny. Tyto "
+"poznámky budete mít připraveny s textem obsahujícím datum. Například: "
+"<em>Dnes: čtvrtek, 21. ledna 2010</em>. Tento doplněk je ve výchozím stavu "
+"zakázán."
 
-#: C/addins-tools.page:59(p)
+#: C/addins-tools-note-of-day.page:24(title)
+msgid "To open the note of the day:"
+msgstr "Pro otevření poznámky pro dnešek:"
+
+#: C/addins-tools-note-of-day.page:26(p)
+msgid "Click on the <app>Tomboy</app> icon in your message tray."
+msgstr "Klikněte na ikonu <gui>Tomboy</gui> v oznamovací liště."
+
+#: C/addins-tools-note-of-day.page:29(p)
+msgid "Select from the list of notes, note with current date."
+msgstr "V seznamu poznámek vyberte poznámku s aktuálním datem."
+
+#: C/addins-tools-note-of-day.page:34(p)
 msgid ""
-"<gui>Note of the Day</gui> addin will create a new note daily with the title "
-"<em>Today: Thursday, January 21 2010</em> for example. The note will also "
-"add rows for <em>Tasks</em> and <em>Appointment</em> automatically."
+"The note will also add rows for <em>Tasks</em> and <em>Appointment</em> "
+"automatically."
 msgstr ""
-"Rozšíření <gui>Poznámka pro dnešek</gui> bude denně vytvářet nové poznámky s "
-"názvem kupříkladu <em>Dnes: úterý, 21. leden 2010</em>. Rovněž se do "
-"poznámky automaticky přidají řádky <em>Úkoly</em> a <em>Události</em>."
+"Poznámka rovněž automaticky přidá řádky <em>Úkoly</em> a <em>Události</em>."
 
-#: C/addins-tools.page:65(title)
-msgid "Note Directory Watcher"
-msgstr "Sledování složky s poznámkami"
+#: C/addins-tools-html-export.page:7(desc)
+msgid "Export notes to HTML."
+msgstr "Jak exportovat poznámky do HTML"
+
+#: C/addins-tools-html-export.page:16(title)
+msgid "Export to HTML"
+msgstr "Export do HTML"
 
-#: C/addins-tools.page:66(p)
+#: C/addins-tools-html-export.page:18(p)
 msgid ""
-"The Note Directory Watcher addin monitors the directory your Tomboy notes "
-"are saved in. If the addin detects changes to your notes, it will apply "
-"those changes and they will be displayed in your notes. This addin is "
-"typically used with 3rd party sync services such as Dropbox. Setting up 3rd "
-"party sync services is outside the scope of this help."
+"You can export individual <app>Tomboy</app> notes to HTML pages with the "
+"<gui>Export to HTML</gui> add-in. This addin is enabled by default."
 msgstr ""
-"Rozšíření <gui>Sledování složky s poznámkami</gui> sleduje složku, ve které "
-"jsou uložené vaše poznámky Tomboy. Jakmile rozšíření zjistí ve vašich "
-"poznámkách změny, použije tyto změny a zobrazí je ve vašich poznámkách. Toto "
-"rozšíření se typicky používá ve spolupráci se synchronizačními službami "
-"třetích stran, jako je třeba Dropbox. Nastavení synchronizačních služeb "
-"třetích stran je mimo rámec této nápovědy."
+"Jednotlivé poznámky <app>Tomboy</app> můžete exportovat jako stránky HTML za "
+"pomoci doplňku <gui>Export do HTML</gui>. Tento doplněk je ve výchozím stavu "
+"povolen."
 
-#: C/addins-sync.page:7(desc)
-msgid "Enable additional ways to sync your notes with other devices."
+#: C/addins-tools-html-export.page:21(title)
+msgid "To export a note to HTML:"
+msgstr "Když chcete poznámku exportovat do HTML:"
+
+#: C/addins-tools-html-export.page:23(p)
+msgid ""
+"From the gears icon in the note toolbar, select <gui style=\"menuitem"
+"\">Export to HTML</gui>."
 msgstr ""
-"Zapíná rozšiřující způsoby synchronizace vašich poznámek s ostatními "
-"zařízeními."
+"Pod ikonou ozubených kol v nástrojové liště poznámky vyberte <gui style="
+"\"menuitem\">Export do HTML</gui>."
 
-#: C/addins-sync.page:22(title)
-msgid "Sync Addins"
-msgstr "Rozšíření synchronizace"
+#: C/addins-tools-html-export.page:26(p)
+msgid ""
+"Browse and select the directory you wish to save the note to. You may change "
+"the name of the html file, if you wish it to be different than the name of "
+"the note."
+msgstr ""
+"Vyhledejte a vyberte složku, do které chcete poznámku uložit. Pokud chcete "
+"soubor HTML nazvat jinak, než se nazývá poznámka, můžete tak učinit."
 
-#: C/addins-sync.page:24(p)
+#: C/addins-tools-html-export.page:29(p)
+msgid "Press <gui style=\"button\">Save</gui>."
+msgstr "Zmáčkněte <gui style=\"button\">Uložit</gui>."
+
+#: C/addins-tools-html-export.page:33(p)
 msgid ""
-"Sync Addins allow you to choose different methods and places to sync your "
-"Tomboy notes. For more information on configuring sync, visit the <link xref="
-"\"sync-notes\"/> help page."
+"The note will then be saved as an HTML file and opened in your default web "
+"browser."
 msgstr ""
-"Rozšíření synchronizace vám umožní zvolit si různé způsoby a místa pro "
-"synchronizaci vašich poznámek Tomboy. Pokud chcete o nastavení synchronizace "
-"více informací, podívejte se na stránku nápovědy <link xref=\"sync-notes\"/>."
+"Poznámka pak bude uložena jako soubor HTML a otevřena ve vašem výchozím "
+"webovém prohlížeči."
 
-#: C/addins-sync.page:30(title)
-msgid "Local Directory Sync Service"
-msgstr "Služba synchronizace přes místní složku"
+#: C/addins-tools-backlinks.page:7(desc)
+msgid "See notes that link to each other."
+msgstr "Jak mít přehled, která poznámka se odkazuje na kterou."
 
-#: C/addins-sync.page:31(p)
+#: C/addins-tools-backlinks.page:16(title)
+msgid "Backlinks"
+msgstr "Zpětné odkazy"
+
+#: C/addins-tools-backlinks.page:18(p)
 msgid ""
-"The Local Directory Sync Service is enabled by default and allows Tomboy to "
-"sync its notes to another directory on your computer. This is helpful to "
-"create a backup of your notes."
+"The <gui>Backlinks</gui> addin is enabled by default. This addin enables you "
+"to view which notes link to the note you are currently viewing. Such links "
+"to a note are called <em>Backlinks</em>."
 msgstr ""
-"Služba synchronizace přes místní složku je standardně zapnutá a umožňuje "
-"aplikaci Tomboy synchronizovat poznámky do jiné složky ve vašem počítači. To "
-"je užitečné pro vytváření záloh vašich poznámek."
+"Rozšíření <gui>Zpětné odkazy</gui> je standardně zapnuté. Umožňuje vám "
+"vidět, které poznámky se odkazují na poznámku, kterou máte právě zobrazenou. "
+"Takovéto odkazy na poznámku se nazývají <em>zpětné odkazy</em>."
 
-#: C/addins-sync.page:37(title)
-msgid "SSH Sync Service"
-msgstr "Služba synchronizace přes SSH"
+#: C/addins-tools-backlinks.page:21(title)
+msgid "To create and view backlinks of a note:"
+msgstr "Když chcete vytvořit a zobrazit zpětné odkazy na poznámku:"
+
+#: C/addins-tools-backlinks.page:23(p)
+msgid "Start typing the title of a note in any note."
+msgstr "Začněte v libovolné poznámce psát název poznámky."
 
-#: C/addins-sync.page:38(p)
+#: C/addins-tools-backlinks.page:27(p)
 msgid ""
-"The SSH Sync Service allows you to sync your notes with another computer via "
-"the SSH protocol. This plugin is disabled by default. You may need to "
-"install the <em>sshfs</em> package for your Linux distribution to make this "
-"addin work, which is outside the scope of this help document."
+"For <app>Tomboy</app> to create automatic links to existing notes, the text "
+"you type must match the title of an existing note."
 msgstr ""
-"Služba synchronizace přes SSH vám umožňuje synchronizovat své poznámky s "
-"jiným počítačem přes protokol SSH. Zásuvný modul je standardně vypnutý. Aby "
-"toto rozšíření fungovalo, budete možná muset nainstalovat balíček <em>sshfs</"
-"em> ve vaší distribuci, ale to přesahuje rámec této nápovědy."
+"Aby <app>Tomboy</app> automaticky vytvořil odkazy na existující poznámku, "
+"musí text přesně odpovídat názvu této existující poznámky."
 
-#: C/addins-sync.page:46(title)
+#: C/addins-sync-webservice.page:7(desc)
+msgid "Sync your notes to a service on the Internet."
+msgstr "Jak synchronizovat své poznámky do služby na Internetu."
+
+#: C/addins-sync-webservice.page:17(title)
+msgid "Web Sync Service"
+msgstr "Služba synchronizace přes Web"
+
+#: C/addins-sync-webservice.page:19(p)
+msgid ""
+"The Web Sync Service add-in allows you to synchronize your notes to a remote "
+"web server or other compatible web services."
+msgstr ""
+"Doplněk pro synchronizaci do webové služby vám umožňuje synchronizovat své "
+"poznámky do vzdáleného webového serveru nebo jiné kompatibilní webové služby."
+
+#: C/addins-sync-webdav.page:7(desc)
+msgid "Sync your notes to a WebDav server."
+msgstr "Jak synchronizovat své poznámky do serveru WebDav."
+
+#: C/addins-sync-webdav.page:17(title)
 msgid "WebDav Sync Service"
 msgstr "Služba synchronizace přes WebDav"
 
-#: C/addins-sync.page:47(p)
+#: C/addins-sync-webdav.page:19(p)
 msgid ""
-"The WebDav Sync Service addin is enabled by default and allows you to sync "
-"your notes with a WebDav remote server. You may need to have the <em>wdfs "
-"FUSE file system</em> package installed for your Linux distribution to make "
-"this addin work which is outside the scope of this help document."
+"The WebDav Sync Service add-in allows you to synchronize your notes with "
+"WebDav remote server. This addin is enabled by default."
 msgstr ""
-"Služba synchronizace přes WebDav je standardně zapnutá a umožňuje vám "
-"synchronizovat své poznámky se vzdáleným serverem WebDav. Aby toto rozšíření "
-"fungovalo, budete možná muset nainstalovat balíček <em>souborového systému "
-"wdfs FUSE</em> ve vaší distribuci, ale to přesahuje rámec této nápovědy."
+"Doplněk pro synchronizaci do služby WebDav vám umožňuje synchronizovat své "
+"poznámky se vzdáleným serverem WebDav. Ve výchozím stavu je tento doplněk "
+"povolen."
 
-#: C/addins-sync.page:55(title)
-msgid "Web Sync Service"
-msgstr "Služba synchronizace přes Web"
+#: C/addins-sync-webdav.page:22(p)
+msgid ""
+"To use the WebDav Sync Service, you will need to have the <em>wdfs FUSE file "
+"system</em> package installed for your Linux distribution. The user help for "
+"which is outside the scope of this document."
+msgstr ""
+"Aby šlo používat službu synchronizace do WebDav, musíte mít nainstalován "
+"balíček <em>souborového systému wdfs FUSE</em> pro svoji linuxovou "
+"distribuci. Nápověda, jak to udělat, ale to přesahuje rámec tohoto dokumentu."
 
-#: C/addins-sync.page:56(p)
+#: C/addins-sync-ssh.page:7(desc)
+msgid "Sync your notes to another computer through SSH."
+msgstr "Jak synchronizovat své poznámky do jiného počítače skrz SSH."
+
+#: C/addins-sync-ssh.page:17(title)
+msgid "SSH Sync Service"
+msgstr "Služba synchronizace přes SSH"
+
+#: C/addins-sync-ssh.page:19(p)
 msgid ""
-"The Web Sync Service addin allows you to sync your notes to a remote web "
-"server or service, such as Tomboy Online. At the time of writing, the Tomboy "
-"Online service has not launched."
+"The SSH Sync Service add-in allows you to synchronize your notes with "
+"another computer using the SSH protocol. This add-in is disabled by default."
 msgstr ""
-"Služba synchronizace přes Web vám umožňuje synchronizovat své poznámky přes "
-"webovou službu nebo službu jako je Tomboy Online. V době psaní nebyla služba "
-"Tomboy Online spuštěna."
+"Doplněk pro synchronizaci do služby SSH vám umožňuje synchronizovat své "
+"poznámky s jiným počítačem pomocí protokolu SSH. Ve výchozím stavu je tento "
+"doplněk zakázán."
 
-#: C/addins.page:8(desc)
-msgid "Add additional functionality to Tomboy."
-msgstr "Jak přidat rozšiřující funkcionalitu do aplikace Tomboy."
+#: C/addins-sync-ssh.page:23(p)
+msgid ""
+"To use this add-in, you may need to install the <em>sshfs</em> package for "
+"your Linux distribution. User help to setup SSH support is outside the scope "
+"of this document."
+msgstr ""
+"Aby šlo používat tento doplněk, musíte mít nainstalován balíček <em>sshfs</"
+"em> pro svoji linuxovoou distribuci. Nápověda, jak nastavit SSH, ale "
+"přesahuje rámec tohoto dokumentu."
+
+#: C/addins-sync-local.page:7(desc)
+msgid "Sync your notes to a local directory."
+msgstr "Jak synchronizovat své poznámky do místní složky"
+
+#: C/addins-sync-local.page:17(title)
+msgid "Local Directory Sync Service"
+msgstr "Služba synchronizace přes místní složku"
+
+#: C/addins-sync-local.page:19(p)
+msgid ""
+"The Local Directory Sync Service add-in allows you to synchronize "
+"<app>Tomboy</app> notes to a folder on your computer. This is helpful to "
+"create a backup of your notes. This add-in is enabled by default."
+msgstr ""
+"Služba synchronizace do místní složky umožňuje aplikaci <app>Tomboy</app> "
+"synchronizovat poznámky do jiné složky ve vašem počítači. To je užitečné pro "
+"vytváření záloh vašich poznámek. Tento doplněk je ve výchozím stavu povolen."
+
+#: C/addins-preferences.page:8(desc)
+msgid "Enable advanced options plugins."
+msgstr "Doplněk umožňující pokročilé volby."
+
+#: C/addins-preferences.page:17(title)
+msgid "Advanced Preferences"
+msgstr "Pokročilé předvolby"
+
+#: C/addins-preferences.page:19(p)
+msgid ""
+"The <gui>Advanced Preferences</gui> add-in allows you to set the number of "
+"recent notes that are shown in the recent list. This addin must be <link "
+"xref=\"addins\">enabled</link> for you to be able to use it."
+msgstr ""
+"Doplněk <gui>Pokročilé předvolby</gui> umožňuje nastavit počet naposledy "
+"použitých poznámek, které se mají zobrazit v nedávných poznámkách. Abyste "
+"tak mohli učinit, musí být doplněk <link xref=\"addins\">povolen</link>."
+
+#: C/addins-preferences.page:22(title)
+msgid "Control recent notes"
+msgstr "Ovládání nedávných poznámek"
+
+#: C/addins-preferences.page:23(p)
+msgid ""
+"You can set the minimum and maximum recent notes to be displayed when you "
+"click on <app>Tomboy</app> message tray icon:"
+msgstr ""
+"Můžete nastavit minimální a maximální počet naposledy použitých poznámek, "
+"které se mají zobrazit po kliknutí na ikonu <app>Tomboy</app> v oznamovací "
+"oblasti:"
 
-#: C/addins.page:23(title) C/addins.page:27(title)
-msgid "Tomboy Addins"
-msgstr "Rozšíření pro aplikaci Tomboy"
+#: C/addins-preferences.page:27(p)
+msgid ""
+"Select <guiseq><gui style=\"menu\">Edit</gui><gui style=\"menuitem"
+"\">Preferences</gui><gui style=\"tab\">Advanced</gui></guiseq>."
+msgstr ""
+"Vyberte <guiseq><gui style=\"menu\">Upravit</gui><gui style=\"menuitem"
+"\">Předvolby</gui><gui style=\"tab\">Pokročilé</gui></guiseq>."
 
-#: C/addins.page:29(title)
-msgid "Manage addins for Tomboy"
-msgstr "Správa rozšíření pro Tomboy"
+#: C/addins-preferences.page:30(p)
+msgid ""
+"Set the minimum and maximum number of notes to be shown in the recent notes "
+"list."
+msgstr ""
+"Nastavte minimální a maximální počet poznámek, které se mají zobrazit v "
+"seznamu nedávných poznámek."
 
-#: C/addins-formatting.page:7(desc)
-msgid "Plugins to add addition note formatting."
-msgstr "Zásuvný modul přidávající rozšiřující formátování poznámek."
+#: C/addins-preferences.page:37(title)
+msgid "Startup notes"
+msgstr "Poznámky při spuštění"
 
-#: C/addins-formatting.page:22(title)
-msgid "Formatting Addins"
-msgstr "Rozšíření formátování"
+#: C/addins-preferences.page:40(title)
+msgid "To enable startup notes:"
+msgstr "Jestli chcete, aby se při spuštění otevřely poznámky:"
 
-#: C/addins-formatting.page:25(title)
-msgid "Fixed Width Addin"
-msgstr "Rozšíření pro pevnou šířku"
+#: C/addins-preferences.page:42(p)
+msgid ""
+"Click on the <app>Tomboy</app> icon and select <guiseq><gui style=\"menuitem"
+"\">Preferences</gui><gui style=\"tab\">Advanced</gui></guiseq>."
+msgstr ""
+"Klikněte na ikonu <app>Tomboy</app> a vyberte <guiseq><gui style=\"menuitem"
+"\">Předvolby</gui> <gui style=\"tab\">Pokročilé</gui></guiseq>."
 
-#: C/addins-formatting.page:26(p)
+#: C/addins-preferences.page:47(p)
+msgid "Select <gui style=\"checkbox\">Enable startup notes</gui>,"
+msgstr "Vyberte <gui style=\"checkbox\">Otevřít poznámky při spuštění</gui>"
+
+#: C/addins-formatting-underline.page:7(desc)
+msgid "Plugin to underline text in note."
+msgstr "Jak podtrhávat text v poznámkách."
+
+#: C/addins-formatting-underline.page:17(title)
+msgid "Underline Add-in"
+msgstr "Doplněk pro podtrhávání"
+
+#: C/addins-formatting-underline.page:19(p)
 msgid ""
-"The Fixed Width addin changes your text to be of a fixed width in the Tomboy "
-"note. This addin is disabled by default. To enable, press the <gui>Enable</"
-"gui> button."
+"The Underline add-in allows you to underline specific text in your note. "
+"This add-in is disabled by default."
 msgstr ""
-"Rozšíření <gui>Pevná šířka</gui> mění váš text tak, aby měl v poznámce "
-"Tomboy pevnou šířku. Standardně je toto rozšíření vypnuté. Pokud jej chcete "
-"zapnout, zmáčkněte tlačítko <gui>Povolit</gui>."
+"Doplněk Podtržení vám umožní podtrhávat určený text ve vašich poznámkách. Ve "
+"výchozím stavu je tento doplněk zakázán."
 
-#: C/addins-formatting.page:31(title)
-msgid "Underline Addin"
-msgstr "Rozšíření pro podtrhávání"
+#: C/addins-formatting-underline.page:23(title)
+msgid "To use the Underline add-in:"
+msgstr "Když chcete použít doplněk pro podtrhávání:"
 
-#: C/addins-formatting.page:32(p)
+#: C/addins-formatting-underline.page:25(p)
+msgid "<link xref=\"addins\">Enable</link> the Underline add-in."
+msgstr "<link xref=\"addins\">Povolte</link> doplněk Podtržení."
+
+#: C/addins-formatting-underline.page:28(p)
+msgid "Select the desired text."
+msgstr "Vyberte požadovaný text."
+
+#: C/addins-formatting-underline.page:31(p)
 msgid ""
-"The Underline addin allows you to underline specific text in your note using "
-"the <gui>Text</gui> icon in a note toolbar. This addin is disabled by "
-"default. To enable, press the <gui>Enable</gui> button. Highlight the text "
-"you would like to underline, press the <gui>Text</gui> icon in the note "
-"toolbar, and choose <gui>Underline</gui> or press <keyseq><key>CONTROL + U</"
-"key></keyseq>."
+"From the <gui style=\"button\">Text</gui> icon in a note, select <gui style="
+"\"menuitem\">Underline</gui>."
 msgstr ""
-"Rozšíření <gui>Podtržení</gui> vám umožní části textu ve vaší poznámce "
-"podtrhávat pomocí ikony <gui>Text</gui> na liště nástrojů. Toto rozšíření je "
-"standardně vypnuté. Pokud jej chcete zapnout, zmáčkněte tlačítko "
-"<gui>Povolit</gui>. Označte text, který si přejete podtrhnout a zmáčkněte "
-"ikonu <gui>Text</gui> na liště nástrojů u poznámky a zvolte <gui>Podtrhnout</"
-"gui> nebo zmáčkněte <keyseq><key>Control + U</key></keyseq>."
+"Pod ikonou <gui style=\"button\">Text</gui> v poznámce vyberte <gui style="
+"\"menuitem\">Podtrhnout</gui>."
 
-#: C/addins-desktop.page:7(desc)
-msgid "Plugins to integrate with other applications and websites."
-msgstr "Zásuvný modul pro integraci s ostatními aplikacemi a weby."
+#: C/addins-formatting-underline.page:36(p)
+msgid ""
+"To quickly underline any selected text, press <keyseq><key>Control</"
+"key><key>U</key></keyseq>."
+msgstr ""
+"Rychlý způsob, jak podtrhnout vybraný text, je zmáčknout <keyseq><key>Ctrl</"
+"key> <key>U</key></keyseq>."
+
+#: C/addins-formatting-fixed-width.page:7(desc)
+msgid "Plugin to set fixed width font in notes."
+msgstr "Jak nastavit písmu v poznámkách pevnou šířku."
+
+#: C/addins-formatting-fixed-width.page:17(title)
+msgid "Fixed Width"
+msgstr "Pevná šířka"
+
+#: C/addins-formatting-fixed-width.page:19(p)
+msgid ""
+"The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to be "
+"Fixed Width. This addin is disabled by default."
+msgstr ""
+"Doplněk Pevná šířka nastavuje textu ve vašich poznámkách <app>Tomboy</app> "
+"pevnou šířku. Tento doplněk je ve výchozím stavu zakázán."
 
-#: C/addins-desktop.page:22(title)
-msgid "Desktop Integration Addins"
-msgstr "Rozšíření pro integraci do pracovního prostředí"
+#: C/addins-formatting-fixed-width.page:23(title)
+msgid "To use Fixed Width font in your <app>Tomboy</app> notes:"
+msgstr ""
+"Když chcete ve své poznámce <app>Tomboy</app> použít písmo s pevnou šířkou:"
+
+#: C/addins-formatting-fixed-width.page:25(p)
+msgid "<link xref=\"addins\">Enable</link> the Fixed Width add-in."
+msgstr "<link xref=\"addins\">Povolte</link> doplněk Pevná šířka."
+
+#: C/addins-formatting-fixed-width.page:28(p)
+msgid "Select the desired text in a <app>Tomboy</app> note."
+msgstr "V poznámce <app>Tomboy</app> vyberte požadovaný text."
+
+#: C/addins-formatting-fixed-width.page:31(p)
+#| msgid ""
+#| "From the <gui style=\"button\">Text</gui> icon in a note, select <gui "
+#| "style=\"menuitem\">Underline</gui>."
+msgid ""
+"From the <gui style=\"button\">Text</gui> icon in the note toolbar, select "
+"<gui style=\"menuitem\">Fixed Width</gui>."
+msgstr ""
+"Pod ikonou <gui style=\"button\">Text</gui> v poznámce vyberte <gui style="
+"\"menuitem\">Pevná šířka</gui>."
 
-#: C/addins-desktop.page:24(p)
+#: C/addins-formatting-fixed-width.page:37(p)
 msgid ""
-"Desktop Integration addins interact with other applications or websites and "
-"Tomboy."
+"To quickly set any selected text to the Fixed Width font, press "
+"<keyseq><key>Ctrl</key><key>T</key></keyseq>."
 msgstr ""
-"Rozšíření pro integraci do pracovního prostředí komunikují mezi dalšími "
-"aplikacemi, případně weby, a aplikací Tomboy."
+"Rychlým způsobem, jak nastavit vybraný text do písma s pevnou šířkou, je "
+"zmáčknout <keyseq><key>Ctrl</key><key>T</key></keyseq>."
 
-#: C/addins-desktop.page:28(title)
+#: C/addins-desktop-printing.page:7(desc)
+msgid "Send notes to a printer."
+msgstr "Jak poslat poznámku k tisku."
+
+#: C/addins-desktop-printing.page:16(title)
+msgid "Printing Support"
+msgstr "Podpora tisku"
+
+#: C/addins-desktop-printing.page:19(p)
+msgid ""
+"Printing with <app>Tomboy</app> requires that you have connected and "
+"configured your printer. If you have not done this, please consult the <link "
+"href=\"help:gnome-help/printing\">printing help for GNOME</link>."
+msgstr ""
+"Abyste mohli z poznámek <app>Tomboy</app> tisknout, musíte mít připojenou a "
+"správně nastavenou tiskárnu. Pokud tak nemáte, podívejte se prosím <link "
+"href=\"help:gnome-help/printing\">do nápovědy k tisku v GNOME</link>."
+
+#: C/addins-desktop-printing.page:22(p)
+msgid ""
+"You can send <app>Tomboy</app> notes to your printer. This add-in is enabled "
+"by default."
+msgstr ""
+"Své poznámky <app>Tomboy</app> můžete tisknout na své tiskárně. Tento "
+"doplněk je ve výchozím stavu povolen."
+
+#: C/addins-desktop-printing.page:25(title)
+msgid "To print a note:"
+msgstr "Když chcete poznámku vytisknout:"
+
+#: C/addins-desktop-printing.page:30(p)
+msgid ""
+"From the gears icon in the note toolbar, select <gui style=\"menuitem"
+"\">Print</gui>. Alternatively, you can also use the keyboard shortcut "
+"<keyseq><key>Ctrl</key><key>P</key></keyseq>."
+msgstr ""
+"Pod ikonou ozubených kol na nástrojové liště vyberte <gui style=\"menuitem"
+"\">Vytisknout</gui>. Případně můžete použít klávesovou zkratku "
+"<keyseq><key>Ctrl</key><key>P</key></keyseq>."
+
+#: C/addins-desktop-printing.page:37(p)
+msgid ""
+"If you disable this addin you will not be able to print <app>Tomboy</app> "
+"notes."
+msgstr ""
+"V případě, že tento doplněk zakážete, nebude možné poznámky <app>Tomboy</"
+"app> tisknout."
+
+#: C/addins-desktop-bugzilla.page:7(desc)
+msgid "Plugin to automatically link to bugzilla pages."
+msgstr "Zásuvný modul, který automaticky vytváří odkazy do systému bugzilla."
+
+#: C/addins-desktop-bugzilla.page:16(title)
 msgid "Bugzilla Links"
 msgstr "Odkazy do systému Bugzilla"
 
-#: C/addins-desktop.page:29(p)
+#: C/addins-desktop-bugzilla.page:18(p)
 msgid ""
 "The Bugzilla Links addin allows you to drag a Bugzilla URL from your browser "
-"into Tomboy. After dragging a link into a Tomboy note, Tomboy will display "
-"the bug number as an active link next to bug icon to show you this is a "
-"Bugzilla link. Clicking the link in the Tomboy note will open a browser "
-"window taking you to that Bugzilla page."
-msgstr ""
-"Rozšíření <gui>Odkazy do systému Bugzilla</gui> vám umožní přetahovat adresy "
-"URL systému Bugzilla z vašeho webového prohlížeče do aplikace Tomboy. Po "
-"přetažení odkazu do poznámky Tomboy se v poznámce zobrazí číslo chyby v "
-"podobě aktivního odkazu následovaného ikonou symbolizující, že se jedná o "
-"odkaz do systému Bugzilla. Kliknutím na odkaz v poznámce Tomboy se otevře "
-"okno webového prohlížeče s příslušnou stránkou systému Bugzilla."
-
-#: C/addins-desktop.page:37(title)
-msgid "Evolution Mail Integration"
-msgstr "Integrace pošty Evolution"
-
-#: C/addins-desktop.page:38(p)
-msgid ""
-"The Evolution Mail Integration plugin allows you to drag an email from "
-"Evolution into a Tomboy note. Your note will display an envelope icon and "
-"the subject of the note will be displayed as a link. Clicking this link will "
-"open the email using Evolution."
-msgstr ""
-"Zásuvný modul <gui>Integrace pošty Evolution</gui> vám umožňuje přetahovat e-"
-"maily z aplikace Evolution do poznámek Tomboy. Vaše poznámka zobrazí ikonu "
-"obálky a předmět zprávy v podobě odkazu. Kliknutím na odkaz se otevře e-"
-"mailová zpráva pomocí aplikace Evolution."
-
-#: C/addins-desktop.page:45(title)
-msgid "Printing Support"
-msgstr "Podpora tisku"
+"into Tomboy."
+msgstr ""
+"Doplněk Odkazy do systému Bugzilla umožňuje přetáhnout URL Bugzilly z vašeho "
+"webového prohlížeče do poznámky <app>Tomboy</app>."
+
+#: C/addins-desktop-bugzilla.page:23(p)
+msgid ""
+"Drag a bugzilla link containing the bug number from your web browser into a "
+"<app>Tomboy</app> note."
+msgstr ""
+"Přetáhněte odkaz do systému bugzilla, který obsahuje číslo chyby, ze svého "
+"webového prohlížeče to poznámky <app>Tomboy</app>."
 
-#: C/addins-desktop.page:46(p)
+#: C/addins-desktop-bugzilla.page:28(p)
 msgid ""
-"This addin is enabled by default and allows you print notes out. If you "
-"disable this addin you will no longer be able to print notes."
+"<app>Tomboy</app> will display the bug number as an active link next to bug "
+"icon to indicate that this is a <app>Bugzilla</app> link. You can click on "
+"this link to open it in your web browser."
 msgstr ""
-"Toto rozšíření je standardně zapnuté a umožňuje tisk poznámek. Pokud jej "
-"vypnete, nebudete moci poznámky tisknout."
+"<app>Tomboy</app> zobrazí číslo chyby jako aktivní odkaz vedle ikony brouka, "
+"čímž dává najevo, že se jedná o odkaz do systému <app>Bugzilla</app>. "
+"Kliknutím na takovýto odkaz si jej můžete otevřít ve svém webovém prohlížeči."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
 #: C/index.page:0(None)
 msgid "translator-credits"
-msgstr "Marek Černocký <marek at manet.cz>, 2009 – 2012"
+msgstr "Marek Černocký <marek at manet.cz>, 2009 – 2012"
diff --git a/help/cs/delete-notes.page b/help/cs/delete-notes.page
index 8590fb9..cf4a153 100644
--- a/help/cs/delete-notes.page
+++ b/help/cs/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Jak v aplikaci Tomboy odstranit poznámku.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Dokumentační projekt GNOME</name>
       <years>2010</years>
@@ -19,12 +22,22 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Odstranění poznámky</title>    
-  
-  <p>Poznámku můžete odstranit zmáčknutím ikony <gui>Odstranit</gui> na liště nástrojů u poznámky, kterou si přejete odstranit.</p>
-  
-<note style="warning">
-	<p>Odstranění poznámky je trvalé. Po jejím odstranění ji již nelze obnovit.</p> <p>Při odstraňování poznámky budete dotázáni <gui>Opravdu odstranit tuto poznámku?</gui>.</p>  
-</note>
-	
+  <title>Odstranění poznámky</title>
+
+  <p>Pokud si přejete odstranit poznámky, které již nadále nepotřebujete, můžete je z aplikace <app>Tomboy</app> vymazat.</p>
+
+  <steps>
+    <title>Pro odstranění poznámky:</title>
+    <item>
+      <p>Otevřete požadovanou poznámku.</p>
+    </item>
+    <item>
+      <p>Klikněte na ikonu <gui>Odstranit</gui> na nástrojové liště. Budete vyzváni k potvrzení smazání.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Odstranění poznámky je trvalé. Jakmile je jednou poznámka smazána, nelze ji již obnovit.</p>
+  </note>
+
 </page>
diff --git a/help/cs/introduction.page b/help/cs/introduction.page
index e169df4..944781f 100644
--- a/help/cs/introduction.page
+++ b/help/cs/introduction.page
@@ -20,8 +20,8 @@
 
   <title>Úvod</title>
 
-  <p><app>Tomboy</app> je aplikace na poznámky na pracovní ploše pro GNOME, Microsoft Windows a Mac OS X. Je snadno použitelná a pomůže vám uspořádat si své nápady a informace, se kterými pracujete dennodenně.</p>
-  <p><app>Tomboy</app> obsahuje funkce, které vám pomohou si lépe uspořádat a zapamatovat informace a umožní vám provázat poznámky mezi sebou, abyste informace snadněji nalezli. Poznámky si může uspořádat do sešitu, což slouží k jejich jednoduchému seskupení.</p>
+  <p><app>Tomboy</app> je aplikace k psaní poznámek v pracovním prostředí GNOME, Microsoft Windows a Mac OS X. Je snadno použitelná a pomůže vám uspořádat si své nápady a informace, se kterými pracujete dennodenně.</p>
+  <p><app>Tomboy</app> obsahuje funkce, které vám pomohou si lépe roztřídit a zapamatovat informace a umožní vám provázat poznámky mezi sebou, abyste informace snadněji nalezli. Poznámky si může uspořádat do sešitů, což je jednoduchý způsob, jak si je seskupovat.</p>
   <p>Poznámky můžete rovněž synchronizovat mezi více počítači, takže je máte snadno dostupné kdekoliv se nacházíte.</p>
 
   <figure>
diff --git a/help/cs/legal.xml b/help/cs/legal.xml
index 46a7e88..251f70d 100644
--- a/help/cs/legal.xml
+++ b/help/cs/legal.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
+<p>Toto dílo je licencováno pod <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</link>.</p>
+<p>Jako speciální výjimků vám držitel autorských práv uděluje oprávnění kopírovat, upravovat a šířit ukázky kódu obsažené v tomto dokumentu a to bez dalších omezení za podmínek, které si sami zvolíte.</p>
 </license>
diff --git a/help/cs/pin-notes.page b/help/cs/pin-notes.page
new file mode 100644
index 0000000..ef84446
--- /dev/null
+++ b/help/cs/pin-notes.page
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="cs">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Jak se dostat ke svým poznámkám přes ikonu <app>Tomboy</app> na oznamovací liště.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Připíchnutí poznámky</title>
+
+  <p>Po kliknutí na <link xref="">ikonu v oznamovací oblasti</link> se vám zobrazí seznam poznámek <app>Tomboy</app>, které jste použili naposledy. Tento seznam je omezen na dvanáct poznámek. Pokud máte poznámek více než dvanáct, musíte k otevření poznámky, která v tomto seznamu není, použít <link xref="">hledání ve všech poznámkách</link>.</p>
+
+  <p>Pokud potřebujete rychlý přístup k některým méně často používaným poznámkám, můžete si je do seznamu nedávných poznámek <em>připíchnout</em>.</p>
+
+  <steps>
+    <title>Pro připíchnutí poznámky:</title>
+    <item>
+      <p>Klikněte na ikonu <app>Tomboy</app> na oznamovací liště.</p>
+    </item>
+    <item>
+      <p>V seznamu nedávných poznámek klikněte na šedou ikonu připínáčku napravo od poznámky, kterou chcete připíchnout. Barva ikony připínáčku se změní na zelenou.</p>
+    </item>
+  </steps>
+
+  <p>Zelená ikona signalizuje, že daná poznámka je do seznamu <em>připíchnutá</em>.</p>
+
+  <note style="tip">
+    <p>Pro odstranění <em>připíchnuté</em> poznámky ze seznamu stačí kliknout na zelenou ikonu připínáčku.</p>
+  </note>
+
+</page>
diff --git a/help/cs/sync-setup.page b/help/cs/sync-setup.page
index 0253902..ede7d07 100644
--- a/help/cs/sync-setup.page
+++ b/help/cs/sync-setup.page
@@ -11,7 +11,7 @@
     </credit>    
     <credit type="author copyright">
       <name>Dokumentační projekt GNOME</name>
-      <years>2010 – 2012</years>
+      <years>2010 – 2012</years>
     </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
diff --git a/help/cs/sync.page b/help/cs/sync.page
index cecee5a..34f6066 100644
--- a/help/cs/sync.page
+++ b/help/cs/sync.page
@@ -38,8 +38,8 @@
  
  	<title>Automatická synchronizace vašich poznámek</title>
  	
- 	<p>Tomboy může vaše poznámky synchronizovat automaticky na pozadí. Je doporučeno, abyste před tím, než automatické synchronizace zapnete, nastavili, jak se mají řešit konflikty poznámek. O řešení konfliktů mezi poznámkami se můžete poučit na stránce <link xref="sync-setup#conflict"/>.</p>
- 	
+	<p>Tomboy může vaše poznámky synchronizovat automaticky na pozadí. Je doporučeno, abyste před tím, než automatické synchronizace zapnete, nastavili, jak se mají řešit konflikty poznámek. O řešení konfliktů mezi poznámkami se můžete poučit na stránce <link xref="sync-setup#conflict"/>.</p>
+
  	<p>Synchronizaci můžete zapnout otevřením <gui>Předvoleb Tomboy</gui> pomocí kliknutí pravým tlačítkem myši na svém panelu, na pruhu úloh nebo na doku a zvolením <gui>Předvolby</gui> a následným výběrem karty <gui>Synchronizace</gui>. <gui>Předvolby Tomboy</gui> můžete otevřít také z dialogového okna <gui>Hledat ve všech poznámkách</gui>. V nabídce zvolte <guiseq><gui>Upravit</gui><gui>Předvolby</gui></guiseq>.</p>
 	
 	<p>Pokud chcete zapnout automatické synchronizace, zaškrtněte políčko <gui>Automaticky synchronizovat na pozadí každých x minut</gui> na kartě Synchronizace.</p>
diff --git a/help/de/addins-desktop-bugzilla.page b/help/de/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..51cb62a
--- /dev/null
+++ b/help/de/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla-Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/de/addins-desktop-printing.page b/help/de/addins-desktop-printing.page
new file mode 100644
index 0000000..73ee829
--- /dev/null
+++ b/help/de/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Druckunterstützung</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/de/addins-desktop.page b/help/de/addins-desktop.page
deleted file mode 100644
index 3937134..0000000
--- a/help/de/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="de">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins zur Integration mit anderen Anwendungen und Webseiten.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Addins zur Integration in die Arbeitsumgebung</title>
-
-	<p>Add-Ins zur Integration in Arbeitsumgebungen sind für die Zusammenarbeit mit anderen Anwendungen oder zwischen Webseiten und Tomboy zuständig.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla-Links</title>
-  <p>Das Bugzilla-Links-Addin ermöglicht Ihnen, eine Bugzilla-Adresse aus Ihrem Browser in Tomboy zu ziehen. Wenn Sie einen solchen Verweis in eine Tomboy-Notiz gezogen und dort abgelegt haben, stellt Tomboy die Nummer des Bugs als aktiven Verweis neben dem Bug-Symbol dar, um Ihnen anzuzeigen, dass es sich um einen Bugzilla-Verweis handelt. Durch Anklicken dieses Verweises wird ein Browserfenster mit der entsprechenden Bugzilla-Seite geöffnet.</p>
-</section>
-
-<section id="evolution">
-  <title>Integration in Evolution</title>
-  <p>Die Evolution-Integration ermöglicht es Ihnen, eine Nachricht aus Evolution in eine Tomboy-Notiz zu ziehen. Ihre Notiz erhält ein Briefumschlag-Symbol und der Betreff der Notiz wird als Verknüpfung angezeigt. Durch Anklicken dieser Verknüpfung wird die Nachricht in Evolution geöffnet.</p>
-</section>
-
-<section id="printing">
-  <title>Druckunterstützung</title>
-  <p>Dieses Add-In ist standardmäßig aktiviert und ermöglicht Ihnen das Ausdrucken Ihrer Notizen. Falls sie es deaktivieren, werden sie nicht mehr in der Lage sein, Notizen zu drucken.</p>
-</section>
-
-
- </page>
diff --git a/help/de/addins-formatting-fixed-width.page b/help/de/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..bb11209
--- /dev/null
+++ b/help/de/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/de/addins-formatting-underline.page b/help/de/addins-formatting-underline.page
new file mode 100644
index 0000000..1edf9bb
--- /dev/null
+++ b/help/de/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/de/addins-formatting.page b/help/de/addins-formatting.page
deleted file mode 100644
index ae5c445..0000000
--- a/help/de/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="de">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins für zusätzliche Möglichkeiten zur Formatierung Ihrer Notizen.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatierungs-Addins</title>
-
-<section id="fixedwidth">
-  <title>Dicktengleiche-Schrift-Addin</title>
-  <p>Das Feste-Breite-Addin ändert den Text in Ihrer Tomboy-Notiz auf eine feste Breite. Dieses Addin ist standardmäßig deaktiviert. Um es zu aktivieren, klicken Sie auf den <gui>Aktivieren</gui>-Knopf.</p>
-</section>
-
-<section id="underline">
-  <title>Unterstreichen-Addin</title>
-  <p>Das Unterstreichen-Addin ermöglicht Ihnen das Unterstreichen eines bestimmten Texts in Ihrer Notiz mit Hilfe des <gui>Text</gui>-Symbols in der Werkzeugleiste einer Notiz. Dieses Addin ist standardmäßig deaktiviert. Um es zu aktivieren, klicken Sie auf den <gui>Aktivieren</gui>-Knopf. Markieren Sie den Text, den Sie unterstreichen wollen, klicken Sie auf das <gui>Text</gui>-Symbol in der Werkzeugleiste der Notiz und wählen Sie <gui>Unterstreichen</gui> oder drücken Sie <keyseq><key> [...]
-</section>
-
- </page>
diff --git a/help/de/addins-preferences.page b/help/de/addins-preferences.page
new file mode 100644
index 0000000..c2bdfa4
--- /dev/null
+++ b/help/de/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/de/addins-sync-local.page b/help/de/addins-sync-local.page
new file mode 100644
index 0000000..b67f9ae
--- /dev/null
+++ b/help/de/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Abgleichdienst für lokale Ordner</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/de/addins-sync-ssh.page b/help/de/addins-sync-ssh.page
new file mode 100644
index 0000000..262c134
--- /dev/null
+++ b/help/de/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH-Abgleichdienst</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/de/addins-sync-webdav.page b/help/de/addins-sync-webdav.page
new file mode 100644
index 0000000..8aa9490
--- /dev/null
+++ b/help/de/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav-Abgleichdienst</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/de/addins-sync-webservice.page b/help/de/addins-sync-webservice.page
new file mode 100644
index 0000000..4cf3826
--- /dev/null
+++ b/help/de/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web-Abgleichdienst</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/de/addins-sync.page b/help/de/addins-sync.page
deleted file mode 100644
index 13f430f..0000000
--- a/help/de/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="de">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Nutzung zusätzlicher Wege zum Abgleich Ihrer Notizen mit anderen Geräten.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Addins zum Abgleich</title>
-
-	<p>Die Abgleich-Addins bieten Ihnen verschiedene Methoden und Orte zum Abgleich Ihrer Tomboy-Notizen. Weitere Informationen zur Konfiguration solcher Abgleichvorgänge finden Sie in <link xref="sync-notes"/>.</p>
-
-
-<section id="local">
-  <title>Abgleichdienst für lokale Ordner</title>
-  <p>Der lokale Abgleichdienst ist standardmäßig aktiviert und ermöglicht Tomboy den Abgleich seiner Notizen mit anderen Ordnern auf Ihrem Rechner. Dies ist hilfreich zur Erstellung von Sicherungskopien Ihrer Notizen.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH-Abgleichdienst</title>
-  <p>Der SSH-Abgleichdienst ermöglicht Ihnen den Abgleich Ihrer Notizen mit einem anderen Rechner über das SSH-Protokoll. Dieses Plugin ist standardmäßig deaktiviert. Um die Funktionsfähigkeit sicherzustellen, müssen Sie das <em>sshfs</em>-Paket Ihrer Distribution installieren. Weiterführende Informationen hierzu stellt dieses Hilfedokument nicht bereit.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav-Abgleichdienst</title>
-  <p>Der WebDav-Abgleichdienst ist standardmäßig aktiviert und ermöglicht Ihnen den Abgleich Ihrer Notizen mit einem entfernten WebDav-Server. Um die Funktionsfähigkeit sicherzustellen, müssen Sie das Paket des <em>wdfs-FUSE-Dateisystems</em> Ihrer Distribution installieren. Weiterführende Informationen hierzu stellt dieses Hilfedokument nicht bereit.</p>
-</section>
-
-<section id="webservice">
-  <title>Web-Abgleichdienst</title>
-  <p>Der Web-Abgleichdienst ermöglicht Ihnen den Abgleich Ihrer Notizen mit einem entfernten Webserver oder -dienst, wie beispielsweise Tomboy Online. Zum Zeitpunkt der Erstellung dieses Dokuments war der Tomboy-Onlinedienst noch nicht verfügbar.</p>
-</section>
-
- </page>
diff --git a/help/de/addins-tools-backlinks.page b/help/de/addins-tools-backlinks.page
new file mode 100644
index 0000000..5a9f6e2
--- /dev/null
+++ b/help/de/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/de/addins-tools-html-export.page b/help/de/addins-tools-html-export.page
new file mode 100644
index 0000000..c6b6b9d
--- /dev/null
+++ b/help/de/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>In HTML exportieren</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/de/addins-tools-note-of-day.page b/help/de/addins-tools-note-of-day.page
new file mode 100644
index 0000000..26b261d
--- /dev/null
+++ b/help/de/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Note of the Day</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/de/addins-tools-timestamp.page b/help/de/addins-tools-timestamp.page
new file mode 100644
index 0000000..1f5a56e
--- /dev/null
+++ b/help/de/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Zeitstempel einfügen</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/de/addins-tools.page b/help/de/addins-tools.page
deleted file mode 100644
index 918b919..0000000
--- a/help/de/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="de">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Zusätzliche Funktionalität zu Notizen aktivieren.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy-Werkzeuge-Addins</title>
-
-	<p>Addins fügen zusätzliche Funktionalität zu Ihren Tomboy-Notizen hinzu.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>Das Addin <gui>Was zeigt hier hin?</gui> ist standardmäßig aktiviert und zeigt Ihnen an, welche Notizen mit derjenigen Notiz verknüpft sind, welche Sie gerade betrachten.</p> 
-  </section>
-
-<section id="html-export">
-  <title>In HTML exportieren</title>
-  <p>Das Addin <gui>In HTML exportieren</gui> ist standardmäßig aktiviert und exportiert eine Notiz in das HTML-Format.</p>
-	<p>Um eine Notiz in das HTML-Format zu exportieren, klicken Sie auf das <gui>Werkzeuge</gui>-Symbol in der Werkzeugleiste einer Notiz und wählen Sie <gui>In HTML exportieren</gui>. Daraufhin wird ein Dialog zum Speichern der Notiz angezeigt. Wählen Sie den Ordner, in welchem Sie die Notiz speichern wollen und ändern Sie den Namen der neuen HTML-Datei, falls Sie sie unter einem anderen Namen als die eigentliche Notiz speichern wollen. Die Notiz wird dann als eine HTML-Datei gespeichert u [...]
-</section>
-
-<section id="timestamp">
-  <title>Zeitstempel einfügen</title>
-  <p>Das Addin <gui>Zeitstempel einfügen</gui> ist standardmäßig deaktiviert. Um es zu aktivieren, wählen Sie das Addin <gui>Zeitstempel einfügen</gui> in den Tomboy-Einstellungen aus und klicken Sie auf <gui>Aktivieren</gui>.</p>
-	<p>Um Ihre Notizen mit einem Zeitstempel zu versehen, klicken Sie auf das <gui>Werkzeuge</gui>-Symbol in der Werkzeugleiste einer Notiz und wählen Sie <gui>Zeitstempel einfügen</gui> oder drücken Sie <key>STRG + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Note of the Day</title>
-  <p>Das Addin <gui>Note of the Day</gui> ist standardmäßig deaktiviert. Zum Aktivieren wählen Sie das Addin <gui>Note of the Day</gui> in den Tomboy-Einstellungen aus und klicken Sie auf <gui>Aktivieren</gui>.</p>
-	<p>Das Addin <gui>Note of the Day</gui> erzeugt eine neue Notiz mit einem dem Schema <em>Heute: Montag, 26. Juli 2010</em> folgenden Titel. Zur Notiz werden außerdem Zeilen für <em>Aufgaben</em> und <em>Termine</em> automatisch hinzugefügt.</p>
-</section>
-
-<section id="watcher">
-  <title>Notizordner-Überwachung</title>
-  <p>Das Addin zur Notizordner-Überwachung überwacht den Ordner, in dem Ihre Tomboy-Notizen gespeichert sind. Falls das Addin Änderungen an Ihren Notizen feststellt, werden diese Änderungen wirksam und in Ihren Notizen dargestellt. Dieses Addin wird üblicherweise von Abgleichdiensten von Drittanbietern wie Dropbox genutzt. Informationen zur Nutzung solcher Dienste werden von diesem Hilfedokument nicht bereitgestellt.</p>
-</section>
-
- </page>
diff --git a/help/de/addins.page b/help/de/addins.page
index 46aa29f..9ab9bf5 100644
--- a/help/de/addins.page
+++ b/help/de/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Zusätzliche Funktionalität zu <app>Tomboy</app> hinzufügen.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy-Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy-Addins</title>
-    </info>
-    <title>Addins für Tomboy verwalten</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/de/delete-notes.page b/help/de/delete-notes.page
index d3c49ea..e3adb91 100644
--- a/help/de/delete-notes.page
+++ b/help/de/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Eine Notiz in Tomboy löschen</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME-Dokumentationsprojekt</name>
       <years>2010</years>
@@ -19,12 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Eine Notiz löschen</title>    
-  
-  <p>Sie können eine Notiz löschen, indem Sie auf das <gui>Löschen</gui>-Symbol in der Werkzeugleiste der Notiz klicken, welche Sie löschen wollen.</p>
-  
-<note style="warning">
-	<p>Eine Notiz wird stets dauerhaft gelöscht. Nach dem Löschen lässt sich eine Notiz nicht wiederherstellen.</p> <p>Beim Löschen einer Notiz wird Ihnen die Frage <gui>Diese Notiz wirklich löschen?</gui> gestellt.</p>  
-</note>
-	
+  <title>Eine Notiz löschen</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/de/introduction.page b/help/de/introduction.page
index 10eae62..bee8615 100644
--- a/help/de/introduction.page
+++ b/help/de/introduction.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> ist eine grafische Anwendung für GNOME, Microsoft Windows und Mac OS X zum Erfassen von Notizzetteln. Sie ist einfach und leicht zu bedienen und erlaubt es Ihnen, Ideen und Informationen zu verwalten, mit denen Sie tagtäglich umgehen.</p>
   <p><app>Tomboy</app> verfügt über Funktionsmerkmale, die Ihnen beim Organisieren und Erinnern an Ihre Informationen helfen. Außerdem können Sie Ihre Notizen miteinander verknüpfen, um die Suche und Sortierung Ihrer Informationen zu erleichtern. Sie können mehrere Notizen zwecks Gruppierung in einem Notizbuch zusammenfassen.</p>
-  <p>Sie können Ihre Notizen auch zwischen mehreren Rechnern abgleichen. Auf diese Weise können Sie auf Ihre Notizen zugreifen, wo immer Sie sich gerade befinden.</p>
+  <p>
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
+  </p>
 
   <figure>
     <title><gui>Tomboy-Notizen</gui>-Fenster</title>
diff --git a/help/de/pin-notes.page b/help/de/pin-notes.page
new file mode 100644
index 0000000..b9236f7
--- /dev/null
+++ b/help/de/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="de">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/de/sync-setup.page b/help/de/sync-setup.page
index cc53da3..98c66d2 100644
--- a/help/de/sync-setup.page
+++ b/help/de/sync-setup.page
@@ -24,7 +24,14 @@
 	
 	<p><app>Tomboy</app> kann Ihre Notizen auf mehreren Rechnern abgleichen. So wird eine Sicherheitskopie Ihrer Notizen auf anderen Rechnern ermöglicht und es können Notizen gemeinsam auf mehreren Rechnern verwendet werden, so dass Sie stets Zugriff auf Ihre Notizen haben.</p>
 	
-	<p>Um den Abgleich zu aktivieren, öffnen Sie die <gui>Tomboy-Einstellungen</gui> durch einen Klick mit der rechten Maustaste auf das Tomboy-Symbol in Ihrem Panel, Ihrer Taskbar oder Ihrem Dock und wählen Sie <gui>Einstellungen</gui>. Wählen Sie anschließend den Reiter <gui>Abgleich</gui>. Sie können die <gui>Tomboy-Einstellungen</gui> auch aus dem Dialog <gui>Alle Notizen durchsuchen</gui> heraus öffnen. Wählen Sie hierzu <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq>.</p>
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </section>
 
@@ -41,7 +48,10 @@
 		<item><p><gui>Meine lokale Notiz umbenennen.</gui> Wenn diese Option gewählt ist, so wird Tomboy automatisch die Notiz durch die Kopie des entfernten Rechners ersetzen und die Notiz auf Ihrem Rechner umbenennen. Dadurch wird Ihnen der Inhalt Ihrer Notiz nicht verloren gehen.</p>
 		</item>
 		
-		<item><p><gui>Meine lokale Notiz mit derjenigen des Servers ersetzen.</gui>. Wenn diese Option gewählt ist, so wird Tomboy beim Abgleichen Ihre Notiz überschreiben und durch eine Kopie der Notiz des entfernten Rechners ersetzen.</p>
+		<item><p><gui>Replace my local note with the server's update.</gui>
+  		If you have selected this option, when you synchronize, 
+		Tomboy will overwrite and replace your note stored on your
+		computer with a copy from the remote computer.</p>
 		
 		<note style="warning">
 		<p>Automatisches Überschreiben der Notiz ist unwiderruflich. Ihre lokale Notiz wird durch die des entfernten Rechners ersetzt und Sie werden Ihre vor dem Abgleich gespeicherten Informationen verlieren.</p>
@@ -71,7 +81,17 @@
 	
 	<p>Es wird empfohlen, dass ein dritter Rechner oder Server als Gegenstelle zum Speichern der abgeglichenen Notizen verwendet wird, welche zwischen mehreren Rechnern abgeglichen werden sollen.</p>
 
-	<p>Öffnen Sie <app>Passwörter und Verschlüsselung</app> im Menü <guiseq><gui>System</gui><gui>Einstellungen</gui><gui>Passwörter und Verschlüsselung</gui></guiseq>. Klicken Sie auf Ihren Schlüssel und wählen Sie im Menü <guiseq><gui>Entfernt</gui><gui>Schlüssel für Secure Shell konfigurieren</gui></guiseq> und geben Sie unter <gui>Rechnername</gui> den Domänennamen oder die IP-Adresse des Rechners ein, mit dem Sie abgleichen möchten. Geben Sie den Benutzernamen des entfertnen Rechners u [...]
+	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
+	<guiseq><gui>Applications</gui><gui>Accessories</gui>
+	<gui>Passwords and Encryption Keys</gui></guiseq>.  
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
+	</p>
 	
 	<p>Wählen Sie in Tomboy <gui>SSH</gui> in der Auswahlliste <gui>Service</gui>. Vervollständigen Sie die Verbindungsinformationen Ihres Servers und klicken Sie auf <gui>Speichern</gui>. Der <gui>Ordnerpfad</gui> ist optional, sollte aber auf einen leeren Ordner verweisen. Sie können nun Ihre Notizen abgleichen.</p>
 
diff --git a/help/de/sync.page b/help/de/sync.page
index ee03c82..e3a6d3a 100644
--- a/help/de/sync.page
+++ b/help/de/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Notizen manuell abgleichen</title>
 	
-	<p>Sie haben drei Möglichkeiten, Ihre Notizen abzugleichen:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>Klicken Sie in einer beliebigen Notiz auf das <gui>Werkzeuge</gui>-Symbol und wählen Sie <gui>Notizen abgleichen</gui>.</p></item>
@@ -38,13 +38,26 @@
  
  	<title>Ihre Notizen automatisch abgleichen</title>
  	
- 	<p>Tomboy kann Ihre Notizen automatisch im Hintergrund abgleichen. Es ist empfehlenswert, zunächst das Verhalten bei Notizkonflikten einzustellen, bevor Sie erstmals einen solchen automatischen Abgleich vornehmen. Weitere Informationen hierzu finden Sie auf der Seite <link xref="sync-setup#conflict"/>.</p>
- 	
- 	<p>Um den Abgleich zu aktivieren, öffnen Sie die <gui>Tomboy-Einstellungen</gui> durch einen Klick mit der rechten Maustaste auf das Tomboy-Symbol in Ihrem Panel, Ihrer Taskbar oder Ihrem Dock und wählen Sie <gui>Einstellungen</gui>. Wählen Sie anschließend den Reiter <gui>Abgleich</gui>. Sie können die <gui>Tomboy-Einstellungen</gui> auch aus dem Dialog <gui>Alle Notizen durchsuchen</gui> heraus öffnen. Wählen Sie hierzu <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq>.</p>
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 	
 	<p>Um den automatischen Abgleich einzuschalten, aktivieren Sie das Ankreuzfeld <gui>Automatisch im Hintergrund abgleichen alle … Minuten</gui> am unteren Rand des Reiters <gui>Abgleich</gui>.</p>
 	
-	<p>Die Vorgabeoption für Tomboy ist, den automatischen Abgleich alle 10 Minuten auszuführen. Um anzupassen, wie oft der Abgleich ausgeführt werden soll, geben Sie die Anzahl der Minuten im Dialog ein oder benutzen Sie die Maus, um die Zeitspanne zu vergrößern oder zu verkleinern.</p>
+	<p>Tomboy's default option is to autosync every 10 minutes.  To change
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>Um den automatischen Abgleich auszuschalten, deaktivieren Sie das Ankreuzfeld <gui>Automatisch im Hintergrund abgleichen alle … Minuten</gui>.</p>
 	
diff --git a/help/de/whatsnew.page b/help/de/whatsnew.page
index a42ccd4..a301f7e 100644
--- a/help/de/whatsnew.page
+++ b/help/de/whatsnew.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> bringt eine Anzahl von Verbesserungen mit. <app>Tomboy</app> startet nun deutlich schneller, weil im Startvorgang einige Änderungen vorgenommen worden sind.</p>
   <p>Das Kopieren und Einfügen von <app>Tomboy</app> in andere Anwendungen wurde verbessert, um die Formatierung in anderen Anwendungen zu erleichtern. Hierbei geht es vor allem um die HTML-Formatierung für <app>Evolution</app>, <app>OpenOffice.org</app> und weitere.</p>
-  <p><app>Tomboy</app> kann nun Ihre Notizen automatisch abgleichen, sofern Sie diesen Abgleich aktiviert haben.</p>
+  <p>
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
+  </p>
 
   <p>Unterstützung für Sprunglisten in Microsoft Windows 7 wurde hinzugefügt, was Ihnen den Zugriff auf Ihre Notizen erleichtert und Ihnen ermöglicht, aus der Windows-Taskbar heraus schneller direkt eine neue Notiz zu erstellen oder eine Notiz zu durchsuchen.</p>
 
diff --git a/help/el/addins-desktop-bugzilla.page b/help/el/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..7b77a2d
--- /dev/null
+++ b/help/el/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Σύνδεσμοι Bugzilla</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/el/addins-desktop-printing.page b/help/el/addins-desktop-printing.page
new file mode 100644
index 0000000..a746db9
--- /dev/null
+++ b/help/el/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Υποστήριξη εκτύπωσης</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/el/addins-desktop.page b/help/el/addins-desktop.page
deleted file mode 100644
index 4f8cb99..0000000
--- a/help/el/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="el">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Πρόσθετες λειτουργίες για συνεργασία με άλλες εφαρμογές και ιστοσελίδες.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Πρόσθετες λειτουργίες ολοκλήρωσης επιφάνειας εργασίας</title>
-
-	<p>Οι πρόσθετες λειτουργίες ολοκλήρωσης επιφανειών εργασίας αλληλεπιδρούν με άλλες εφαρμογές ή ιστοσελίδες και το Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Σύνδεσμοι Bugzilla</title>
-  <p>Η πρόσθετη λειτουργία Σύνδεσμοι Bugzilla σας επιτρέπει να μεταφέρετε μία διεύθυνση Bugzilla από το περιηγητή σας στο Tomboy. Ύστερα από τη μεταφορά ενός συνδέσμου σε μία σημείωση Tomboy, το Tomboy θα εμφανίσει τον αριθμό σφάλματος ως ενεργό σύνδεσμο δίπλα στο σφάλμα για να σας υποδείξει ότι αυτό είναι ένας σύνδεσμος του Bugzilla. Κάνοντας κλικ στο σύνδεσμο αυτόν στη σημείωση του Tomboy, θα ανοίξει ένα παράθυρο περιηγητή με τη συγκεκριμένη σελίδα Bugzilla.</p>
-</section>
-
-<section id="evolution">
-  <title>Ολοκλήρωση ηλεκτρονικής αλληλογραφίας Evolution</title>
-  <p>Η πρόσθετη λειτουργία ολοκλήρωσης ηλεκτρονικής αλληλογραφίας Evolution σας επιτρέπει να μεταφέρετε ένα ηλεκτρονικό γράμμα από το Evolution σε μία σημείωση του Tomboy. Η σημείωσή σας θα εμφανίσει ένα εικονίδιο φακέλου και το θέμα της σημείωσης θα εμφανιστεί ως σύνδεσμος. Κάνοντας κλικ σε αυτόν το σύνδεσμο θα ανοίξει το ηλεκτρονικό γράμμα χρησιμοποιώντας το Evolution.</p>
-</section>
-
-<section id="printing">
-  <title>Υποστήριξη εκτύπωσης</title>
-  <p>Η πρόσθετη αυτή λειτουργία είναι εξ ορισμού ενεργοποιημένη και σας επιτρέπει να εκτυπώνετε τις σημειώσεις σας. Αν την απενεργοποιήσετε δεν θα μπορείτε πλέον να εκτυπώσετε σημειώσεις.</p>
-</section>
-
-
- </page>
diff --git a/help/el/addins-formatting-fixed-width.page b/help/el/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..5711727
--- /dev/null
+++ b/help/el/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/el/addins-formatting-underline.page b/help/el/addins-formatting-underline.page
new file mode 100644
index 0000000..635b114
--- /dev/null
+++ b/help/el/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/el/addins-formatting.page b/help/el/addins-formatting.page
deleted file mode 100644
index aa706d4..0000000
--- a/help/el/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="el">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Πρόσθετες λειτουργίες για προσθήκη μορφοποίησης σημειώσεων</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Μορφοποίηση πρόσθετων λειτουργιών</title>
-
-<section id="fixedwidth">
-  <title>Πρόσθετη λειτουργία σταθερού πλάτους</title>
-  <p>Η σταθερή πρόσθετη λειτουργία πλάτους τροποποιεί το κείμενό σας για να έχει σταθερό πλάτος στη σημείωση Tomboy. Αυτή η πρόσθετη λειτουργία εξ ορισμού είναι απενεργοποιημένη. Για να την ενεργοποιήσετε, πιέστε το κουμπί <gui>Ενεργοποίηση</gui>.</p>
-</section>
-
-<section id="underline">
-  <title>Υπογράμμιση πρόσθετης λειτουργίας</title>
-  <p>Η πρόσθετη λειτουργία υπογράμμισης σας επιτρέπει να υπογραμμίζετε κάποιο κείμενο στη σημείωσή σας χρησιμοποιώντας το εικονίδιο <gui>Κείμενο</gui> στην εργαλειοθήκη μίας σημείωσης. Αυτή η πρόσθετη λειτουργία είναι απενεργοποιημένη εξ ορισμού. Για να την ενεργοποιήσετε, πιέστε το κουμπί <gui>Ενεργοποίηση</gui>. Επισημάνετε το κείμενο που θέλετε να υπογραμμίσετε, πιέστε το εικονίδιο <gui>Κείμενο</gui> στην εργαλειοθήκη της σημείωσης και, επιλέξτε <gui>Υπογράμμιση</gui> ή πιέστε το συνδ [...]
-</section>
-
- </page>
diff --git a/help/el/addins-preferences.page b/help/el/addins-preferences.page
new file mode 100644
index 0000000..a2ad26f
--- /dev/null
+++ b/help/el/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/el/addins-sync-local.page b/help/el/addins-sync-local.page
new file mode 100644
index 0000000..13af494
--- /dev/null
+++ b/help/el/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Υπηρεσία συγχρονισμού τοπικού καταλόγου</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/el/addins-sync-ssh.page b/help/el/addins-sync-ssh.page
new file mode 100644
index 0000000..4df3c93
--- /dev/null
+++ b/help/el/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Υπηρεσία συγχρονισμού SSH</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/el/addins-sync-webdav.page b/help/el/addins-sync-webdav.page
new file mode 100644
index 0000000..e05b870
--- /dev/null
+++ b/help/el/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Υπηρεσία συγχρονισμού Webdav</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/el/addins-sync-webservice.page b/help/el/addins-sync-webservice.page
new file mode 100644
index 0000000..81a5736
--- /dev/null
+++ b/help/el/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Υπηρεσία συγχρονισμού με το διαδίκτυο</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/el/addins-sync.page b/help/el/addins-sync.page
deleted file mode 100644
index e0d1f00..0000000
--- a/help/el/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="el">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Ενεργοποίηση επιπρόσθετων τρόπων για το συγχρονισμό των σημειώσεών σας με άλλες συσκευές.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Πρόσθετες λειτουργίες συγχρονισμού</title>
-
-	<p>Οι πρόσθετες λειτουργίες συγχρονισμού σας επιτρέπουν να επιλέξετε διάφορες μεθόδους και τοποθεσίες για το συγχρονισμό των σημειώσεών σας στο Tomboy. Για περισσότερες πληροφορίες όσον αφορά τη ρύθμιση του συγγχρονισμού, επισκεφτείτε τη σελίδα βοήθειας <link xref="sync-notes"/>.</p>
-
-
-<section id="local">
-  <title>Υπηρεσία συγχρονισμού τοπικού καταλόγου</title>
-  <p>Η υπηρεσία συγχρονισμού τοπικού καταλόγου είναι εξ ορισμού ενεργοποιημένη και επιτρέπει στο Tomboy να συγχρονίζει τις σημειώσεις του σε κάποιον άλλο κατάλογο στον υπολογιστή σας. Αυτό είναι πολύ χρήσιμο για να δημιουργήσετε ένα αντίγραφο ασφαλείας για τις σημειώσεις σας.</p>
-</section>
-
-<section id="ssh">
-  <title>Υπηρεσία συγχρονισμού SSH</title>
-  <p>Η υπηρεσία συγχρονισμού SSH σας επιτρέπει να συγχρονίσετε τις σημειώσεις σας με άλλον υπολογισστή μέσω του πρωτοκόλλου SSH. Η πρόσθετη αυτή λειτουργία είναι εξ ορισμού απενεργοποιημένη. Ενδεχομένως να πρέπει να εγκαταστήσετε το πακέτο <em>sshfs</em> για τη διανομή Linux σας για να μπορεί να δουλέψει αυτή η πρόσθετη λειτουργία, κάτι το οποίο δεν συμπεριλαμβάνεται στους σκοπούς αυτού του εγγράφου βοήθειας.</p>
-</section>
-
-<section id="webdav">
-  <title>Υπηρεσία συγχρονισμού Webdav</title>
-  <p>Η πρόσθετη λειτουργία συγχρονισμού Webdav είναι εξ ορισμού ενεργοποιημένη και σας επιτρέπει να συγχρονίσετε τις σημειώσεις σας με ένα απομακρυσμένο διακομιστή Webdav. Ενεδεχομένως να πρέπει να έχετε εγκατεστημένο το πακέτο <em>σύστημα αρχείων wdfs FUSE</em> για τη διανομή LLinux σας για να δουλέχει αυτή η πρόσθετη λειτουργία, κάτι το οποίο δε συμπεριλαμβάνεται στους σκοπούς αυτού του εγγράφου βοήθειας.</p>
-</section>
-
-<section id="webservice">
-  <title>Υπηρεσία συγχρονισμού με το διαδίκτυο</title>
-  <p>Η υπηρεσία συγχρονισμού με το διαδίκτυο σας επιτρέπει να συγχρονίσετε τις σημειώσεις σας σε ένα απομακρυσμένο διακομιστή ή υπηρεσία του διαδικτύου, όπως το διαδικτυακό Tomboy. Κατά την πληκτρολόγηση, η διαδικτυακή υπηρεσία Tomboy δεν έχει εκτελεστεί.</p>
-</section>
-
- </page>
diff --git a/help/el/addins-tools-backlinks.page b/help/el/addins-tools-backlinks.page
new file mode 100644
index 0000000..54c3b59
--- /dev/null
+++ b/help/el/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/el/addins-tools-html-export.page b/help/el/addins-tools-html-export.page
new file mode 100644
index 0000000..dc875e9
--- /dev/null
+++ b/help/el/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Εξαγωγή σε HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/el/addins-tools-note-of-day.page b/help/el/addins-tools-note-of-day.page
new file mode 100644
index 0000000..c8a831f
--- /dev/null
+++ b/help/el/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Σημείωση της ημέρας</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/el/addins-tools-timestamp.page b/help/el/addins-tools-timestamp.page
new file mode 100644
index 0000000..8537ba2
--- /dev/null
+++ b/help/el/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Εισαγωγή υπόδειξης χρόνου</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/el/addins-tools.page b/help/el/addins-tools.page
deleted file mode 100644
index dfe2ee3..0000000
--- a/help/el/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="el">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Ενεργοποίηση πρόσθετης λειτουργικότητας σημειώσεων.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Πρόσθετες λειτουργίες εργαλείων Tomboy</title>
-
-	<p>Πρόσθετες λειτουργίες εργαλείων και πρόσθετη λειτουργικότητα για τις σημειώσεις σας στο Tomboy.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>Η πρόσθετη λειτουργία <gui>Σύνδεσμοι επιστροφής</gui> είναι εξ ορισμού ενεργοποιημένη και σας επιτρέπει να δείτε ποιες σημειώσεις συνδέονται με τη σημείωση που βλέπετε αυτή τη στιγμή.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Εξαγωγή σε HTML</title>
-  <p>Η πρόσθετη λειτουργία <gui>Εξαγωγή σε HTML</gui> είναι εξ ορισμού ενεργοποιημένη και θα εξάγει μία συγκεκριμένη σημείωση σε HTML.</p>
-	<p>Για να εξάγετε μία σημείωση σε HTML, πιέστε το εικονίδιο <gui>Εργαλεία</gui> στην εργαλειοθήκη της σημείωσης και επιλέξτε <gui>Εξαγωγή σε HTML</gui>. Θα εμφανιστεί άμεσα ένα παράθυρο διαλόγου για την αποθήκευση της σημείωσης. Επιλέξτε τον κατάλογο που επιθυμείτε να αποθηκευτεί η σημείωση και τροποποιήστε το όνομα του νέου html αρχείου της σημείωσης αν επιθυμείτε αυτό να είναι διαφορετικό από το υπάρχον όνομά της. Η σημείωση θα αποθηκευτεί ως HTML αρχείο και θα εμφανιστεί αυτόματα στο [...]
-</section>
-
-<section id="timestamp">
-  <title>Εισαγωγή υπόδειξης χρόνου</title>
-  <p>Η πρόσθετη λειτουργία <gui>Εισαγωγή υπόδειξης χρόνου</gui> είναι εξ ορισμού απενεργοποιημένη. Για να την ενεργοποιήσετε, επιλέξτε την πρόσθετη λειτουργία <gui>Εισαγωγή υπόδειξης χρόνου</gui> και ύστερα πιέστε την <gui>Ενεργοποίηση</gui> στις προτιμήσεις του Tomboy.</p>
-	<p>Για να προσθέσετε μία υπόδειξη χρόνου στις σημειώσεις σας, πιέστε το εικονίδιο <gui>Εργαλεία</gui> στην εργαλειοθήκη της σημείωσης και επιλέξτε <gui>Εισαγωγή υπόδειξης χρόνου</gui> ή πιέστε το συνδυασμό πλήκτρων <key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Σημείωση της ημέρας</title>
-  <p>Η πρόσθετη λειτουργία <gui>Σημείωση της ημέρας</gui> είναι εξ ορισμού απενεργοποιημένη. Για να την ενεργοποιήσετε, επιλέξτε την πρόσθετη λειτουργία <gui>Σημείωση της ημέρας</gui> και ύστερα πιέστε <gui>Ενεργοποίηση</gui> στις προτιμήσεις του Tomboy.</p>
-	<p>Η πρόσθετη λειτουργία <gui>Σημείωση της ημέρας</gui> θα δημιουργεί μία νέα σημείωση καθημερινά με τον τίτλο <em>Σήμερα: Πέμπτη, 21 Ιανουαρίου 2010</em> για παράδειγμα. Η σημείωση θα προσθέσει επίσης συτόματα γραμμές για <em>Εργασίες</em> και <em>Ραντεβού</em>.</p>
-</section>
-
-<section id="watcher">
-  <title>Παρακολούθηση καταλόγου σημειώσεων</title>
-  <p>Η πρόσθετη λειτουργία Παρακολούθηση καταλόγου σημειώσεων σαρώνει τον κατάλογο στον οποίο έχετε αποθηκεύσει τις σημειώσεις του Tomboy. Αν η πρόσθετη λειτουργία εντοπίσει αλλαγές στις σημειώσεις σας, θα εφαρμόσει τις αλλαγές αυτές και αυτές να εμφανίζονται στις σημειώσεις σας. Η πρόσθετη λειτουργία αυτή χρησιμοποιείται τυπικά με υπηρεσίες συγχρονισμού του 3ου μέρους όπως το Dropbox. Η ρύθμιση τέτοιου είδους υπηρεσιών δε συμπεριλαμβάνεται στους σκοπούς αυτής της βοήθειας.</p>
-</section>
-
- </page>
diff --git a/help/el/addins.page b/help/el/addins.page
index 90736e4..0ee99df 100644
--- a/help/el/addins.page
+++ b/help/el/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Προσθήκη πρόσθετης λειτουργικότητας στο Tomboy</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Πρόσθετες λειτουργίες Tomboy</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Πρόσθετες λειτουργίες Tomboy</title>
-    </info>
-    <title>Διαχείριση πρέσθετων λειτουργιών για το Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/el/delete-notes.page b/help/el/delete-notes.page
index cc18220..05c23d5 100644
--- a/help/el/delete-notes.page
+++ b/help/el/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Διαγραφή σημείωσης στο Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Έργο Τεκμηρίωσης GNOME</name>
       <years>2010</years>
@@ -19,12 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Διαγραφή σημείωσης</title>    
-  
-  <p>Μπορείτε να διαγράψετε μία σημείωση πιέζοντας το εικονίδιο <gui>Διαγραφή</gui> στην εργαλειοθήκη της σημείωσης που επιθυμείτε να διαγράψετε.</p>
-  
-<note style="warning">
-	<p>Η διαγραφή μίας σημείωσης είναι μόνιμη. Ύστερα από τη διαγραφή, η σημείωση δεν είναι ανακτήσιμη.</p> <p>Θα ειδοποιηθείτε <gui>Είστε βέβαιος πως θέλετε να διαγράψετε αυτήν την σημείωση;</gui> όταν διαγράφετε μία σημείωση.</p>  
-</note>
-	
+  <title>Διαγραφή σημείωσης</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/el/introduction.page b/help/el/introduction.page
index 1498dd7..e912bdd 100644
--- a/help/el/introduction.page
+++ b/help/el/introduction.page
@@ -22,7 +22,10 @@
 
   <p>Το <app>Tomboy</app> είναι μια εφαρμογή λήψης σημειώσεων για την επιφάνεια εργασίας του GNOME, του Microsoft Windows, και του Mac OS X. Το <app>Tomboy</app> είναι απλό και εύκολο στη χρήση, και σας επιτρέπει να οργανώνετε τις ιδέες και τις πληροφορίες τις οποίες μεταχειρίζεστε καθημερινά.</p>
   <p>Το <app>Tomboy</app> συμπεριλαμβάνει χαρακτηριστικά που σας βοηθούν να οργανώνετε καλύτερα και να απομνημονεύετε τις πληροφορίες σας, ενώ σας επιτρέπει να συνδέετε τις σημειώσεις σας ώστε να κάνετε πιο εύκολο τον τρόπο εύρεσης και ταξινόμησης των πληροφοριών σας. Μπορείτε επίσης να οργανώσετε πολλαπλές σημειώσεις σε ένα σημειωματάριο για να είναι πιο εύκολη η ομαδοποίησή τους.</p>
-  <p>Μπορείτε επίσης να συγχρονίσετε τις σημειώσεις μεταξύ πολλών υπολογιστών, κάνοντας εύκολα την πρόσβασή σας στις σημειώσεις οπουδήποτε κι αν βρίσκεστε.</p>
+  <p>
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
+  </p>
 
   <figure>
     <title>Το παράθυρο για τις <app>Σημειώσεις Tomboy</app></title>
diff --git a/help/el/pin-notes.page b/help/el/pin-notes.page
new file mode 100644
index 0000000..b313646
--- /dev/null
+++ b/help/el/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="el">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/el/sync-setup.page b/help/el/sync-setup.page
index 5abe810..9ab478a 100644
--- a/help/el/sync-setup.page
+++ b/help/el/sync-setup.page
@@ -24,7 +24,14 @@
 	
 	<p>Το <app>Tomboy</app> μπορεί να συγχρονίσει τις σημειώσεις σας μεταξύ πολλών υπολογιστών. Σας επιτρέπει να έχετε ένα αντίγραφο ασφαλείας των σημειώσεων σας σε άλλο υπολογιστή ή να διαμοιραστείτε από κοινού τις σημειώσεις σας και να έχετε πάντα πρόσβαση σε αυτές.</p>
 	
-	<p>Μπορείτε να ενεργοποιήσετε το συγχρονισμό ανοίγοντας τις <gui>Προτιμήσεις Tomboy</gui> χρησιμοποιώντας το ποντίκι σας με δεξί κλικ στο εικονίδιο του Tomboy στον πίνακα εφαρμογών σας, τη γραμμή εργασιών ή το dock και επιλέξτε <gui>Προτιμήσεις</gui> και ύστερα την καρτέλα <gui>Συγχρονισμός</gui>. Μπορείτε επίσης να ανοίξετε τις <gui>Προτιμήσεις Tomboy</gui> από το διάλογο <gui>Αναζήτηση σε όλες τις σημειώσεις</gui>. Από το μενού επιλέξτε <guiseq><gui>Επεξεργασία</gui><gui>Προτιμήσεις</ [...]
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </section>
 
@@ -41,7 +48,10 @@
 		<item><p><gui>Μετονομασία της τοπικής μου σημείωσης.</gui> Αν είναι επιλεγμένη αυτή η επιλογή, το Tomboy θα αντικαταστήσει αυτόματα τη σημείωση με ένα αντίγραφο από τον απομακρυσμένο υπολογιστή και θα μετονομάσει τη σημείωση στον υπολογιστή σας, έτσι ώστε να μη χάσετε τις πληροφορίες της σημείωσης.</p>
 		</item>
 		
-		<item><p><gui>Αντικατάσταση της τοπικής μου σημείωσης με την ενημέρωση του εξυπηρετητή.</gui> Αν έχετε επιλέξει αυτή την επιλογή, κατά τον συγχρονισμό, το Tomboy θα διαγράψει και θα αντικαταστήσει την αποθηκευμένη σημείωση στον υπολογιστή σας με ένα αντίγραφο από τον απομακρυσμένο υπολογιστή.</p>
+		<item><p><gui>Replace my local note with the server's update.</gui>
+  		If you have selected this option, when you synchronize, 
+		Tomboy will overwrite and replace your note stored on your
+		computer with a copy from the remote computer.</p>
 		
 		<note style="warning">
 		<p>Η αυτόματη αντικατάσταση της σημείωσης είναι μόνιμη. Η τοπική σας σημείωση θα αντικατασταθεί από το αντίγραφο του απομακρυσμένου υπολογιστή και θα χάσετε τις πληροφορίες που ήταν αποθηκευμένες πριν το συγχρονισμό.</p>
@@ -71,7 +81,17 @@
 	
 	<p>Συνίσταται η χρήση ενός τρίτου υπολογιστή ή ενός εξυπηρετητή ως τον απομακρυσμένο υπολογιστή στον οποίο θα αποθηκεύονται οι σημειώσεις που θα συγχρονίζονται μεταξύ υπολογιστών.</p>
 
-	<p>Ανοίξτε το <app>Κωδικοί και κλειδιά κρυπτογράφησης</app> επιλέγοντας <guiseq><gui>Εφαρμογές</gui><gui>Βοηθήματα</gui><gui>Κωδικοί και κλειδιά κρυπτογράφησης</gui></guiseq>. Επιλέξτε το κλειδί σας, και από το μενού επιλέξτε <guiseq><gui>Απομακρυσμένα</gui><gui>Ρύθμιση κλειδιού για ασφαλές κέλυφος</gui></guiseq> και πληκτρολογήστε το όνομα τομέα ή τη διεύθυνση IP του υπολογιστή με τον οποίο θέλετε να συγχρονιστείτε στο πεδίο <gui>Όνομα υπολογιστή</gui>. Πληκτρολογήστε το όνομα χρήστη τ [...]
+	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
+	<guiseq><gui>Applications</gui><gui>Accessories</gui>
+	<gui>Passwords and Encryption Keys</gui></guiseq>.  
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
+	</p>
 	
 	<p>Επιλέξτε <gui>SSH</gui> από τη λίστα επιλογών <gui>Υπηρεσία</gui>. Συμπληρώστε τις πληροφορίες σύνδεσης για τον εξυπηρετητή σας και στη συνέχεια κάντε κλικ στο κουμπί <gui>Αποθήκευση</gui>. Η <gui>Διαδρομή φακέλου</gui>, αν και προαιρετική, πρέπει να δείχνει σε έναν άδειο φάκελο. Είστε πλέον έτοιμος να συγχρονίσετε τις σημειώσεις σας.</p>
 
diff --git a/help/el/sync.page b/help/el/sync.page
index 9816255..80429e9 100644
--- a/help/el/sync.page
+++ b/help/el/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Σημειώσεις χειροκίνητου συγχρονισμού</title>
 	
-	<p>Μπορείτε να συγχρονίσετε τις σημειώσεις με τους εξής τρεις τρόπους:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>Από οποιαδήποτε σημείωσε κάντε κλικ στο εικονίδιο του <gui>Εργαλεία</gui> και επιλέξτε <gui>Συγχρονισμός σημειώσεων</gui>.</p></item>
@@ -38,13 +38,26 @@
  
  	<title>Αυτόματος συγχρονισμός των σημειώσεών σας</title>
  	
- 	<p>Το Tomboy μπορεί αυτόματα να συγχρονίζει για εσάς τις σημειώσεις στο παρασκήνιο. Προτείνεται να ρυθμίσετε τον τρόπο που θα διαχειρίζεται τις συγκρούσεις σημειώσεων πριν την ενεργοποίηση του αυτόματου συγχρονισμού. Μπορείτε να μάθετε περισσότερα σχετικά με τη διαχείριση συγκρούσεων σημειώσεων στη σελίδα <link xref="sync-setup#conflicts"/>.</p>
- 	
- 	<p>Μπορείτε να ενεργοποιήσετε το συγχρονισμό ανοίγοντας τις <gui>Προτιμήσεις Tomboy</gui> χρησιμοποιώντας το ποντίκι σας με δεξί κλικ στο εικονίδιο του Tomboy στον πίνακα εφαρμογών σας, τη γραμμή εργασιών ή το dock και επιλέξτε <gui>Προτιμήσεις</gui> και ύστερα την καρτέλα <gui>Συγχρονισμός</gui>. Μπορείτε επίσης να ανοίξετε τις <gui>Προτιμήσεις Tomboy</gui> από το διάλογο <gui>Αναζήτηση σε όλες τις σημειώσεις</gui>. Από το μενού επιλέξτε <guiseq><gui>Επεξεργασία</gui><gui>Προτιμήσεις< [...]
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 	
 	<p>Για να ενεργοποιήσετε τον αυτόματο συγχρονισμό, επιλέξτε το πεδίο <gui>Αυτόματος συγχρονισμός στο παρασκήνιο κάθε x λεπτά</gui> στο κάτω μέρος της καρτέλας Συγχρονισμός.</p>
 	
-	<p>Η προεπιλεγμένη ρύμθμιση του Tomboy είναι ο αυτόματος συγχρονισμός κάθε 10 λεπτά. Για να την τροποποιήσετε, εισάγετε τον αριθμό των λεπτών στο διάλογο ή χρησιμοποιήστε το ποντίκι σας για να μετακινήσετε το χρόνο κάτω ή πάνω.</p>
+	<p>Tomboy's default option is to autosync every 10 minutes.  To change
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>Για να απενεργοποιήσετε τον αυτόματο συγχρονισμό, αποεπιλέξτε το κουτί <gui>Αυτόματος συγχρονισμός στο παρασκήνιο κάθε x λεπτά</gui>.</p>
 	
diff --git a/help/el/whatsnew.page b/help/el/whatsnew.page
index 0c9524b..034dc4c 100644
--- a/help/el/whatsnew.page
+++ b/help/el/whatsnew.page
@@ -22,7 +22,10 @@
 
   <p>Το <app>Tomboy</app> έχει υποστεί διάφορες νέες βελτιώσεις. Το Tomboy θα πρέπει να εκκινείται αρκετά γρηγορότερα χάρη στις βελτιώσεις που έγιναν στο χρόνο εκκίνησής του.</p>
   <p>Η αντιγραφή και η επικόλληση από το Tomboy σε άλλες εφαρμογές έχουν βελτιωθεί για να υποστηρίζουν τη μορφοποίηση σε άλλες εφαρμογές που μπορούν να κάνουν ανάγνωση αρχείων τύπου HTML, όπως το Evolution, το OpenOffice.org και άλλες.</p>
-  <p>Το <app>Tomboy</app> μπορεί τώρα να συγχρονίζει τις σημειώσεις σας αυτόματα αντί για εσάς όταν έχετε ενεργοποιημένο το συγχρονισμό.</p>
+  <p>
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
+  </p>
 
   <p>Η υπστήριξη για Microsoft Windows 7 έχει προστεθεί για να σας βοηθά να έχετε πρόσβαση στις σημειώσεις σας, να αναζητείτε ή να δημιουργείτε μία νέα σημειώση γρηγορότερα και άμεσα από τη γραμμή εργασιών των Windows.</p>
 
diff --git a/help/en_GB/addins-desktop-bugzilla.page b/help/en_GB/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..be2ddec
--- /dev/null
+++ b/help/en_GB/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/en_GB/addins-desktop-printing.page b/help/en_GB/addins-desktop-printing.page
new file mode 100644
index 0000000..29741a1
--- /dev/null
+++ b/help/en_GB/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/en_GB/addins-desktop.page b/help/en_GB/addins-desktop.page
deleted file mode 100644
index e0c4909..0000000
--- a/help/en_GB/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="en_GB">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/en_GB/addins-formatting-fixed-width.page b/help/en_GB/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..aa756e6
--- /dev/null
+++ b/help/en_GB/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/en_GB/addins-formatting-underline.page b/help/en_GB/addins-formatting-underline.page
new file mode 100644
index 0000000..5b3d476
--- /dev/null
+++ b/help/en_GB/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/en_GB/addins-formatting.page b/help/en_GB/addins-formatting.page
deleted file mode 100644
index 7beb662..0000000
--- a/help/en_GB/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="en_GB">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/en_GB/addins-preferences.page b/help/en_GB/addins-preferences.page
new file mode 100644
index 0000000..86331d3
--- /dev/null
+++ b/help/en_GB/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/en_GB/addins-sync-local.page b/help/en_GB/addins-sync-local.page
new file mode 100644
index 0000000..bedd434
--- /dev/null
+++ b/help/en_GB/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/en_GB/addins-sync-ssh.page b/help/en_GB/addins-sync-ssh.page
new file mode 100644
index 0000000..4662948
--- /dev/null
+++ b/help/en_GB/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/en_GB/addins-sync-webdav.page b/help/en_GB/addins-sync-webdav.page
new file mode 100644
index 0000000..794baa2
--- /dev/null
+++ b/help/en_GB/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/en_GB/addins-sync-webservice.page b/help/en_GB/addins-sync-webservice.page
new file mode 100644
index 0000000..16c5f2d
--- /dev/null
+++ b/help/en_GB/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/en_GB/addins-sync.page b/help/en_GB/addins-sync.page
deleted file mode 100644
index 8e70e9b..0000000
--- a/help/en_GB/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="en_GB">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/en_GB/addins-tools-backlinks.page b/help/en_GB/addins-tools-backlinks.page
new file mode 100644
index 0000000..bb61c98
--- /dev/null
+++ b/help/en_GB/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/en_GB/addins-tools-html-export.page b/help/en_GB/addins-tools-html-export.page
new file mode 100644
index 0000000..4185467
--- /dev/null
+++ b/help/en_GB/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Export to HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/en_GB/addins-tools-note-of-day.page b/help/en_GB/addins-tools-note-of-day.page
new file mode 100644
index 0000000..299a357
--- /dev/null
+++ b/help/en_GB/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Note of the Day</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/en_GB/addins-tools-timestamp.page b/help/en_GB/addins-tools-timestamp.page
new file mode 100644
index 0000000..e64b0a1
--- /dev/null
+++ b/help/en_GB/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/en_GB/addins-tools.page b/help/en_GB/addins-tools.page
deleted file mode 100644
index ec4fd13..0000000
--- a/help/en_GB/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="en_GB">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Export to HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Note of the Day</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/en_GB/addins.page b/help/en_GB/addins.page
index 87d0f86..7cb305d 100644
--- a/help/en_GB/addins.page
+++ b/help/en_GB/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronisation</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/en_GB/delete-notes.page b/help/en_GB/delete-notes.page
index 54956fd..95794d1 100644
--- a/help/en_GB/delete-notes.page
+++ b/help/en_GB/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME Documentation Project</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/en_GB/introduction.page b/help/en_GB/introduction.page
index 8f9c45d..470401d 100644
--- a/help/en_GB/introduction.page
+++ b/help/en_GB/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/en_GB/pin-notes.page b/help/en_GB/pin-notes.page
new file mode 100644
index 0000000..ca6950e
--- /dev/null
+++ b/help/en_GB/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/en_GB/sync-setup.page b/help/en_GB/sync-setup.page
index b418df0..cd0ebe9 100644
--- a/help/en_GB/sync-setup.page
+++ b/help/en_GB/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -118,7 +118,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/en_GB/sync.page b/help/en_GB/sync.page
index 80cfa57..ddf2310 100644
--- a/help/en_GB/sync.page
+++ b/help/en_GB/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/en_GB/whatsnew.page b/help/en_GB/whatsnew.page
index 4065a90..d05bf0f 100644
--- a/help/en_GB/whatsnew.page
+++ b/help/en_GB/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/es/addins-desktop-bugzilla.page b/help/es/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..66ff99c
--- /dev/null
+++ b/help/es/addins-desktop-bugzilla.page
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Complemento para enlazar automáticamente a las páginas de Bugzilla.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Enlaces de Bugzilla</title>
+
+  <p>El complemento de enlaces de Bugzilla le permite arrastrar un URL de Bugzilla hasta Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Arrastre un enlace a Bugzilla que contenga el número de informe de error desde su navegador web hasta su nota de <app>Tomboy</app>.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> mostrará el número de informe de error como un enlace junto a un icono, para indicar que es un enlace a <app>Bugzilla</app>. Puede pulsar en este enlace para abrirlo en su navegador web.</p>
+
+</page>
diff --git a/help/es/addins-desktop-printing.page b/help/es/addins-desktop-printing.page
new file mode 100644
index 0000000..cb11b64
--- /dev/null
+++ b/help/es/addins-desktop-printing.page
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Enviar notas a una impresora.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Soporte para impresión</title>
+
+    <note style="important">
+      <p>Para imprimir en <app>Tomboy</app> es necesario tener conectada y configurada una impresora. Si no es así, consulte la <link href="help:gnome-help/printing">ayuda de impresión para GNOME</link>.</p>
+    </note>
+
+    <p>Puede enviar notas de <app>Tomboy</app> a su impresora. Este complemento está activado de manera predeterminada.</p>
+
+    <steps>
+      <title>Para imprimir una nota:</title>
+      <item>
+        <p>Abra la nota.</p>
+      </item>
+      <item>
+        <p>Desde el icono de la rueda dentada en la barra de herramientas de la nota, seleccione <gui style="menuitem">Imprimir</gui>. Alternativamente, también puede usar el atajo del teclado <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>Si desactiva este complemento no podrá imprimir sus notas de <app>Tomboy</app>.</p>
+    </note>
+
+ </page>
diff --git a/help/es/addins-desktop.page b/help/es/addins-desktop.page
deleted file mode 100644
index 104d741..0000000
--- a/help/es/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="es">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Complementos para integrar con otras aplicaciones y sitios web.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Complementos de integración del escritorio</title>
-
-	<p>Los complementos de integración del escritorio interactúan con otras aplicaciones o sitios web y con Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Enlaces Bugzilla</title>
-  <p>El complemento Enlaces de Bugzilla le permite arrastrar un URL de Bugzilla desde su navegador hasta Tomboy. Después de arrastrar un enlace en una nota de Tomboy, se mostrará en número del bug como un enlace activo cerca del icono del bug para indicar que es un enlace a Bugzilla. Al pulsar en enlace en la nota de Tomboy se abrirá un navegador llevándole a esa página de Bugzilla.</p>
-</section>
-
-<section id="evolution">
-  <title>Integración con correo de Evolution</title>
-  <p>El complemento de integración con Evolution le permite arrastrar un correo desde Evolution hasta una nota Tomboy. Su nota mostrará un icono de un sobre y el asunto de la nota se mostrará como un enlace. Al pulsar en este enlace se abrirá el correo usando Evolution.</p>
-</section>
-
-<section id="printing">
-  <title>Soporte para impresión</title>
-  <p>Este complemento se activa de manera predeterminada y le permite imprimir sus notas. Si desactiva este complemento, no podrá imprimir sus notas.</p>
-</section>
-
-
- </page>
diff --git a/help/es/addins-formatting-fixed-width.page b/help/es/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..e6f3eb3
--- /dev/null
+++ b/help/es/addins-formatting-fixed-width.page
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Complemento para establecer una tipografía de anchura fija en las notas.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Anchura fija</title>
+
+  <p>El complemento de anchura fija configura el texto de sus notas de <app>Tomboy</app> para que tenga una anchura fija. Este complemento está desactivado de manera predeterminada.</p>
+
+  <steps>
+    <title>Para usar una tipografía de anchura fija en sus notas de <app>Tomboy</app>:</title>
+    <item>
+      <p><link xref="addins">Active</link> el complemento de anchura fija.</p>
+    </item>
+    <item>
+      <p>Seleccione el texto que quiere en una nota de <app>Tomboy</app>.</p>
+    </item>
+    <item>
+      <p>Desde el icono <gui style="button">Texto</gui> en la barra de herramientas de la nota, seleccione <gui style="menuitem">Anchura fija</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>Para establecer rápidamente una tipografía de anchura fija en cualquier texto seleccionado, pulse <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/es/addins-formatting-underline.page b/help/es/addins-formatting-underline.page
new file mode 100644
index 0000000..67dd819
--- /dev/null
+++ b/help/es/addins-formatting-underline.page
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Complemento para subrayar texto en una nota.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Complemento de subrayado</title>
+
+  <p>El complemento de subrayado le permite subrayar un texto específico en su nota. Este complemento está desactivado de manera predeterminada.</p>
+
+  <steps>
+    <title>Para usar el complemento de subrayado:</title>
+    <item>
+      <p><link xref="addins">Active</link> el complemento de subrayado.</p>
+    </item>
+    <item>
+      <p>Seleccione el texto que quiere</p>
+    </item>
+    <item>
+      <p>Desde el icono <gui style="button">Texto</gui> en una nota, seleccione <gui style="menuitem">Subrayar</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>Para subrayar rápidamente cualquier texto seleccionado, pulse <keyseq><key>Ctrl</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/es/addins-formatting.page b/help/es/addins-formatting.page
deleted file mode 100644
index 2753a5e..0000000
--- a/help/es/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="es">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Complementos para añadir formateo adicional de nota.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Complementos de formateado</title>
-
-<section id="fixedwidth">
-  <title>Complemento de anchura fija</title>
-  <p>El complemento de anchura fija cambia su texto para que tenga una anchura fija en la nota Tomboy. Este complemento está desactivado de manera predeterminada. Para activarlo, pulse el botón <gui>Activar</gui>.</p>
-</section>
-
-<section id="underline">
-  <title>Complemento de subrayado</title>
-  <p>El complemento de subrayado le permite subrayar un texto específico en su nota usando el icono <gui>Texto</gui> en la barra de herramientas de una nota. Este complemento está desactivado de manera predeterminada. Para activarlo, pulse el botón <gui>Activar</gui>. Seleccione el texto que quiere subrayar, pulse el icono <gui>Texto</gui> en la barra de herramientas de la nota, y elija <gui>Subrayar</gui> o pulse <keyseq><key>Control + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/es/addins-preferences.page b/help/es/addins-preferences.page
new file mode 100644
index 0000000..286e07f
--- /dev/null
+++ b/help/es/addins-preferences.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Activar los complementos de opciones avanzadas.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Preferencias avanzadas</title>
+
+  <p>El complemento <gui>Preferencias avanzadas</gui> le permite establecer el número de notas recientes que se muestran en la lista de recientes. Debe <link xref="addins">activar</link> este complemento para poder usarlo.</p>
+
+ <section id="recent-notes">
+  <title>Controlar las notas recientes</title>
+    <p>Puede configurar el número mínimo y máximo de notas recientes que es muestran cuando pulsa en el icono de la bandeja de mensajes de <app>Tomboy</app>:</p>
+    <steps>
+      <item>
+        <p>Seleccione <guiseq><gui style="menu">Editar</gui><gui style="menuitem">Preferencias</gui><gui style="tab">Avanzado</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Establezca el número mínimo y máximo de notas que mostrar en la lista de notas recientes.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Notas al inicio</title>
+
+    <steps>
+      <title>Para activar las notas al inicio:</title>
+      <item>
+        <p>Pulse sobre el icono de <app>Tomboy</app> y seleccione <guiseq><gui style="menuitem">Preferencias</gui><gui style="tab">Avanzado</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Seleccione <gui style="checkbox">Activar notas al inicio</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/es/addins-sync-local.page b/help/es/addins-sync-local.page
new file mode 100644
index 0000000..7d2c9b9
--- /dev/null
+++ b/help/es/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sincronizar sus notas con una carpeta local.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servicio de sincronización de carpetas locales</title>
+
+  <p>El servicio de sincronización de carpeta local está activado de manera predeterminada y permite a <app>Tomboy</app> sincronizar sus notas con otra carpeta en su equipo. Esto es útil para crear copias de respaldo de sus notas.</p>
+
+</page>
diff --git a/help/es/addins-sync-ssh.page b/help/es/addins-sync-ssh.page
new file mode 100644
index 0000000..afe6509
--- /dev/null
+++ b/help/es/addins-sync-ssh.page
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sincronizar sus notas con otro equipo mediante SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servicio de sincronización SSH</title>
+
+  <p>El complemento de servicio de sincronización por SSH le permite sincronizar sus notas con otro equipo usando el protocolo SSH. Este complemento está desactivado de manera predeterminada.</p>
+
+  <p>Es posible que deba instalar el paquete <em>sshfs</em> para su distribución de Linux para que este complemento funcione, algo que está fuera del objetivo de este documento de ayuda.</p>
+
+</page>
diff --git a/help/es/addins-sync-webdav.page b/help/es/addins-sync-webdav.page
new file mode 100644
index 0000000..cd9ddf1
--- /dev/null
+++ b/help/es/addins-sync-webdav.page
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sincronizar sus notas con un servidor WebDav.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servicio de sincronización WebDav</title>
+
+  <p>El complemento de servicio de sincronización WebDav le permite sincronizar sus notas con un servidor WebDav remoto. Este complemento está activado de manera predeterminada.</p>
+
+  <p>Para usar el complemento de servicio de sincronización WebDav necesita tener instalado el paquete <em>wdfs FUSE file system</em> en su distribución Linux, algo que está fuera del objetivo de este documento.</p>
+
+ </page>
diff --git a/help/es/addins-sync-webservice.page b/help/es/addins-sync-webservice.page
new file mode 100644
index 0000000..bc02b02
--- /dev/null
+++ b/help/es/addins-sync-webservice.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sincronizar sus notas con un servicio de Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servicio de sincronización Web</title>
+
+  <p>El complemento de servicio de sincronización web le permite sincronizar sus notas con un servidor web remoto o con otros servicios web compatibles.</p>
+
+ </page>
diff --git a/help/es/addins-sync.page b/help/es/addins-sync.page
deleted file mode 100644
index 25bedd5..0000000
--- a/help/es/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="es">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Activar formas adicionales de sincronizar sus notas con otros dispositivos.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sincronizar complementos</title>
-
-	<p>Los complementos de sincronización le permiten elegir diferentes métodos y lugares para sincronizar sus notas Tomboy. Para obtener más información, o configuración de la sincronización, consulte la página de ayuda <link xref="sync-notes"/>.</p>
-
-
-<section id="local">
-  <title>Servicio de sincronización de carpetas locales</title>
-  <p>El servicio de sincronización de carpeta local está activado de manera predeterminada y permite a Tomboy sincronizar sus notas con otra carpeta en su equipo. Esto es útil para crear copias de respaldo de sus notas.</p>
-</section>
-
-<section id="ssh">
-  <title>Servicio de sincronización SSH</title>
-  <p>El servicio de sincronización SSH le permite sincronizar sus notas con otro equipo a través del protocolo SSH. Este complemento está desactivado de manera predeterminada. Es posible que deba instalar el paquete <em>sshfs</em> para su distribución de Linux para hacer que este complemento funcione, algo que está fuera del objetivo de este documento de ayuda.</p>
-</section>
-
-<section id="webdav">
-  <title>Servicio de sincronización WebDav</title>
-  <p>El complemento de servicio de sincronización WebDav está activado de manera predeterminada y le permite sincronizar sus notas con un servidor WebDav remoto. Puede necesitar tener instalado el paquete <em>wdfs FUSE file system</em> en su distribución Linux para que este complemento funcione, lo que está fuera del objetivo de este documento.</p>
-</section>
-
-<section id="webservice">
-  <title>Servicio de sincronización Web</title>
-  <p>El complemento de servicio de sincronización web le permite sincronizar sus notas con un servicio o un servidor web remoto, como Tomboy Online. En el momento de escribir esto, el servicio Tomboy Online no se ha iniciado.</p>
-</section>
-
- </page>
diff --git a/help/es/addins-tools-backlinks.page b/help/es/addins-tools-backlinks.page
new file mode 100644
index 0000000..439b840
--- /dev/null
+++ b/help/es/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Ver las notas que enlazan con otras.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Retroenlaces</title>
+
+	<p>El complemento <gui>Retroenlaces</gui> está activado de manera predeterminada y le permite ver qué notas enlazan con la nota que está viendo actualmente. Estos enlaces se llaman <em>Retroenlaces</em></p>
+
+  <steps>
+    <title>Para crear y ver los retroenlaces de una nota:</title>
+    <item>
+      <p>Empiece a escribir el título de una nota en cualquier nota.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>Para que <app>Tomboy</app> cree enlaces automáticamente a las notas existentes, el texto que escriba debe coincidir con el título de una nota que ya exista.</p>
+  </note>
+ </page>
diff --git a/help/es/addins-tools-html-export.page b/help/es/addins-tools-html-export.page
new file mode 100644
index 0000000..9c7d785
--- /dev/null
+++ b/help/es/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Exportar notas a HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Exportar a HTML</title>
+
+  <p>Puede exportar notas individuales de <app>Tomboy</app> a páginas HTML usando el complemento <gui>Exportar a HTML</gui>. Este complemento está activado de manera predeterminada.</p>
+
+  <steps>
+    <title>Para exportar una nota a HTML:</title>
+    <item>
+      <p>Desde el icono de la rueda dentada en la barra de herramientas de la nota, seleccione <gui style="menuitem">Exportar a HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Examine y selecciona la carpeta en la que quiere guardar la nota. Puede cambiar el nombre del archivo HTML, si quiere que sea diferente del nombre de la nota.</p>
+    </item>
+    <item>
+      <p>Pulse <gui style="button">Guardar</gui>.</p>
+    </item>
+  </steps>
+
+   <p>La nota se guardará como un archivo HTML y se abrirá con su navegador web predeterminado.</p>
+
+</page>
diff --git a/help/es/addins-tools-note-of-day.page b/help/es/addins-tools-note-of-day.page
new file mode 100644
index 0000000..2a6a9d7
--- /dev/null
+++ b/help/es/addins-tools-note-of-day.page
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Crear notas automáticamente para cada día.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Nota del día</title>
+
+  <p>Puede crear notas para cada día automáticamente. Estas notas incluyen un texto con información sobre la fecha y la hora del día. Ejemplo: <em>Hoy: miércoles 9 de octubre de 2013</em>. Este complemento está desactivado de manera predeterminada.</p>
+
+  <steps>
+    <title>Para abrir la nota del día:</title>
+    <item>
+      <p>Pulse en el icono de <app>Tomboy</app> en la bandeja de mensajes.</p>
+    </item>
+    <item>
+      <p>En la lista de notas, selecciona una nota con la fecha actual.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>La nota añadirá filas para <em>Tareas</em> y <em>Cita</em> automáticamente.</p>
+  </note>
+
+</page>
diff --git a/help/es/addins-tools-timestamp.page b/help/es/addins-tools-timestamp.page
new file mode 100644
index 0000000..f565716
--- /dev/null
+++ b/help/es/addins-tools-timestamp.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insertar la fecha y la hora en sus notas.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insertar marca de tiempo</title>
+
+  <p>El complemento <gui>Insertar marca de tiempo</gui> le permite insertar la fecha ya la hora en sus notas. Este complemento está desactivado de manera predeterminada.</p>
+
+  <steps>
+    <title>Para usar el complemento <gui>Insertar marca de tiempo</gui>:</title>
+    <item>
+      <p>Desde el icono de la rueda dentada en la barra de herramientas de la nota, seleccione <gui style="menuitem">Insertar marca de tiempo</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>Para insertar rápidamente una marca de tiempo en una nota, pulse <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/es/addins-tools.page b/help/es/addins-tools.page
deleted file mode 100644
index c8c2f2a..0000000
--- a/help/es/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="es">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Activar funcionalidad adicional de la nota.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Complementos de herramientas de Tomboy</title>
-
-	<p>Los complementos añaden funcionalidad adicional a sus notas Tomboy.</p>
-
-  <section id="backlinks">
-    <title>Retroenlaces</title>
-	<p>El complemento <gui>Retroenlaces</gui> está activado de manera predeterminada y le permite ver qué notas enlazan con la nota que está viendo actualmente.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Exportar a HTML</title>
-  <p>El complemento <gui>Exportar a HTML</gui> está activado de manera predeterminada, y exportará una nota individual a HTML.</p>
-	<p>Para exportar una nota a HTML, pulse el icono <gui>Herramientas</gui> en la barra de herramientas de la nota y elija <gui>Exportar a HTML</gui>. Inmediatamente aparecerá un diálogo para guardar la nota. Seleccione la carpeta en la que quiere guardar la nota y cambie el nombre del archivo html nuevo de la nota si quiere que sea diferente del nombre de la nota. La nota se guardará como un archivo HTML y se mostrará automáticamente en su navegador.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insertar marca de tiempo</title>
-  <p>El complemento <gui>Insertar marca de tiempo</gui> está desactivado de manera predeterminada. Para activarlo, seleccione el complemento <gui>Insertar marca de tiempo</gui> y pulse <gui>Activar</gui> en las preferencias de Tomboy.</p>
-	<p>Para añadir una marca de tiempo a sus notas, pulse sobre el icono <gui>Herramientas</gui> en la barra de herramientas de la nota y elija <gui>Insertar marca de tiempo</gui> o pulse <key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Nota del día</title>
-  <p>El complemento <gui>Nota del día</gui> está desactivado de manera predeterminada. Para activarlo, elija el complemento <gui>Nota del día</gui> y pulse <gui>Activar</gui> en las preferencias de Tomboy.</p>
-	<p>El complemento <gui>Nota del día</gui> creara una nota diaria con el título <em>Hoy: jueves, 21 de enero de 2010</em>, por ejemplo. La nota también añadirá filas a <em>Tareas</em> y <em>Citas</em> automáticamente.</p>
-</section>
-
-<section id="watcher">
-  <title>Vigilante de la carpeta de notas</title>
-  <p>El complemento Vigilante de la carpeta de notas monitoriza la carpeta en la que Tomboy guarda sus notas. Si el complemento detecta cambios en sus notas, aplicará estos cambios y se mostrarán en sus notas. Este complemento se usa habitualmente con servicios de sincronización de terceras partes tales como Dropbox. La configuración de servicios de sincronización de terceras partes está fuera del objetivo de este documento.</p>
-</section>
-
- </page>
diff --git a/help/es/addins.page b/help/es/addins.page
index 44f039f..0be81f5 100644
--- a/help/es/addins.page
+++ b/help/es/addins.page
@@ -4,28 +4,60 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Añadir funcionalidad adicional a Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
   <title>Complementos de Tomboy</title>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Complementos de Tomboy</title>
-    </info>
-    <title>Gestionar complementos de Tomboy</title>
+  <p>Los <gui>Complementos</gui> de <app>Tomboy</app> amplían su funcionalidad con características que no están disponibles de manera predeterminada.</p>
+
+  <steps>
+    <title>Para activar un complemento:</title>
+    <item>
+      <p>Seleccione <guiseq><gui style="menu">Editar</gui><gui style="menuitem">Preferencias</gui><gui style="tab">Complementos</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Pulse en <gui>+</gui> para expandir la categoría del complemento.</p>
+    </item>
+    <item>
+      <p>Seleccione el complemento que quiere activar.</p>
+    </item>
+    <item>
+      <p>Pulse <gui style="button">Activar</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>Para descargar más complementos de Internet, vaya a la pestaña <gui style="tab">Complementos</gui> de la ventana <gui>Preferencias de <app>Tomboy</app></gui> y pulse en <gui style="button">Obtener más complementos…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferencias</title>
+  </section>
+
+  <section id="tools" style="2column">
+    <title>Herramientas</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Integración con el escritorio</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Sincronización</title>
+    <p>Los complementos de sincronización le permiten elegir diferentes métodos y lugares para sincronizar sus notas Tomboy.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formateado</title>
+  </section>
 </page>
diff --git a/help/es/delete-notes.page b/help/es/delete-notes.page
index 2a5018b..38241cd 100644
--- a/help/es/delete-notes.page
+++ b/help/es/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Eliminar una nota en Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Proyecto de documentación de GNOME</name>
       <years>2010</years>
@@ -19,12 +22,22 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Eliminar una nota</title>    
-  
-  <p>Puede eliminar una nota pulsando el icono <gui>Eliminar</gui> en la barra de herramientas de la nota que quiera eliminar.</p>
-  
-<note style="warning">
-	<p>Eliminar una nota es permanente. Después de eliminarla, la nota no se puede recuperar.</p> <p>Se le preguntará <gui>¿Realmente quiere eliminar esta nota?</gui> cuando elimine una nota.</p>  
-</note>
-	
+  <title>Eliminar una nota</title>
+
+  <p>Si quiere quitar las notas que ya no necesita, puede eliminarlas de <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>Para eliminar una nota:</title>
+    <item>
+      <p>Abra la nota.</p>
+    </item>
+    <item>
+      <p>Pulse el icono <gui>Eliminar</gui> en la barra de herramientas. Se le pedirá que confirme la eliminación.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Eliminar una nota es permanente. Una vez eliminada, la nota no se puede recuperar.</p>
+  </note>
+
 </page>
diff --git a/help/es/es.po b/help/es/es.po
index b8a595d..f4c4395 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -3,13 +3,13 @@
 #
 # Claudio Saavedra <csaavedra at alumnos.utalca.cl>, 2007.
 # Jorge González <jorgegonz at svn.gnome.org>, 2006, 2007, 2008, 2009, 2010, 2011.
-# Daniel Mustieles <daniel.mustieles at gmail.com>, 2010, 2012.
+# Daniel Mustieles <daniel.mustieles at gmail.com>, 2010, 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy.help.master\n"
-"POT-Creation-Date: 2012-12-11 15:04+0000\n"
-"PO-Revision-Date: 2012-12-12 11:17+0100\n"
+"POT-Creation-Date: 2013-10-13 14:33+0000\n"
+"PO-Revision-Date: 2013-10-15 17:20+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
 "Language-Team: Español <gnome-es-list at gnome.org>\n"
 "Language: \n"
@@ -22,31 +22,27 @@ msgstr ""
 msgid "What's new in <app>Tomboy Notes</app>."
 msgstr "Lo nuevo en <app>Notas Tomboy</app>."
 
-#: C/whatsnew.page:13(name) C/sync-setup.page:11(name) C/sync.page:11(name)
+#: C/whatsnew.page:13(name) C/sync.page:11(name) C/sync-setup.page:11(name)
 #: C/search.page:12(name) C/prefs.page:9(name) C/note-edit-prefs.page:11(name)
 #: C/introduction.page:12(name) C/index.page:9(name) C/hotkeys.page:11(name)
-#: C/edit-note.page:13(name) C/delete-notes.page:14(name)
-#: C/create-note.page:13(name) C/create-notebook.page:13(name)
-#: C/addins-tools.page:10(name) C/addins-sync.page:10(name)
-#: C/addins.page:11(name) C/addins-formatting.page:10(name)
-#: C/addins-desktop.page:10(name)
+#: C/edit-note.page:13(name) C/delete-notes.page:13(name)
+#: C/create-notebook.page:11(name) C/create-note.page:13(name)
+#: C/addins.page:11(name)
 msgid "Paul Cutler"
 msgstr "Paul Cutler"
 
-#: C/whatsnew.page:14(email) C/sync-setup.page:12(email) C/sync.page:12(email)
+#: C/whatsnew.page:14(email) C/sync.page:12(email) C/sync-setup.page:12(email)
 #: C/search.page:13(email) C/prefs.page:10(email)
 #: C/note-edit-prefs.page:12(email) C/introduction.page:13(email)
 #: C/index.page:10(email) C/hotkeys.page:12(email) C/edit-note.page:14(email)
-#: C/delete-notes.page:15(email) C/create-note.page:14(email)
-#: C/create-notebook.page:14(email) C/addins-tools.page:11(email)
-#: C/addins-sync.page:11(email) C/addins.page:12(email)
-#: C/addins-formatting.page:11(email) C/addins-desktop.page:11(email)
+#: C/delete-notes.page:14(email) C/create-notebook.page:12(email)
+#: C/create-note.page:14(email) C/addins.page:12(email)
 msgid "pcutler at gnome.org"
 msgstr "pcutler at gnome.org"
 
 #: C/whatsnew.page:25(title)
 msgid "What's New in <app>Tomboy</app>"
-msgstr "Lo nuevo en <app>Tomboy</app>"
+msgstr "Novedades en <app>Tomboy</app>"
 
 #: C/whatsnew.page:27(p)
 msgid ""
@@ -70,7 +66,7 @@ msgstr ""
 #: C/whatsnew.page:36(p)
 msgid ""
 "<app>Tomboy</app> can now synchronize your notes automatically for you when "
-"you when you have sync enabled."
+"you when you have synchronize enabled."
 msgstr ""
 "Ahora <app>Tomboy</app> puede sincronizar sus notas automáticamente por "
 "usted cuando tenga la sincronización activada."
@@ -85,11 +81,114 @@ msgstr ""
 "notas, buscar o crear una nota nueva más rápido, directamente desde la barra "
 "de tareas de Windows."
 
+#: C/sync.page:8(desc)
+msgid "Sync your Tomboy notes with other computers."
+msgstr "Sincronizar sus notas Tomboy con otros equipos."
+
+#: C/sync.page:23(title)
+msgid "Sync your notes"
+msgstr "Sincronizar sus notas"
+
+#: C/sync.page:27(title)
+msgid "Manually Syncing Notes"
+msgstr "Sincronizar notas manualmente"
+
+#: C/sync.page:29(p)
+msgid "You can synchronize your notes one of three ways:"
+msgstr "Puede sincronizar sus notas de tres maneras:"
+
+#: C/sync.page:32(p)
+msgid ""
+"From any note click the <gui>Tools</gui> icon and choose <gui>Synchronize "
+"Notes</gui>."
+msgstr ""
+"Desde cualquier nota pulse en el icono <gui>Herramientas</gui> y elija "
+"<gui>Sincronizar notas</gui>."
+
+#: C/sync.page:34(p)
+msgid ""
+"In the <gui>Search All Notes</gui> dialog choose <guiseq><gui>Tools</"
+"gui><gui>Synchronize Notes</gui></guiseq>."
+msgstr ""
+"En el diálogo <gui>Buscar en todas las notas</gui> elija "
+"<guiseq><gui>Herramientas</gui><gui>Sincronizar notas</gui></guiseq>."
+
+#: C/sync.page:37(p)
+msgid ""
+"Using your mouse, right click on the Tomboy icon in your panel, taskbar or "
+"dock and choose <gui>Synchronize All Notes </gui>."
+msgstr ""
+"Usando su ratón, pulse con el botón derecho sobre el icono de Tomboy en su "
+"panel, barra de tareas o «dock» y elija <gui>Sincronizar todas las notas </"
+"gui>."
+
+#: C/sync.page:46(title)
+msgid "Sync Your Notes Automatically"
+msgstr "Sincronizar sus notas automáticamente"
+
+#: C/sync.page:48(p)
+msgid ""
+"Tomboy can automatically synchronize your notes for you in the background.It "
+"is recommended that you configure how you handle note conflicts before "
+"enabling syncing automatically. You can learn about handling note conflicts "
+"in the <link xref=\"sync-setup#conflict\"/> page."
+msgstr ""
+"Tomboy puede sincronizar sus notas automáticamente por usted en segundo "
+"plano. Se recomienda que configure cómo manejar los conflictos entre notas "
+"antes de activar la sincronización automática. Puede aprender acerca de el "
+"manejo de conflictos entre notas en la página <link xref=\"sync-"
+"setup#conflict\"/>."
+
+#: C/sync.page:54(p) C/sync-setup.page:33(p)
+msgid ""
+"You can enable synchronize by opening <gui>Tomboy Preferences</gui> by using "
+"your mouse to right click on the Tomboy icon in your panel, taskbar or dock "
+"and choose <gui>Preferences</gui> and then select the <gui>Synchronization</"
+"gui> tab. You can also open <gui> Tomboy Preferences</gui> from the "
+"<gui>Search All Notes</gui> dialog. From the menu choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq>."
+msgstr ""
+"Puede activar las sincronización abriendo las <gui>Preferencias de Tomboy</"
+"gui> usando su ratón para pulsar con el botón derecho en el icono de Tomboy "
+"en su panel, barra de tareas o «dock», elija <gui>Preferencias</gui> y "
+"seleccione la pestaña <gui>Sincronización</gui>. También puede abrir las "
+"<gui>Preferencias de Tomboy</gui> desde el diálogo <gui>Buscar en todas las "
+"notas</gui>. Desde el menú, elija <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui></guiseq>."
+
+#: C/sync.page:63(p)
+msgid ""
+"To enable autosync, check the <gui>Automatically Sync in Background Every x "
+"Minutes</gui> box at the bottom of the Synchronization tab."
+msgstr ""
+"Para activar la sincronización automática, marque la casilla "
+"<gui>Sincronizar automáticamente en segundo plano cada x minutos</gui> en la "
+"parte inferior de la pestaña Sincronización."
+
+#: C/sync.page:66(p)
+msgid ""
+"Tomboy's default option is to autosync every 10 minutes. To change how often "
+"Tomboy should synchronize enter the number of minutes in the dialog or use "
+"your mouse to move the time up or down."
+msgstr ""
+"La opción predeterminada de Tomboy es sincronizar automáticamente cada 10 "
+"minutos. Para cambiar la frecuencia con que Tomboy debe sincronizar, "
+"introduzca el número de minutos en el diálogo o use su ratón para aumentar o "
+"disminuir el tiempo."
+
+#: C/sync.page:70(p)
+msgid ""
+"To disable autosync, uncheck the <gui>Automatically Sync in Background Every "
+"x Minutes</gui> box."
+msgstr ""
+"Para desactivar la sincronización automática, desmarque la casilla "
+"<gui>Sincronizar automáticamente en segundo plano cada x minutos</gui>."
+
 #: C/sync-setup.page:8(desc)
 msgid "Configure Tomboy to synchronize your notes."
 msgstr "Configurar Tomboy para sincronizar sus notas"
 
-#: C/sync-setup.page:15(name) C/delete-notes.page:18(name)
+#: C/sync-setup.page:15(name) C/delete-notes.page:21(name)
 msgid "GNOME Documentation Project"
 msgstr "Proyecto de documentación de GNOME"
 
@@ -115,23 +214,6 @@ msgstr ""
 "permite tener un respaldo de sus notas en otros equipos o compartir sus "
 "notas entre otros equipos de tal forma que siempre tenga acceso a ellas."
 
-#: C/sync-setup.page:33(p) C/sync.page:54(p)
-msgid ""
-"You can enable sync by opening <gui>Tomboy Preferences</gui> by using your "
-"mouse to right click on the Tomboy icon in your panel, taskbar or dock and "
-"choose <gui>Preferences</gui> and then select the <gui>Synchronization</gui> "
-"tab. You can also open <gui> Tomboy Preferences</gui> from the <gui>Search "
-"All Notes</gui> dialog. From the menu choose <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui></guiseq>."
-msgstr ""
-"Puede activar las sincronización abriendo las <gui>Preferencias de Tomboy</"
-"gui> usando su ratón para pulsar con el botón derecho en el icono de Tomboy "
-"en su panel, barra de tareas o «dock», elija <gui>Preferencias</gui> y "
-"seleccione la pestaña <gui>Sincronización</gui>. También puede abrir las "
-"<gui>Preferencias de Tomboy</gui> desde el diálogo <gui>Buscar en todas las "
-"notas</gui>. Desde el menú, elija <guiseq><gui>Editar</"
-"gui><gui>Preferencias</gui></guiseq>."
-
 #: C/sync-setup.page:46(title)
 msgid "Managing Note Conflict"
 msgstr "Gestionar conflictos de notas"
@@ -182,8 +264,9 @@ msgstr ""
 #: C/sync-setup.page:70(p)
 msgid ""
 "<gui>Replace my local note with the server's update.</gui> If you have "
-"selected this option, when you sync, Tomboy will overwrite and replace your "
-"note stored on your computer with a copy from the remote computer."
+"selected this option, when you synchronize, Tomboy will overwrite and "
+"replace your note stored on your computer with a copy from the remote "
+"computer."
 msgstr ""
 "<gui>Reemplazar mi nota local con la actualización del servidor</gui>. Si ha "
 "seleccionado esta opción, al sincronizar Tomboy se sobreescribirán y "
@@ -262,10 +345,10 @@ msgid ""
 "<guiseq><gui>Applications</gui><gui>Accessories</gui><gui>Passwords and "
 "Encryption Keys</gui></guiseq>. Click on your key, and from the menu choose "
 "<guiseq><gui>Remote</gui><gui>Configure Key for Secure Shell</gui></guiseq> "
-"and enter the domain name or IP address of the computer you want to sync to "
-"in <gui>Computer Name</gui>. Enter the username of the remote computer in "
-"<gui>Login Name:</gui> and press <gui>Set Up</gui>. When prompted, enter the "
-"password and setting up your key will be completed."
+"and enter the domain name or IP address of the computer you want to "
+"synchronize to in <gui>Computer Name</gui>. Enter the username of the remote "
+"computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. When "
+"prompted, enter the password and setting up your key will be completed."
 msgstr ""
 "Abra <app>Contraseñas y claves de cifrado</app> eligiendo "
 "<guiseq><gui>Aplicaciones</gui><gui>Accesorios</gui><gui>Contraseñas y "
@@ -314,92 +397,6 @@ msgstr ""
 "Rellene la información para su servidor y después seleccione el botón "
 "<gui>Guardar</gui>. Ahora está listo para sincronizar sus notas."
 
-#: C/sync.page:8(desc)
-msgid "Sync your Tomboy notes with other computers."
-msgstr "Sincronizar sus notas Tomboy con otros equipos."
-
-#: C/sync.page:23(title)
-msgid "Sync your notes"
-msgstr "Sincronizar sus notas"
-
-#: C/sync.page:27(title)
-msgid "Manually Syncing Notes"
-msgstr "Sincronizar notas manualmente"
-
-#: C/sync.page:29(p)
-msgid "You can sync your notes one of three ways:"
-msgstr "Puede sincronizar sus notas de tres formas:"
-
-#: C/sync.page:32(p)
-msgid ""
-"From any note click the <gui>Tools</gui> icon and choose <gui>Synchronize "
-"Notes</gui>."
-msgstr ""
-"Desde cualquier nota pulse en el icono <gui>Herramientas</gui> y elija "
-"<gui>Sincronizar notas</gui>."
-
-#: C/sync.page:34(p)
-msgid ""
-"In the <gui>Search All Notes</gui> dialog choose <guiseq><gui>Tools</"
-"gui><gui>Synchronize Notes</gui></guiseq>."
-msgstr ""
-"En el diálogo <gui>Buscar en todas las notas</gui> elija "
-"<guiseq><gui>Herramientas</gui><gui>Sincronizar notas</gui></guiseq>."
-
-#: C/sync.page:37(p)
-msgid ""
-"Using your mouse, right click on the Tomboy icon in your panel, taskbar or "
-"dock and choose <gui>Synchronize All Notes </gui>."
-msgstr ""
-"Usando su ratón, pulse con el botón derecho sobre el icono de Tomboy en su "
-"panel, barra de tareas o «dock» y elija <gui>Sincronizar todas las notas </"
-"gui>."
-
-#: C/sync.page:46(title)
-msgid "Sync Your Notes Automatically"
-msgstr "Sincronizar sus notas automáticamente"
-
-#: C/sync.page:48(p)
-msgid ""
-"Tomboy can automatically sync your notes for you in the background. It is "
-"recommended that you configure how you handle note conflicts before enabling "
-"syncing automatically. You can learn about handling note conflicts in the "
-"<link xref=\"sync-setup#conflict\"/> page."
-msgstr ""
-"Tomboy puede sincronizar sus notas automáticamente por usted en segundo "
-"plano. Se recomienda que configure cómo manejar los conflictos entre notas "
-"antes de activar la sincronización automática. Puede aprender acerca de el "
-"manejo de conflictos entre notas en la página <link xref=\"sync-"
-"setup#conflict\"/>."
-
-#: C/sync.page:63(p)
-msgid ""
-"To enable autosync, check the <gui>Automatically Sync in Background Every x "
-"Minutes</gui> box at the bottom of the Synchronization tab."
-msgstr ""
-"Para activar la sincronización automática, marque la casilla "
-"<gui>Sincronizar automáticamente en segundo plano cada x minutos</gui> en la "
-"parte inferior de la pestaña Sincronización."
-
-#: C/sync.page:66(p)
-msgid ""
-"Tomboy's default option is to autosync every 10 minutes. To change how often "
-"Tomboy should sync enter the number of minutes in the dialog or use your "
-"mouse to move the time up or down."
-msgstr ""
-"La opción predeterminada de Tomboy es sincronizar automáticamente cada 10 "
-"minutos. Para cambiar la frecuencia con que Tomboy debe sincronizar, "
-"introduzca el número de minutos en el diálogo o use su ratón para aumentar o "
-"disminuir el tiempo."
-
-#: C/sync.page:70(p)
-msgid ""
-"To disable autosync, uncheck the <gui>Automatically Sync in Background Every "
-"x Minutes</gui> box."
-msgstr ""
-"Para desactivar la sincronización automática, desmarque la casilla "
-"<gui>Sincronizar automáticamente en segundo plano cada x minutos</gui>."
-
 #: C/search.page:9(desc)
 msgid "Search your notes."
 msgstr "Buscar sus notas."
@@ -455,6 +452,87 @@ msgstr "Teclas rápidas de Tomboy"
 msgid "Syncing Notes"
 msgstr "Sincronizar las notas"
 
+#: C/pin-notes.page:9(desc)
+msgid "Access notes from <app>Tomboy</app> message tray icon."
+msgstr "Acceder a las notas de <app>Tomboy</app> desde la bandeja de mensajes."
+
+#: C/pin-notes.page:12(name) C/delete-notes.page:17(name)
+#: C/addins.page:15(name) C/addins-tools-timestamp.page:10(name)
+#: C/addins-tools-note-of-day.page:10(name)
+#: C/addins-tools-html-export.page:10(name)
+#: C/addins-tools-backlinks.page:10(name)
+#: C/addins-sync-webservice.page:10(name) C/addins-sync-webdav.page:10(name)
+#: C/addins-sync-ssh.page:10(name) C/addins-sync-local.page:10(name)
+#: C/addins-preferences.page:11(name)
+#: C/addins-formatting-underline.page:10(name)
+#: C/addins-formatting-fixed-width.page:10(name)
+#: C/addins-desktop-printing.page:10(name)
+#: C/addins-desktop-bugzilla.page:10(name)
+msgid "Sindhu S"
+msgstr "Sindhu S"
+
+#: C/pin-notes.page:13(email)
+msgid "sindhus at gnome.org"
+msgstr "sindhus at gnome.org"
+
+#: C/pin-notes.page:19(title)
+msgid "Pin a note"
+msgstr "Pinchar una nota"
+
+#: C/pin-notes.page:21(p)
+msgid ""
+"The recent list of <app>Tomboy</app> notes you have accessed are shown when "
+"you click on the <link xref=\"\">message tray icon</link>. This list is "
+"limited to twenty recent notes. If you have more than twenty notes, opening "
+"a note that is not in the recent list will require you to <link xref=\"search"
+"\">search all notes</link>."
+msgstr ""
+"La lista de notas recientes de <app>Tomboy</app> se muestra cuando pulsa en "
+"el <link xref=\"\">icono de la bandeja de mensajes</link>. Esta lista lista "
+"está limitada a 20 notas. Si tiene más de 20 notas y quiere abrir una nota "
+"que no está en la lista de notas recientes, deberá <link xref=\"search"
+"\">buscar en todas las notas</link>."
+
+#: C/pin-notes.page:27(p)
+msgid ""
+"To quickly access less frequently used notes, you can <em>pin</em> notes to "
+"the recent list."
+msgstr ""
+"Para acceder rápidamente a las notas menos usadas, puede<em>pincharlas</em> "
+"en la lista de notas recientes."
+
+#: C/pin-notes.page:31(title)
+msgid "To pin a note:"
+msgstr "Para pinchar una nota:"
+
+#: C/pin-notes.page:33(p)
+msgid "Click on the <app>Tomboy</app> icon in the message tray."
+msgstr "Pulse en el icono de <app>Tomboy</app> en la bandeja de mensajes."
+
+#: C/pin-notes.page:36(p)
+msgid ""
+"In the recent list, click on the gray pin icon to the right hand side of the "
+"note you wish to pin. The pin icon will change to in color to be green."
+msgstr ""
+"En la lista de notas recientes, pulse en el icono de la chincheta gris a la "
+"derecha de la nota que quiere pinchar. El icono se volverá de color verde."
+
+#: C/pin-notes.page:42(p)
+msgid ""
+"A note with a green pin icon indicates that the note has been <em>pinned</"
+"em> to the list."
+msgstr ""
+"Una nota con una chincheta verde indica que esa nota se ha <em>pinchado</em> "
+"en la lista."
+
+#: C/pin-notes.page:45(p)
+msgid ""
+"To remove a note <em>pinned</em> to the recent list, click on the green pin "
+"icon."
+msgstr ""
+"Para quitar una nota <em>pinchada</em> de la lista de notas recientes, pulse "
+"sobre el icono de la chincheta verde."
+
 #: C/note-edit-prefs.page:8(desc)
 msgid "Note editing preferences."
 msgstr "Preferencias de edición de notas."
@@ -676,10 +754,29 @@ msgstr ""
 "nueva. Cada vez que cree una nota nueva se mostrará esa plantilla en la nota "
 "nueva."
 
+#: C/legal.xml:3(p)
+msgid ""
+"This work is licensed under a <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 Unported "
+"License</link>."
+msgstr ""
+"Este trabajo está licenciado bajo una <link href=\"http://creativecommons."
+"org/licenses/by-sa/3.0/us/\">Licencia Creative Commons atribución - "
+"compartir igual 3.0 no portada</link>."
+
+#: C/legal.xml:6(p)
+msgid ""
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
+msgstr ""
+"Como excepción especial, los poseedores de los derechos de autor le dan "
+"permiso para copiar, modificar y distribuir el código de ejemplo contenido "
+"en este documento bajo los términos que usted elija, sin restricción."
+
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/introduction.page:44(None)
-#| msgid "@@image: 'figures/tomboy.png'; md5=5e3c78a4507fadcaba53b74a0d3f30ae"
 msgid "@@image: 'figures/tomboy.png'; md5=b9a2efd273d462e5374c3d624a65bd52"
 msgstr "@@image: 'figures/tomboy.png'; md5=b9a2efd273d462e5374c3d624a65bd52"
 
@@ -716,8 +813,8 @@ msgstr ""
 
 #: C/introduction.page:36(p)
 msgid ""
-"You can also sync your notes across multiple computers, making it easy to "
-"take your notes with you wherever you are."
+"You can also synchronize your notes across multiple computers, making it "
+"easy to take your notes with you wherever you are."
 msgstr ""
 "También puede sincronizar sus notas con múltiples equipos, haciendo más "
 "fácil llevarse sus notas esté donde esté."
@@ -940,78 +1037,70 @@ msgstr ""
 msgid "Delete a note in Tomboy."
 msgstr "Eliminar una nota en Tomboy."
 
-#: C/delete-notes.page:19(years)
+#: C/delete-notes.page:18(email) C/addins.page:16(email)
+#: C/addins-tools-timestamp.page:11(email)
+#: C/addins-tools-note-of-day.page:11(email)
+#: C/addins-tools-html-export.page:11(email)
+#: C/addins-tools-backlinks.page:11(email)
+#: C/addins-sync-webservice.page:11(email) C/addins-sync-webdav.page:11(email)
+#: C/addins-sync-ssh.page:11(email) C/addins-sync-local.page:11(email)
+#: C/addins-preferences.page:12(email)
+#: C/addins-formatting-underline.page:11(email)
+#: C/addins-formatting-fixed-width.page:11(email)
+#: C/addins-desktop-printing.page:11(email)
+#: C/addins-desktop-bugzilla.page:11(email)
+msgid "sindhus at live.in"
+msgstr "sindhus at live.in"
+
+#: C/delete-notes.page:22(years)
 msgid "2010"
 msgstr "2010"
 
-#: C/delete-notes.page:24(title)
+#: C/delete-notes.page:27(title)
 msgid "Delete a note"
 msgstr "Eliminar una nota"
 
-#: C/delete-notes.page:26(p)
+#: C/delete-notes.page:29(p)
 msgid ""
-"You can delete a note by pressing the <gui>Delete</gui> icon in the toolbar "
-"of the note you wish to delete."
+"If you wish to remove notes that you no longer need, you can delete them "
+"from <app>Tomboy</app>."
 msgstr ""
-"Puede eliminar una nota pulsando el icono <gui>Eliminar</gui> en la barra de "
-"herramientas de la nota que quiera eliminar."
+"Si quiere quitar las notas que ya no necesita, puede eliminarlas de "
+"<app>Tomboy</app>."
 
-#: C/delete-notes.page:30(p)
-msgid ""
-"Deleting a note is permanent. After deletion, the note is not recoverable."
-msgstr ""
-"Eliminar una nota es permanente. Después de eliminarla, la nota no se puede "
-"recuperar."
+#: C/delete-notes.page:33(title)
+msgid "To delete a note:"
+msgstr "Para eliminar una nota:"
 
-#: C/delete-notes.page:31(p)
-msgid ""
-"You will be prompted <gui>Really delete this note?</gui> when deleting a "
-"note."
-msgstr ""
-"Se le preguntará <gui>¿Realmente quiere eliminar esta nota?</gui> cuando "
-"elimine una nota."
+#: C/delete-notes.page:35(p) C/addins-desktop-printing.page:27(p)
+msgid "Open the desired note."
+msgstr "Abra la nota."
 
-#: C/create-note.page:10(desc)
-msgid "Create a new note in Tomboy."
-msgstr "Crear una nota nueva en Tomboy."
-
-#: C/create-note.page:25(title)
-msgid "Create a new note"
-msgstr "Crear una nota nueva"
-
-#: C/create-note.page:27(p)
+#: C/delete-notes.page:38(p)
 msgid ""
-"You can create a new note in Tomboy by clicking on the Tomboy icon in the "
-"GNOME panel, Windows taskbar, or OS X dock, and then choosing <gui>Create "
-"New Note</gui>. You can also use the keyboard shortcuts by pressing "
-"<keyseq><key>Alt + F12</key></keyseq>."
+"Click the <gui>Delete</gui> icon from the toolbar. You will be prompted to "
+"confirm the deletion."
 msgstr ""
-"Puede crear una nota nueva en Tomboy pulsando en el icono de Tomboy en el "
-"panel de GNOME, la barra de tareas de Windows o en el «dock» de OS X, y "
-"eligiendo <gui>Crear nota nueva</gui>. También puede usar los atajos de "
-"teclado, pulsando <keyseq><key>Alt + F12</key></keyseq>."
+"Pulse el icono <gui>Eliminar</gui> en la barra de herramientas. Se le pedirá "
+"que confirme la eliminación."
 
-#: C/create-note.page:32(p)
+#: C/delete-notes.page:44(p)
 msgid ""
-"The new note will display a new window with the title New Note <em>N</em>. "
-"The note contains a toolbar, with options to search your notes, link notes, "
-"format the text within a note, and more. For more information, see <link "
-"xref=\"edit-notes\"/>."
+"Deleting a note is a permanent action. Notes once deleted, cannot be "
+"recovered."
 msgstr ""
-"La nota nueva mostrara una ventana nueva con el título «Nota nueva <em>N</"
-"em>». La nota contiene una barra de herramientas con opciones para buscar "
-"sus notas, enlazar notas, formatear el texto de la nota y más. Para obtener "
-"más información, consulte la <link xref=\"edit-notes\"/>."
+"Eliminar una nota es permanente. Una vez eliminada, la nota no se puede "
+"recuperar."
 
-#: C/create-notebook.page:10(desc)
+#: C/create-notebook.page:8(desc)
 msgid "Create a new notebook in Tomboy."
 msgstr "Crear un cuaderno de notas nuevo en Tomboy."
 
-#: C/create-notebook.page:25(title)
+#: C/create-notebook.page:23(title)
 msgid "Create a notebook"
 msgstr "Crear un cuaderno de notas"
 
-#: C/create-notebook.page:27(p)
+#: C/create-notebook.page:25(p)
 msgid ""
 "Notebooks allow you to group related notes together. You can add a note to a "
 "notebook in the Search All Notes window or directly inside of a Note."
@@ -1020,7 +1109,7 @@ msgstr ""
 "una nota a un cuaderno de notas en la ventana Buscar en todas las notas o "
 "directamente dentro de una nota."
 
-#: C/create-notebook.page:33(p)
+#: C/create-notebook.page:31(p)
 msgid ""
 "Click on the Tomboy note icon present in the GNOME Panel, the taskbar in "
 "Microsoft Windows, or the dock in Mac OS X. A menu will appear."
@@ -1028,24 +1117,24 @@ msgstr ""
 "Pulse sobre el icono de Tomboy presente en el panel de GNOME, la barra de "
 "tareas en Microsoft Windows, o el «dock» en Mac OS X. Aparecerá un menú."
 
-#: C/create-notebook.page:43(p)
+#: C/create-notebook.page:41(p)
 msgid "Select <guiseq><gui>Notebooks</gui><gui>New Notebook</gui></guiseq>."
 msgstr ""
 "Seleccione <guiseq><gui>Cuadernos de notas</gui><gui>Cuaderno de notas "
 "nuevo</gui></guiseq>."
 
-#: C/create-notebook.page:47(p) C/create-notebook.page:66(p)
-#: C/create-notebook.page:79(p)
+#: C/create-notebook.page:45(p) C/create-notebook.page:64(p)
+#: C/create-notebook.page:77(p)
 msgid "Enter a name for the new notebook."
 msgstr "Introduzca un nombre para el cuaderno de notas nuevo."
 
-#: C/create-notebook.page:51(p)
+#: C/create-notebook.page:49(p)
 msgid "To create a new notebook from the <gui>Search All Notes</gui> dialog:"
 msgstr ""
 "Para crear un cuaderno de notas nuevo desde el diálogo <gui>Buscar en todas "
 "las notas</gui>:"
 
-#: C/create-notebook.page:56(p)
+#: C/create-notebook.page:54(p)
 msgid ""
 "Open <gui>Search All Notes</gui> by choosing it from the Tomboy icon on the "
 "GNOME Panel, the taskbar in Microsoft Windows, or the dock in Mac OS X, or "
@@ -1055,7 +1144,7 @@ msgstr ""
 "Tomboy en el panel de GNOME, la barra de tareas en Microsoft Windows, o el "
 "«dock» en Mac OS X, o pulse Buscar en una nota abierta."
 
-#: C/create-notebook.page:62(p)
+#: C/create-notebook.page:60(p)
 msgid ""
 "Using your mouse, right click in the left hand box and choose <gui>New "
 "Notebook</gui>."
@@ -1063,11 +1152,11 @@ msgstr ""
 "Usando su ratón, pulse con el botón derecho en la caja de la izquierda y "
 "elija <gui>Nuevo cuaderno de notas</gui>."
 
-#: C/create-notebook.page:70(p)
+#: C/create-notebook.page:68(p)
 msgid "Or:"
 msgstr "O:"
 
-#: C/create-notebook.page:74(p)
+#: C/create-notebook.page:72(p)
 msgid ""
 "With <gui>Search All Notes</gui> open, choose <guiseq><gui>File</"
 "gui><gui>Notebooks</gui><gui>New Notebook</gui></guiseq>."
@@ -1076,336 +1165,803 @@ msgstr ""
 "<guiseq><gui>Archivo</gui><gui>Notebooks</gui><gui>Cuaderno de notas nuevo</"
 "gui></guiseq>."
 
-#: C/addins-tools.page:7(desc)
-msgid "Enable additional note functionality."
-msgstr "Activar funcionalidad adicional de la nota."
+#: C/create-note.page:10(desc)
+msgid "Create a new note in Tomboy."
+msgstr "Crear una nota nueva en Tomboy."
 
-#: C/addins-tools.page:22(title)
-msgid "Tomboy Tools Addins"
-msgstr "Complementos de herramientas de Tomboy"
+#: C/create-note.page:25(title)
+msgid "Create a new note"
+msgstr "Crear una nota nueva"
 
-#: C/addins-tools.page:24(p)
-msgid "Tools addins add additional functionality to your Tomboy notes."
-msgstr "Los complementos añaden funcionalidad adicional a sus notas Tomboy."
+#: C/create-note.page:27(p)
+msgid ""
+"You can create a new note in Tomboy by clicking on the Tomboy icon in the "
+"GNOME panel, Windows taskbar, or OS X dock, and then choosing <gui>Create "
+"New Note</gui>. You can also use the keyboard shortcuts by pressing "
+"<keyseq><key>Alt + F12</key></keyseq>."
+msgstr ""
+"Puede crear una nota nueva en Tomboy pulsando en el icono de Tomboy en el "
+"panel de GNOME, la barra de tareas de Windows o en el «dock» de OS X, y "
+"eligiendo <gui>Crear nota nueva</gui>. También puede usar los atajos de "
+"teclado, pulsando <keyseq><key>Alt + F12</key></keyseq>."
 
-#: C/addins-tools.page:27(title)
-msgid "Backlinks"
-msgstr "Retroenlaces"
+#: C/create-note.page:32(p)
+msgid ""
+"The new note will display a new window with the title New Note <em>N</em>. "
+"The note contains a toolbar, with options to search your notes, link notes, "
+"format the text within a note, and more. For more information, see <link "
+"xref=\"edit-notes\"/>."
+msgstr ""
+"La nota nueva mostrara una ventana nueva con el título «Nota nueva <em>N</"
+"em>». La nota contiene una barra de herramientas con opciones para buscar "
+"sus notas, enlazar notas, formatear el texto de la nota y más. Para obtener "
+"más información, consulte la <link xref=\"edit-notes\"/>."
+
+#: C/addins.page:8(desc)
+msgid "Add additional functionality to Tomboy."
+msgstr "Añadir funcionalidad adicional a Tomboy."
 
-#: C/addins-tools.page:28(p)
+#: C/addins.page:21(title)
+msgid "Tomboy add-ins"
+msgstr "Complementos de Tomboy"
+
+#: C/addins.page:23(p)
 msgid ""
-"The <gui>Backlinks</gui> addin is enabled by default and allows you to see "
-"which notes link to the note you are currently viewing."
+"<gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended "
+"features and functionality which are not available by default."
 msgstr ""
-"El complemento <gui>Retroenlaces</gui> está activado de manera "
-"predeterminada y le permite ver qué notas enlazan con la nota que está "
-"viendo actualmente."
+"Los <gui>Complementos</gui> de <app>Tomboy</app> amplían su funcionalidad "
+"con características que no están disponibles de manera predeterminada."
 
-#: C/addins-tools.page:33(title)
-msgid "Export to HTML"
-msgstr "Exportar a HTML"
+#: C/addins.page:27(title)
+msgid "To enable an add-in:"
+msgstr "Para activar un complemento:"
+
+#: C/addins.page:29(p)
+msgid ""
+"Select <guiseq><gui style=\"menu\">Edit</gui><gui style=\"menuitem"
+"\">Preferences</gui><gui style=\"tab\">Add-ins</gui></guiseq>."
+msgstr ""
+"Seleccione <guiseq><gui style=\"menu\">Editar</gui><gui style=\"menuitem"
+"\">Preferencias</gui><gui style=\"tab\">Complementos</gui></guiseq>."
+
+#: C/addins.page:32(p)
+msgid "Click on <gui>+</gui> to expand the add-in category."
+msgstr "Pulse en <gui>+</gui> para expandir la categoría del complemento."
+
+#: C/addins.page:35(p)
+msgid "Select the add-in you wish to enable."
+msgstr "Seleccione el complemento que quiere activar."
+
+#: C/addins.page:38(p)
+msgid "Press <gui style=\"button\">Enable</gui>."
+msgstr "Pulse <gui style=\"button\">Activar</gui>."
 
-#: C/addins-tools.page:34(p)
+#: C/addins.page:43(p)
 msgid ""
-"The <gui>Export to HTML</gui> addin is enabled by default and will export an "
-"individual note to HTML."
+"To download more add-ins from the internet, from the <gui><app>Tomboy</app> "
+"Preferences</gui> window, in the <gui style=\"tab\">Add-ins</gui> tab, click "
+"on <gui style=\"button\">Get More Add-Ins…</gui>."
 msgstr ""
-"El complemento <gui>Exportar a HTML</gui> está activado de manera "
-"predeterminada, y exportará una nota individual a HTML."
+"Para descargar más complementos de Internet, vaya a la pestaña <gui style="
+"\"tab\">Complementos</gui> de la ventana <gui>Preferencias de <app>Tomboy</"
+"app></gui> y pulse en <gui style=\"button\">Obtener más complementos…</gui>."
+
+#: C/addins.page:49(title)
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: C/addins.page:53(title)
+msgid "Tools"
+msgstr "Herramientas"
+
+#: C/addins.page:57(title)
+msgid "Desktop Integration"
+msgstr "Integración con el escritorio"
+
+#: C/addins.page:61(title)
+msgid "Synchronization"
+msgstr "Sincronización"
 
-#: C/addins-tools.page:36(p)
+#: C/addins.page:62(p)
 msgid ""
-"To export a note to HTML, press the <gui>Tools</gui> icon in the note "
-"toolbar and choose <gui>Export to HTML</gui>. You will immediately be "
-"presented with a dialog to save the note. Choose the directory you wish to "
-"save the note in and change the name of note's new html file if you wish it "
-"to be different than the note name. The note will then be saved as an HTML "
-"file and automatically displayed in your browser."
+"Synchronization add-ins allow you to choose different methods and places to "
+"synchronize your Tomboy notes."
 msgstr ""
-"Para exportar una nota a HTML, pulse el icono <gui>Herramientas</gui> en la "
-"barra de herramientas de la nota y elija <gui>Exportar a HTML</gui>. "
-"Inmediatamente aparecerá un diálogo para guardar la nota. Seleccione la "
-"carpeta en la que quiere guardar la nota y cambie el nombre del archivo html "
-"nuevo de la nota si quiere que sea diferente del nombre de la nota. La nota "
-"se guardará como un archivo HTML y se mostrará automáticamente en su "
-"navegador."
+"Los complementos de sincronización le permiten elegir diferentes métodos y "
+"lugares para sincronizar sus notas Tomboy."
+
+#: C/addins.page:66(title)
+msgid "Formatting"
+msgstr "Formateado"
 
-#: C/addins-tools.page:45(title)
+#: C/addins-tools-timestamp.page:7(desc)
+msgid "Insert date and time in your notes."
+msgstr "Insertar la fecha y la hora en sus notas."
+
+#: C/addins-tools-timestamp.page:15(title)
 msgid "Insert Timestamp"
 msgstr "Insertar marca de tiempo"
 
-#: C/addins-tools.page:46(p)
+#: C/addins-tools-timestamp.page:17(p)
+msgid ""
+"The <gui>Insert Timestamp</gui> add-in allows you to insert date and time "
+"into your notes. This add-in is disabled by default."
+msgstr ""
+"El complemento <gui>Insertar marca de tiempo</gui> le permite insertar la "
+"fecha ya la hora en sus notas. Este complemento está desactivado de manera "
+"predeterminada."
+
+#: C/addins-tools-timestamp.page:21(title)
+msgid "To use the <gui>Insert Timestamp</gui> addin:"
+msgstr "Para usar el complemento <gui>Insertar marca de tiempo</gui>:"
+
+#: C/addins-tools-timestamp.page:23(p)
 msgid ""
-"The <gui>Insert Timestamp</gui> addin is disabled by default. To enable it, "
-"choose the <gui>Insert Timestamp</gui> addin and then press <gui>Enable</"
-"gui> in the Tomboy Preferences."
+"From the gears icon in the note toolbar, select <gui style=\"menuitem"
+"\">Insert Timestamp</gui>."
 msgstr ""
-"El complemento <gui>Insertar marca de tiempo</gui> está desactivado de "
-"manera predeterminada. Para activarlo, seleccione el complemento "
-"<gui>Insertar marca de tiempo</gui> y pulse <gui>Activar</gui> en las "
-"preferencias de Tomboy."
+"Desde el icono de la rueda dentada en la barra de herramientas de la nota, "
+"seleccione <gui style=\"menuitem\">Insertar marca de tiempo</gui>."
 
-#: C/addins-tools.page:49(p)
+#: C/addins-tools-timestamp.page:29(p)
 msgid ""
-"To add a timestamp to your notes, press the <gui>Tools</gui> icon in the "
-"note toolbar and choose <gui>Insert Timestamp</gui> or press <key>Ctrl + D</"
-"key>."
+"To quickly insert a timestamp in a note, press <keyseq><key>Ctrl</"
+"key><key>D</key></keyseq>."
 msgstr ""
-"Para añadir una marca de tiempo a sus notas, pulse sobre el icono "
-"<gui>Herramientas</gui> en la barra de herramientas de la nota y elija "
-"<gui>Insertar marca de tiempo</gui> o pulse <key>Ctrl + D</key>."
+"Para insertar rápidamente una marca de tiempo en una nota, pulse "
+"<keyseq><key>Ctrl</key><key>D</key></keyseq>."
 
-#: C/addins-tools.page:55(title)
+#: C/addins-tools-note-of-day.page:7(desc)
+msgid "Automatically create notes for each day."
+msgstr "Crear notas automáticamente para cada día."
+
+#: C/addins-tools-note-of-day.page:16(title)
 msgid "Note of the Day"
 msgstr "Nota del día"
 
-#: C/addins-tools.page:56(p)
+#: C/addins-tools-note-of-day.page:18(p)
 msgid ""
-"The <gui>Note of the Day</gui> addin is disabled by default. To enable, "
-"choose the <gui>Note of the Day</gui> addin and then press <gui>Enable</gui> "
-"in the Tomboy Preferences."
+"You can automatically create notes for each day. These notes come ready with "
+"text containing day and date information for the day.Example: <em>Today: "
+"Thursday, January 21 2010</em>. This add-in is disabled by default."
 msgstr ""
-"El complemento <gui>Nota del día</gui> está desactivado de manera "
-"predeterminada. Para activarlo, elija el complemento <gui>Nota del día</gui> "
-"y pulse <gui>Activar</gui> en las preferencias de Tomboy."
+"Puede crear notas para cada día automáticamente. Estas notas incluyen un "
+"texto con información sobre la fecha y la hora del día. Ejemplo: <em>Hoy: "
+"miércoles 9 de octubre de 2013</em>. Este complemento está desactivado de "
+"manera predeterminada."
+
+#: C/addins-tools-note-of-day.page:24(title)
+msgid "To open the note of the day:"
+msgstr "Para abrir la nota del día:"
+
+#: C/addins-tools-note-of-day.page:26(p)
+msgid "Click on the <app>Tomboy</app> icon in your message tray."
+msgstr "Pulse en el icono de <app>Tomboy</app> en la bandeja de mensajes."
+
+#: C/addins-tools-note-of-day.page:29(p)
+msgid "Select from the list of notes, note with current date."
+msgstr "En la lista de notas, selecciona una nota con la fecha actual."
 
-#: C/addins-tools.page:59(p)
+#: C/addins-tools-note-of-day.page:34(p)
 msgid ""
-"<gui>Note of the Day</gui> addin will create a new note daily with the title "
-"<em>Today: Thursday, January 21 2010</em> for example. The note will also "
-"add rows for <em>Tasks</em> and <em>Appointment</em> automatically."
+"The note will also add rows for <em>Tasks</em> and <em>Appointment</em> "
+"automatically."
 msgstr ""
-"El complemento <gui>Nota del día</gui> creara una nota diaria con el título "
-"<em>Hoy: jueves, 21 de enero de 2010</em>, por ejemplo. La nota también "
-"añadirá filas a <em>Tareas</em> y <em>Citas</em> automáticamente."
+"La nota añadirá filas para <em>Tareas</em> y <em>Cita</em> automáticamente."
 
-#: C/addins-tools.page:65(title)
-msgid "Note Directory Watcher"
-msgstr "Vigilante de la carpeta de notas"
+#: C/addins-tools-html-export.page:7(desc)
+msgid "Export notes to HTML."
+msgstr "Exportar notas a HTML."
 
-#: C/addins-tools.page:66(p)
+#: C/addins-tools-html-export.page:16(title)
+msgid "Export to HTML"
+msgstr "Exportar a HTML"
+
+#: C/addins-tools-html-export.page:18(p)
 msgid ""
-"The Note Directory Watcher addin monitors the directory your Tomboy notes "
-"are saved in. If the addin detects changes to your notes, it will apply "
-"those changes and they will be displayed in your notes. This addin is "
-"typically used with 3rd party sync services such as Dropbox. Setting up 3rd "
-"party sync services is outside the scope of this help."
+"You can export individual <app>Tomboy</app> notes to HTML pages with the "
+"<gui>Export to HTML</gui> add-in. This addin is enabled by default."
 msgstr ""
-"El complemento Vigilante de la carpeta de notas monitoriza la carpeta en la "
-"que Tomboy guarda sus notas. Si el complemento detecta cambios en sus notas, "
-"aplicará estos cambios y se mostrarán en sus notas. Este complemento se usa "
-"habitualmente con servicios de sincronización de terceras partes tales como "
-"Dropbox. La configuración de servicios de sincronización de terceras partes "
-"está fuera del objetivo de este documento."
+"Puede exportar notas individuales de <app>Tomboy</app> a páginas HTML usando "
+"el complemento <gui>Exportar a HTML</gui>. Este complemento está activado de "
+"manera predeterminada."
 
-#: C/addins-sync.page:7(desc)
-msgid "Enable additional ways to sync your notes with other devices."
-msgstr ""
-"Activar formas adicionales de sincronizar sus notas con otros dispositivos."
+#: C/addins-tools-html-export.page:21(title)
+msgid "To export a note to HTML:"
+msgstr "Para exportar una nota a HTML:"
 
-#: C/addins-sync.page:22(title)
-msgid "Sync Addins"
-msgstr "Sincronizar complementos"
+#: C/addins-tools-html-export.page:23(p)
+msgid ""
+"From the gears icon in the note toolbar, select <gui style=\"menuitem"
+"\">Export to HTML</gui>."
+msgstr ""
+"Desde el icono de la rueda dentada en la barra de herramientas de la nota, "
+"seleccione <gui style=\"menuitem\">Exportar a HTML</gui>."
 
-#: C/addins-sync.page:24(p)
+#: C/addins-tools-html-export.page:26(p)
 msgid ""
-"Sync Addins allow you to choose different methods and places to sync your "
-"Tomboy notes. For more information on configuring sync, visit the <link xref="
-"\"sync-notes\"/> help page."
+"Browse and select the directory you wish to save the note to. You may change "
+"the name of the html file, if you wish it to be different than the name of "
+"the note."
 msgstr ""
-"Los complementos de sincronización le permiten elegir diferentes métodos y "
-"lugares para sincronizar sus notas Tomboy. Para obtener más información, o "
-"configuración de la sincronización, consulte la página de ayuda <link xref="
-"\"sync-notes\"/>."
+"Examine y selecciona la carpeta en la que quiere guardar la nota. Puede "
+"cambiar el nombre del archivo HTML, si quiere que sea diferente del nombre "
+"de la nota."
 
-#: C/addins-sync.page:30(title)
-msgid "Local Directory Sync Service"
-msgstr "Servicio de sincronización de carpetas locales"
+#: C/addins-tools-html-export.page:29(p)
+msgid "Press <gui style=\"button\">Save</gui>."
+msgstr "Pulse <gui style=\"button\">Guardar</gui>."
 
-#: C/addins-sync.page:31(p)
+#: C/addins-tools-html-export.page:33(p)
 msgid ""
-"The Local Directory Sync Service is enabled by default and allows Tomboy to "
-"sync its notes to another directory on your computer. This is helpful to "
-"create a backup of your notes."
+"The note will then be saved as an HTML file and opened in your default web "
+"browser."
 msgstr ""
-"El servicio de sincronización de carpeta local está activado de manera "
-"predeterminada y permite a Tomboy sincronizar sus notas con otra carpeta en "
-"su equipo. Esto es útil para crear copias de respaldo de sus notas."
+"La nota se guardará como un archivo HTML y se abrirá con su navegador web "
+"predeterminado."
 
-#: C/addins-sync.page:37(title)
-msgid "SSH Sync Service"
-msgstr "Servicio de sincronización SSH"
+#: C/addins-tools-backlinks.page:7(desc)
+msgid "See notes that link to each other."
+msgstr "Ver las notas que enlazan con otras."
+
+#: C/addins-tools-backlinks.page:16(title)
+msgid "Backlinks"
+msgstr "Retroenlaces"
 
-#: C/addins-sync.page:38(p)
+#: C/addins-tools-backlinks.page:18(p)
 msgid ""
-"The SSH Sync Service allows you to sync your notes with another computer via "
-"the SSH protocol. This plugin is disabled by default. You may need to "
-"install the <em>sshfs</em> package for your Linux distribution to make this "
-"addin work, which is outside the scope of this help document."
+"The <gui>Backlinks</gui> addin is enabled by default. This addin enables you "
+"to view which notes link to the note you are currently viewing. Such links "
+"to a note are called <em>Backlinks</em>."
 msgstr ""
-"El servicio de sincronización SSH le permite sincronizar sus notas con otro "
-"equipo a través del protocolo SSH. Este complemento está desactivado de "
-"manera predeterminada. Es posible que deba instalar el paquete <em>sshfs</"
-"em> para su distribución de Linux para hacer que este complemento funcione, "
-"algo que está fuera del objetivo de este documento de ayuda."
+"El complemento <gui>Retroenlaces</gui> está activado de manera "
+"predeterminada y le permite ver qué notas enlazan con la nota que está "
+"viendo actualmente. Estos enlaces se llaman <em>Retroenlaces</em>"
 
-#: C/addins-sync.page:46(title)
-msgid "WebDav Sync Service"
-msgstr "Servicio de sincronización WebDav"
+#: C/addins-tools-backlinks.page:21(title)
+msgid "To create and view backlinks of a note:"
+msgstr "Para crear y ver los retroenlaces de una nota:"
 
-#: C/addins-sync.page:47(p)
+#: C/addins-tools-backlinks.page:23(p)
+msgid "Start typing the title of a note in any note."
+msgstr "Empiece a escribir el título de una nota en cualquier nota."
+
+#: C/addins-tools-backlinks.page:27(p)
 msgid ""
-"The WebDav Sync Service addin is enabled by default and allows you to sync "
-"your notes with a WebDav remote server. You may need to have the <em>wdfs "
-"FUSE file system</em> package installed for your Linux distribution to make "
-"this addin work which is outside the scope of this help document."
+"For <app>Tomboy</app> to create automatic links to existing notes, the text "
+"you type must match the title of an existing note."
 msgstr ""
-"El complemento de servicio de sincronización WebDav está activado de manera "
-"predeterminada y le permite sincronizar sus notas con un servidor WebDav "
-"remoto. Puede necesitar tener instalado el paquete <em>wdfs FUSE file "
-"system</em> en su distribución Linux para que este complemento funcione, lo "
-"que está fuera del objetivo de este documento."
+"Para que <app>Tomboy</app> cree enlaces automáticamente a las notas "
+"existentes, el texto que escriba debe coincidir con el título de una nota "
+"que ya exista."
+
+#: C/addins-sync-webservice.page:7(desc)
+msgid "Sync your notes to a service on the Internet."
+msgstr "Sincronizar sus notas con un servicio de Internet."
 
-#: C/addins-sync.page:55(title)
+#: C/addins-sync-webservice.page:17(title)
 msgid "Web Sync Service"
 msgstr "Servicio de sincronización Web"
 
-#: C/addins-sync.page:56(p)
+#: C/addins-sync-webservice.page:19(p)
 msgid ""
-"The Web Sync Service addin allows you to sync your notes to a remote web "
-"server or service, such as Tomboy Online. At the time of writing, the Tomboy "
-"Online service has not launched."
+"The Web Sync Service add-in allows you to synchronize your notes to a remote "
+"web server or other compatible web services."
 msgstr ""
 "El complemento de servicio de sincronización web le permite sincronizar sus "
-"notas con un servicio o un servidor web remoto, como Tomboy Online. En el "
-"momento de escribir esto, el servicio Tomboy Online no se ha iniciado."
+"notas con un servidor web remoto o con otros servicios web compatibles."
 
-#: C/addins.page:8(desc)
-msgid "Add additional functionality to Tomboy."
-msgstr "Añadir funcionalidad adicional a Tomboy."
+#: C/addins-sync-webdav.page:7(desc)
+msgid "Sync your notes to a WebDav server."
+msgstr "Sincronizar sus notas con un servidor WebDav."
 
-#: C/addins.page:23(title) C/addins.page:27(title)
-msgid "Tomboy Addins"
-msgstr "Complementos de Tomboy"
+#: C/addins-sync-webdav.page:17(title)
+msgid "WebDav Sync Service"
+msgstr "Servicio de sincronización WebDav"
 
-#: C/addins.page:29(title)
-msgid "Manage addins for Tomboy"
-msgstr "Gestionar complementos de Tomboy"
+#: C/addins-sync-webdav.page:19(p)
+msgid ""
+"The WebDav Sync Service add-in allows you to synchronize your notes with "
+"WebDav remote server. This addin is enabled by default."
+msgstr ""
+"El complemento de servicio de sincronización WebDav le permite sincronizar "
+"sus notas con un servidor WebDav remoto. Este complemento está activado de "
+"manera predeterminada."
 
-#: C/addins-formatting.page:7(desc)
-msgid "Plugins to add addition note formatting."
-msgstr "Complementos para añadir formateo adicional de nota."
+#: C/addins-sync-webdav.page:22(p)
+msgid ""
+"To use the WebDav Sync Service, you will need to have the <em>wdfs FUSE file "
+"system</em> package installed for your Linux distribution. The user help for "
+"which is outside the scope of this document."
+msgstr ""
+"Para usar el complemento de servicio de sincronización WebDav necesita tener "
+"instalado el paquete <em>wdfs FUSE file system</em> en su distribución "
+"Linux, algo que está fuera del objetivo de este documento."
 
-#: C/addins-formatting.page:22(title)
-msgid "Formatting Addins"
-msgstr "Complementos de formateado"
+#: C/addins-sync-ssh.page:7(desc)
+msgid "Sync your notes to another computer through SSH."
+msgstr "Sincronizar sus notas con otro equipo mediante SSH."
 
-#: C/addins-formatting.page:25(title)
-msgid "Fixed Width Addin"
-msgstr "Complemento de anchura fija"
+#: C/addins-sync-ssh.page:17(title)
+msgid "SSH Sync Service"
+msgstr "Servicio de sincronización SSH"
 
-#: C/addins-formatting.page:26(p)
+#: C/addins-sync-ssh.page:19(p)
 msgid ""
-"The Fixed Width addin changes your text to be of a fixed width in the Tomboy "
-"note. This addin is disabled by default. To enable, press the <gui>Enable</"
-"gui> button."
+"The SSH Sync Service add-in allows you to synchronize your notes with "
+"another computer using the SSH protocol. This add-in is disabled by default."
 msgstr ""
-"El complemento de anchura fija cambia su texto para que tenga una anchura "
-"fija en la nota Tomboy. Este complemento está desactivado de manera "
-"predeterminada. Para activarlo, pulse el botón <gui>Activar</gui>."
+"El complemento de servicio de sincronización por SSH le permite sincronizar "
+"sus notas con otro equipo usando el protocolo SSH. Este complemento está "
+"desactivado de manera predeterminada."
 
-#: C/addins-formatting.page:31(title)
-msgid "Underline Addin"
+#: C/addins-sync-ssh.page:23(p)
+msgid ""
+"To use this add-in, you may need to install the <em>sshfs</em> package for "
+"your Linux distribution. User help to setup SSH support is outside the scope "
+"of this document."
+msgstr ""
+"Es posible que deba instalar el paquete <em>sshfs</em> para su distribución "
+"de Linux para que este complemento funcione, algo que está fuera del "
+"objetivo de este documento de ayuda."
+
+#: C/addins-sync-local.page:7(desc)
+msgid "Sync your notes to a local directory."
+msgstr "Sincronizar sus notas con una carpeta local."
+
+#: C/addins-sync-local.page:17(title)
+msgid "Local Directory Sync Service"
+msgstr "Servicio de sincronización de carpetas locales"
+
+#: C/addins-sync-local.page:19(p)
+msgid ""
+"The Local Directory Sync Service add-in allows you to synchronize "
+"<app>Tomboy</app> notes to a folder on your computer. This is helpful to "
+"create a backup of your notes. This add-in is enabled by default."
+msgstr ""
+"El servicio de sincronización de carpeta local está activado de manera "
+"predeterminada y permite a <app>Tomboy</app> sincronizar sus notas con otra "
+"carpeta en su equipo. Esto es útil para crear copias de respaldo de sus "
+"notas."
+
+#: C/addins-preferences.page:8(desc)
+msgid "Enable advanced options plugins."
+msgstr "Activar los complementos de opciones avanzadas."
+
+#: C/addins-preferences.page:17(title)
+msgid "Advanced Preferences"
+msgstr "Preferencias avanzadas"
+
+#: C/addins-preferences.page:19(p)
+msgid ""
+"The <gui>Advanced Preferences</gui> add-in allows you to set the number of "
+"recent notes that are shown in the recent list. This addin must be <link "
+"xref=\"addins\">enabled</link> for you to be able to use it."
+msgstr ""
+"El complemento <gui>Preferencias avanzadas</gui> le permite establecer el "
+"número de notas recientes que se muestran en la lista de recientes. Debe "
+"<link xref=\"addins\">activar</link> este complemento para poder usarlo."
+
+#: C/addins-preferences.page:22(title)
+msgid "Control recent notes"
+msgstr "Controlar las notas recientes"
+
+#: C/addins-preferences.page:23(p)
+msgid ""
+"You can set the minimum and maximum recent notes to be displayed when you "
+"click on <app>Tomboy</app> message tray icon:"
+msgstr ""
+"Puede configurar el número mínimo y máximo de notas recientes que es "
+"muestran cuando pulsa en el icono de la bandeja de mensajes de <app>Tomboy</"
+"app>:"
+
+#: C/addins-preferences.page:27(p)
+msgid ""
+"Select <guiseq><gui style=\"menu\">Edit</gui><gui style=\"menuitem"
+"\">Preferences</gui><gui style=\"tab\">Advanced</gui></guiseq>."
+msgstr ""
+"Seleccione <guiseq><gui style=\"menu\">Editar</gui><gui style=\"menuitem"
+"\">Preferencias</gui><gui style=\"tab\">Avanzado</gui></guiseq>."
+
+#: C/addins-preferences.page:30(p)
+msgid ""
+"Set the minimum and maximum number of notes to be shown in the recent notes "
+"list."
+msgstr ""
+"Establezca el número mínimo y máximo de notas que mostrar en la lista de "
+"notas recientes."
+
+#: C/addins-preferences.page:37(title)
+msgid "Startup notes"
+msgstr "Notas al inicio"
+
+#: C/addins-preferences.page:40(title)
+msgid "To enable startup notes:"
+msgstr "Para activar las notas al inicio:"
+
+#: C/addins-preferences.page:42(p)
+msgid ""
+"Click on the <app>Tomboy</app> icon and select <guiseq><gui style=\"menuitem"
+"\">Preferences</gui><gui style=\"tab\">Advanced</gui></guiseq>."
+msgstr ""
+"Pulse sobre el icono de <app>Tomboy</app> y seleccione <guiseq><gui style="
+"\"menuitem\">Preferencias</gui><gui style=\"tab\">Avanzado</gui></guiseq>."
+
+#: C/addins-preferences.page:47(p)
+msgid "Select <gui style=\"checkbox\">Enable startup notes</gui>,"
+msgstr "Seleccione <gui style=\"checkbox\">Activar notas al inicio</gui>,"
+
+#: C/addins-formatting-underline.page:7(desc)
+msgid "Plugin to underline text in note."
+msgstr "Complemento para subrayar texto en una nota."
+
+#: C/addins-formatting-underline.page:17(title)
+msgid "Underline Add-in"
 msgstr "Complemento de subrayado"
 
-#: C/addins-formatting.page:32(p)
+#: C/addins-formatting-underline.page:19(p)
 msgid ""
-"The Underline addin allows you to underline specific text in your note using "
-"the <gui>Text</gui> icon in a note toolbar. This addin is disabled by "
-"default. To enable, press the <gui>Enable</gui> button. Highlight the text "
-"you would like to underline, press the <gui>Text</gui> icon in the note "
-"toolbar, and choose <gui>Underline</gui> or press <keyseq><key>CONTROL + U</"
-"key></keyseq>."
+"The Underline add-in allows you to underline specific text in your note. "
+"This add-in is disabled by default."
 msgstr ""
 "El complemento de subrayado le permite subrayar un texto específico en su "
-"nota usando el icono <gui>Texto</gui> en la barra de herramientas de una "
-"nota. Este complemento está desactivado de manera predeterminada. Para "
-"activarlo, pulse el botón <gui>Activar</gui>. Seleccione el texto que quiere "
-"subrayar, pulse el icono <gui>Texto</gui> en la barra de herramientas de la "
-"nota, y elija <gui>Subrayar</gui> o pulse <keyseq><key>Control + U</key></"
-"keyseq>."
+"nota. Este complemento está desactivado de manera predeterminada."
+
+#: C/addins-formatting-underline.page:23(title)
+msgid "To use the Underline add-in:"
+msgstr "Para usar el complemento de subrayado:"
 
-#: C/addins-desktop.page:7(desc)
-msgid "Plugins to integrate with other applications and websites."
-msgstr "Complementos para integrar con otras aplicaciones y sitios web."
+#: C/addins-formatting-underline.page:25(p)
+msgid "<link xref=\"addins\">Enable</link> the Underline add-in."
+msgstr "<link xref=\"addins\">Active</link> el complemento de subrayado."
 
-#: C/addins-desktop.page:22(title)
-msgid "Desktop Integration Addins"
-msgstr "Complementos de integración del escritorio"
+#: C/addins-formatting-underline.page:28(p)
+msgid "Select the desired text."
+msgstr "Seleccione el texto que quiere"
 
-#: C/addins-desktop.page:24(p)
+#: C/addins-formatting-underline.page:31(p)
 msgid ""
-"Desktop Integration addins interact with other applications or websites and "
-"Tomboy."
+"From the <gui style=\"button\">Text</gui> icon in a note, select <gui style="
+"\"menuitem\">Underline</gui>."
 msgstr ""
-"Los complementos de integración del escritorio interactúan con otras "
-"aplicaciones o sitios web y con Tomboy."
+"Desde el icono <gui style=\"button\">Texto</gui> en una nota, seleccione "
+"<gui style=\"menuitem\">Subrayar</gui>."
 
-#: C/addins-desktop.page:28(title)
-msgid "Bugzilla Links"
-msgstr "Enlaces Bugzilla"
+#: C/addins-formatting-underline.page:36(p)
+msgid ""
+"To quickly underline any selected text, press <keyseq><key>Control</"
+"key><key>U</key></keyseq>."
+msgstr ""
+"Para subrayar rápidamente cualquier texto seleccionado, pulse "
+"<keyseq><key>Ctrl</key><key>U</key></keyseq>."
 
-#: C/addins-desktop.page:29(p)
+#: C/addins-formatting-fixed-width.page:7(desc)
+msgid "Plugin to set fixed width font in notes."
+msgstr ""
+"Complemento para establecer una tipografía de anchura fija en las notas."
+
+#: C/addins-formatting-fixed-width.page:17(title)
+msgid "Fixed Width"
+msgstr "Anchura fija"
+
+#: C/addins-formatting-fixed-width.page:19(p)
 msgid ""
-"The Bugzilla Links addin allows you to drag a Bugzilla URL from your browser "
-"into Tomboy. After dragging a link into a Tomboy note, Tomboy will display "
-"the bug number as an active link next to bug icon to show you this is a "
-"Bugzilla link. Clicking the link in the Tomboy note will open a browser "
-"window taking you to that Bugzilla page."
-msgstr ""
-"El complemento Enlaces de Bugzilla le permite arrastrar un URL de Bugzilla "
-"desde su navegador hasta Tomboy. Después de arrastrar un enlace en una nota "
-"de Tomboy, se mostrará en número del bug como un enlace activo cerca del "
-"icono del bug para indicar que es un enlace a Bugzilla. Al pulsar en enlace "
-"en la nota de Tomboy se abrirá un navegador llevándole a esa página de "
-"Bugzilla."
-
-#: C/addins-desktop.page:37(title)
-msgid "Evolution Mail Integration"
-msgstr "Integración con correo de Evolution"
-
-#: C/addins-desktop.page:38(p)
-msgid ""
-"The Evolution Mail Integration plugin allows you to drag an email from "
-"Evolution into a Tomboy note. Your note will display an envelope icon and "
-"the subject of the note will be displayed as a link. Clicking this link will "
-"open the email using Evolution."
-msgstr ""
-"El complemento de integración con Evolution le permite arrastrar un correo "
-"desde Evolution hasta una nota Tomboy. Su nota mostrará un icono de un sobre "
-"y el asunto de la nota se mostrará como un enlace. Al pulsar en este enlace "
-"se abrirá el correo usando Evolution."
-
-#: C/addins-desktop.page:45(title)
+"The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to be "
+"Fixed Width. This addin is disabled by default."
+msgstr ""
+"El complemento de anchura fija configura el texto de sus notas de "
+"<app>Tomboy</app> para que tenga una anchura fija. Este complemento está "
+"desactivado de manera predeterminada."
+
+#: C/addins-formatting-fixed-width.page:23(title)
+msgid "To use Fixed Width font in your <app>Tomboy</app> notes:"
+msgstr ""
+"Para usar una tipografía de anchura fija en sus notas de <app>Tomboy</app>:"
+
+#: C/addins-formatting-fixed-width.page:25(p)
+msgid "<link xref=\"addins\">Enable</link> the Fixed Width add-in."
+msgstr "<link xref=\"addins\">Active</link> el complemento de anchura fija."
+
+#: C/addins-formatting-fixed-width.page:28(p)
+msgid "Select the desired text in a <app>Tomboy</app> note."
+msgstr "Seleccione el texto que quiere en una nota de <app>Tomboy</app>."
+
+#: C/addins-formatting-fixed-width.page:31(p)
+#| msgid ""
+#| "From the <gui style=\"button\">Text</gui> icon in a note, select <gui "
+#| "style=\"menuitem\">Underline</gui>."
+msgid ""
+"From the <gui style=\"button\">Text</gui> icon in the note toolbar, select "
+"<gui style=\"menuitem\">Fixed Width</gui>."
+msgstr ""
+"Desde el icono <gui style=\"button\">Texto</gui> en la barra de herramientas "
+"de la nota, seleccione <gui style=\"menuitem\">Anchura fija</gui>."
+
+#: C/addins-formatting-fixed-width.page:37(p)
+msgid ""
+"To quickly set any selected text to the Fixed Width font, press "
+"<keyseq><key>Ctrl</key><key>T</key></keyseq>."
+msgstr ""
+"Para establecer rápidamente una tipografía de anchura fija en cualquier "
+"texto seleccionado, pulse <keyseq><key>Ctrl</key><key>T</key></keyseq>."
+
+#: C/addins-desktop-printing.page:7(desc)
+msgid "Send notes to a printer."
+msgstr "Enviar notas a una impresora."
+
+#: C/addins-desktop-printing.page:16(title)
 msgid "Printing Support"
 msgstr "Soporte para impresión"
 
-#: C/addins-desktop.page:46(p)
+#: C/addins-desktop-printing.page:19(p)
+msgid ""
+"Printing with <app>Tomboy</app> requires that you have connected and "
+"configured your printer. If you have not done this, please consult the <link "
+"href=\"help:gnome-help/printing\">printing help for GNOME</link>."
+msgstr ""
+"Para imprimir en <app>Tomboy</app> es necesario tener conectada y "
+"configurada una impresora. Si no es así, consulte la <link href=\"help:gnome-"
+"help/printing\">ayuda de impresión para GNOME</link>."
+
+#: C/addins-desktop-printing.page:22(p)
 msgid ""
-"This addin is enabled by default and allows you print notes out. If you "
-"disable this addin you will no longer be able to print notes."
+"You can send <app>Tomboy</app> notes to your printer. This add-in is enabled "
+"by default."
 msgstr ""
-"Este complemento se activa de manera predeterminada y le permite imprimir "
-"sus notas. Si desactiva este complemento, no podrá imprimir sus notas."
+"Puede enviar notas de <app>Tomboy</app> a su impresora. Este complemento "
+"está activado de manera predeterminada."
+
+#: C/addins-desktop-printing.page:25(title)
+msgid "To print a note:"
+msgstr "Para imprimir una nota:"
+
+#: C/addins-desktop-printing.page:30(p)
+msgid ""
+"From the gears icon in the note toolbar, select <gui style=\"menuitem"
+"\">Print</gui>. Alternatively, you can also use the keyboard shortcut "
+"<keyseq><key>Ctrl</key><key>P</key></keyseq>."
+msgstr ""
+"Desde el icono de la rueda dentada en la barra de herramientas de la nota, "
+"seleccione <gui style=\"menuitem\">Imprimir</gui>. Alternativamente, también "
+"puede usar el atajo del teclado <keyseq><key>Ctrl</key><key>P</key></keyseq>."
+
+#: C/addins-desktop-printing.page:37(p)
+msgid ""
+"If you disable this addin you will not be able to print <app>Tomboy</app> "
+"notes."
+msgstr ""
+"Si desactiva este complemento no podrá imprimir sus notas de <app>Tomboy</"
+"app>."
+
+#: C/addins-desktop-bugzilla.page:7(desc)
+msgid "Plugin to automatically link to bugzilla pages."
+msgstr "Complemento para enlazar automáticamente a las páginas de Bugzilla."
+
+#: C/addins-desktop-bugzilla.page:16(title)
+msgid "Bugzilla Links"
+msgstr "Enlaces de Bugzilla"
+
+#: C/addins-desktop-bugzilla.page:18(p)
+msgid ""
+"The Bugzilla Links addin allows you to drag a Bugzilla URL from your browser "
+"into Tomboy."
+msgstr ""
+"El complemento de enlaces de Bugzilla le permite arrastrar un URL de "
+"Bugzilla hasta Tomboy."
+
+#: C/addins-desktop-bugzilla.page:23(p)
+msgid ""
+"Drag a bugzilla link containing the bug number from your web browser into a "
+"<app>Tomboy</app> note."
+msgstr ""
+"Arrastre un enlace a Bugzilla que contenga el número de informe de error "
+"desde su navegador web hasta su nota de <app>Tomboy</app>."
+
+#: C/addins-desktop-bugzilla.page:28(p)
+msgid ""
+"<app>Tomboy</app> will display the bug number as an active link next to bug "
+"icon to indicate that this is a <app>Bugzilla</app> link. You can click on "
+"this link to open it in your web browser."
+msgstr ""
+"<app>Tomboy</app> mostrará el número de informe de error como un enlace "
+"junto a un icono, para indicar que es un enlace a <app>Bugzilla</app>. Puede "
+"pulsar en este enlace para abrirlo en su navegador web."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
 #: C/index.page:0(None)
 msgid "translator-credits"
 msgstr ""
-"Daniel Mustieles García <daniel.mustieles at gmail.com>, 2009-2010\n"
+"Daniel Mustieles García <daniel.mustieles at gmail.com>, 2009-2013\n"
 "Jorge González <jorgegonz at svn.gnome.org>, 2006-2009\n"
 "Claudio Saavedra <csaavedra at alumnos.utalca.cl>, 2007"
 
+#~ msgid ""
+#~ "From the gears icon in the note toolbar, select <gui style=\"menuitem"
+#~ "\">Fixed Width</gui>."
+#~ msgstr ""
+#~ "Desde el icono de la rueda dentada en la barra de herramientas de la "
+#~ "nota, seleccione <gui style=\"menuitem\">Anchura fija</gui>."
+
+#~ msgid ""
+#~ "You will be prompted <gui>Really delete this note?</gui> when deleting a "
+#~ "note."
+#~ msgstr ""
+#~ "Se le preguntará <gui>¿Realmente quiere eliminar esta nota?</gui> cuando "
+#~ "elimine una nota."
+
+#~ msgid "Enable additional note functionality."
+#~ msgstr "Activar funcionalidad adicional de la nota."
+
+#~ msgid "Tomboy Tools Addins"
+#~ msgstr "Complementos de herramientas de Tomboy"
+
+#~ msgid "Tools addins add additional functionality to your Tomboy notes."
+#~ msgstr "Los complementos añaden funcionalidad adicional a sus notas Tomboy."
+
+#~ msgid ""
+#~ "The <gui>Export to HTML</gui> addin is enabled by default and will export "
+#~ "an individual note to HTML."
+#~ msgstr ""
+#~ "El complemento <gui>Exportar a HTML</gui> está activado de manera "
+#~ "predeterminada, y exportará una nota individual a HTML."
+
+#~ msgid ""
+#~ "To export a note to HTML, press the <gui>Tools</gui> icon in the note "
+#~ "toolbar and choose <gui>Export to HTML</gui>. You will immediately be "
+#~ "presented with a dialog to save the note. Choose the directory you wish "
+#~ "to save the note in and change the name of note's new html file if you "
+#~ "wish it to be different than the note name. The note will then be saved "
+#~ "as an HTML file and automatically displayed in your browser."
+#~ msgstr ""
+#~ "Para exportar una nota a HTML, pulse el icono <gui>Herramientas</gui> en "
+#~ "la barra de herramientas de la nota y elija <gui>Exportar a HTML</gui>. "
+#~ "Inmediatamente aparecerá un diálogo para guardar la nota. Seleccione la "
+#~ "carpeta en la que quiere guardar la nota y cambie el nombre del archivo "
+#~ "html nuevo de la nota si quiere que sea diferente del nombre de la nota. "
+#~ "La nota se guardará como un archivo HTML y se mostrará automáticamente en "
+#~ "su navegador."
+
+#~ msgid ""
+#~ "The <gui>Insert Timestamp</gui> addin is disabled by default. To enable "
+#~ "it, choose the <gui>Insert Timestamp</gui> addin and then press "
+#~ "<gui>Enable</gui> in the Tomboy Preferences."
+#~ msgstr ""
+#~ "El complemento <gui>Insertar marca de tiempo</gui> está desactivado de "
+#~ "manera predeterminada. Para activarlo, seleccione el complemento "
+#~ "<gui>Insertar marca de tiempo</gui> y pulse <gui>Activar</gui> en las "
+#~ "preferencias de Tomboy."
+
+#~ msgid ""
+#~ "To add a timestamp to your notes, press the <gui>Tools</gui> icon in the "
+#~ "note toolbar and choose <gui>Insert Timestamp</gui> or press <key>Ctrl + "
+#~ "D</key>."
+#~ msgstr ""
+#~ "Para añadir una marca de tiempo a sus notas, pulse sobre el icono "
+#~ "<gui>Herramientas</gui> en la barra de herramientas de la nota y elija "
+#~ "<gui>Insertar marca de tiempo</gui> o pulse <key>Ctrl + D</key>."
+
+#~ msgid ""
+#~ "The <gui>Note of the Day</gui> addin is disabled by default. To enable, "
+#~ "choose the <gui>Note of the Day</gui> addin and then press <gui>Enable</"
+#~ "gui> in the Tomboy Preferences."
+#~ msgstr ""
+#~ "El complemento <gui>Nota del día</gui> está desactivado de manera "
+#~ "predeterminada. Para activarlo, elija el complemento <gui>Nota del día</"
+#~ "gui> y pulse <gui>Activar</gui> en las preferencias de Tomboy."
+
+#~ msgid ""
+#~ "<gui>Note of the Day</gui> addin will create a new note daily with the "
+#~ "title <em>Today: Thursday, January 21 2010</em> for example. The note "
+#~ "will also add rows for <em>Tasks</em> and <em>Appointment</em> "
+#~ "automatically."
+#~ msgstr ""
+#~ "El complemento <gui>Nota del día</gui> creara una nota diaria con el "
+#~ "título <em>Hoy: jueves, 21 de enero de 2010</em>, por ejemplo. La nota "
+#~ "también añadirá filas a <em>Tareas</em> y <em>Citas</em> automáticamente."
+
+#~ msgid "Note Directory Watcher"
+#~ msgstr "Vigilante de la carpeta de notas"
+
+#~ msgid ""
+#~ "The Note Directory Watcher addin monitors the directory your Tomboy notes "
+#~ "are saved in. If the addin detects changes to your notes, it will apply "
+#~ "those changes and they will be displayed in your notes. This addin is "
+#~ "typically used with 3rd party sync services such as Dropbox. Setting up "
+#~ "3rd party sync services is outside the scope of this help."
+#~ msgstr ""
+#~ "El complemento Vigilante de la carpeta de notas monitoriza la carpeta en "
+#~ "la que Tomboy guarda sus notas. Si el complemento detecta cambios en sus "
+#~ "notas, aplicará estos cambios y se mostrarán en sus notas. Este "
+#~ "complemento se usa habitualmente con servicios de sincronización de "
+#~ "terceras partes tales como Dropbox. La configuración de servicios de "
+#~ "sincronización de terceras partes está fuera del objetivo de este "
+#~ "documento."
+
+#~ msgid "Enable additional ways to sync your notes with other devices."
+#~ msgstr ""
+#~ "Activar formas adicionales de sincronizar sus notas con otros "
+#~ "dispositivos."
+
+#~ msgid "Sync Addins"
+#~ msgstr "Sincronizar complementos"
+
+#~ msgid "Manage addins for Tomboy"
+#~ msgstr "Gestionar complementos de Tomboy"
+
+#~ msgid "Plugins to add addition note formatting."
+#~ msgstr "Complementos para añadir formateo adicional de nota."
+
+#~ msgid "Formatting Addins"
+#~ msgstr "Complementos de formateado"
+
+#~ msgid ""
+#~ "The Fixed Width addin changes your text to be of a fixed width in the "
+#~ "Tomboy note. This addin is disabled by default. To enable, press the "
+#~ "<gui>Enable</gui> button."
+#~ msgstr ""
+#~ "El complemento de anchura fija cambia su texto para que tenga una anchura "
+#~ "fija en la nota Tomboy. Este complemento está desactivado de manera "
+#~ "predeterminada. Para activarlo, pulse el botón <gui>Activar</gui>."
+
+#~ msgid ""
+#~ "The Underline addin allows you to underline specific text in your note "
+#~ "using the <gui>Text</gui> icon in a note toolbar. This addin is disabled "
+#~ "by default. To enable, press the <gui>Enable</gui> button. Highlight the "
+#~ "text you would like to underline, press the <gui>Text</gui> icon in the "
+#~ "note toolbar, and choose <gui>Underline</gui> or press "
+#~ "<keyseq><key>CONTROL + U</key></keyseq>."
+#~ msgstr ""
+#~ "El complemento de subrayado le permite subrayar un texto específico en su "
+#~ "nota usando el icono <gui>Texto</gui> en la barra de herramientas de una "
+#~ "nota. Este complemento está desactivado de manera predeterminada. Para "
+#~ "activarlo, pulse el botón <gui>Activar</gui>. Seleccione el texto que "
+#~ "quiere subrayar, pulse el icono <gui>Texto</gui> en la barra de "
+#~ "herramientas de la nota, y elija <gui>Subrayar</gui> o pulse "
+#~ "<keyseq><key>Control + U</key></keyseq>."
+
+#~ msgid ""
+#~ "Desktop Integration addins interact with other applications or websites "
+#~ "and Tomboy."
+#~ msgstr ""
+#~ "Los complementos de integración del escritorio interactúan con otras "
+#~ "aplicaciones o sitios web y con Tomboy."
+
+#~ msgid ""
+#~ "The Bugzilla Links addin allows you to drag a Bugzilla URL from your "
+#~ "browser into Tomboy. After dragging a link into a Tomboy note, Tomboy "
+#~ "will display the bug number as an active link next to bug icon to show "
+#~ "you this is a Bugzilla link. Clicking the link in the Tomboy note will "
+#~ "open a browser window taking you to that Bugzilla page."
+#~ msgstr ""
+#~ "El complemento Enlaces de Bugzilla le permite arrastrar un URL de "
+#~ "Bugzilla desde su navegador hasta Tomboy. Después de arrastrar un enlace "
+#~ "en una nota de Tomboy, se mostrará en número del bug como un enlace "
+#~ "activo cerca del icono del bug para indicar que es un enlace a Bugzilla. "
+#~ "Al pulsar en enlace en la nota de Tomboy se abrirá un navegador "
+#~ "llevándole a esa página de Bugzilla."
+
+#~ msgid "Evolution Mail Integration"
+#~ msgstr "Integración con correo de Evolution"
+
+#~ msgid ""
+#~ "The Evolution Mail Integration plugin allows you to drag an email from "
+#~ "Evolution into a Tomboy note. Your note will display an envelope icon and "
+#~ "the subject of the note will be displayed as a link. Clicking this link "
+#~ "will open the email using Evolution."
+#~ msgstr ""
+#~ "El complemento de integración con Evolution le permite arrastrar un "
+#~ "correo desde Evolution hasta una nota Tomboy. Su nota mostrará un icono "
+#~ "de un sobre y el asunto de la nota se mostrará como un enlace. Al pulsar "
+#~ "en este enlace se abrirá el correo usando Evolution."
+
+#~ msgid ""
+#~ "This addin is enabled by default and allows you print notes out. If you "
+#~ "disable this addin you will no longer be able to print notes."
+#~ msgstr ""
+#~ "Este complemento se activa de manera predeterminada y le permite imprimir "
+#~ "sus notas. Si desactiva este complemento, no podrá imprimir sus notas."
+
 #~ msgid "Common Problems."
 #~ msgstr "Problemas comunes."
 
@@ -1437,25 +1993,6 @@ msgstr ""
 #~ msgstr "¿Relamente quiere eliminar esta nota?"
 
 #~ msgid ""
-#~ "This work is licensed under a <link href=\"http://creativecommons.org/"
-#~ "licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 "
-#~ "Unported License</link>."
-#~ msgstr ""
-#~ "Este trabajo está licenciado bajo una <link href=\"http://creativecommons."
-#~ "org/licenses/by-sa/3.0/us/\">Licencia Creative Commons atribución - "
-#~ "compartir igual 3.0 no portada</link>."
-
-#~ msgid ""
-#~ "As a special exception, the copyright holders give you permission to "
-#~ "copy, modify, and distribute the example code contained in this document "
-#~ "under the terms of your choosing, without restriction."
-#~ msgstr ""
-#~ "Como excepción especial, los poseedores de los derechos de autor le dan "
-#~ "permiso para copiar, modificar y distribuir el código de ejemplo "
-#~ "contenido en este documento bajo los términos que usted elija, sin "
-#~ "restricción."
-
-#~ msgid ""
 #~ "Permission is granted to copy, distribute and/or modify this document "
 #~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 "
 #~ "or any later version published by the Free Software Foundation with no "
@@ -2763,9 +3300,6 @@ msgstr ""
 #~ "Introduzca la combinación de teclas para abrir el diálogo "
 #~ "<interface>Buscar en todas las notas</interface>."
 
-#~ msgid "Synchronization"
-#~ msgstr "Sincronización"
-
 #~ msgid "Please see <xref linkend=\"synchronization\"/> for more details."
 #~ msgstr ""
 #~ "Para obtener más detalles consulte <xref linkend=\"synchronization\"/>."
diff --git a/help/es/legal.xml b/help/es/legal.xml
index 46a7e88..d632584 100644
--- a/help/es/legal.xml
+++ b/help/es/legal.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
+<p>Este trabajo está licenciado bajo una <link href="http://creativecommons.org/licenses/by-sa/3.0/us/">Licencia Creative Commons atribución - compartir igual 3.0 no portada</link>.</p>
+<p>Como excepción especial, los poseedores de los derechos de autor le dan permiso para copiar, modificar y distribuir el código de ejemplo contenido en este documento bajo los términos que usted elija, sin restricción.</p>
 </license>
diff --git a/help/es/pin-notes.page b/help/es/pin-notes.page
new file mode 100644
index 0000000..c73b780
--- /dev/null
+++ b/help/es/pin-notes.page
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="es">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Acceder a las notas de <app>Tomboy</app> desde la bandeja de mensajes.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pinchar una nota</title>
+
+  <p>La lista de notas recientes de <app>Tomboy</app> se muestra cuando pulsa en el <link xref="">icono de la bandeja de mensajes</link>. Esta lista lista está limitada a 20 notas. Si tiene más de 20 notas y quiere abrir una nota que no está en la lista de notas recientes, deberá <link xref="search">buscar en todas las notas</link>.</p>
+
+  <p>Para acceder rápidamente a las notas menos usadas, puede<em>pincharlas</em> en la lista de notas recientes.</p>
+
+  <steps>
+    <title>Para pinchar una nota:</title>
+    <item>
+      <p>Pulse en el icono de <app>Tomboy</app> en la bandeja de mensajes.</p>
+    </item>
+    <item>
+      <p>En la lista de notas recientes, pulse en el icono de la chincheta gris a la derecha de la nota que quiere pinchar. El icono se volverá de color verde.</p>
+    </item>
+  </steps>
+
+  <p>Una nota con una chincheta verde indica que esa nota se ha <em>pinchado</em> en la lista.</p>
+
+  <note style="tip">
+    <p>Para quitar una nota <em>pinchada</em> de la lista de notas recientes, pulse sobre el icono de la chincheta verde.</p>
+  </note>
+
+</page>
diff --git a/help/es/sync.page b/help/es/sync.page
index b359d94..3aa115f 100644
--- a/help/es/sync.page
+++ b/help/es/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Sincronizar notas manualmente</title>
 	
-	<p>Puede sincronizar sus notas de tres formas:</p>
+	<p>Puede sincronizar sus notas de tres maneras:</p>
 	
 	<list type="numbered">
 	  <item><p>Desde cualquier nota pulse en el icono <gui>Herramientas</gui> y elija <gui>Sincronizar notas</gui>.</p></item>
@@ -38,8 +38,8 @@
  
  	<title>Sincronizar sus notas automáticamente</title>
  	
- 	<p>Tomboy puede sincronizar sus notas automáticamente por usted en segundo plano. Se recomienda que configure cómo manejar los conflictos entre notas antes de activar la sincronización automática. Puede aprender acerca de el manejo de conflictos entre notas en la página <link xref="sync-setup#conflict"/>.</p>
- 	
+	<p>Tomboy puede sincronizar sus notas automáticamente por usted en segundo plano. Se recomienda que configure cómo manejar los conflictos entre notas antes de activar la sincronización automática. Puede aprender acerca de el manejo de conflictos entre notas en la página <link xref="sync-setup#conflict"/>.</p>
+
  	<p>Puede activar las sincronización abriendo las <gui>Preferencias de Tomboy</gui> usando su ratón para pulsar con el botón derecho en el icono de Tomboy en su panel, barra de tareas o «dock», elija <gui>Preferencias</gui> y seleccione la pestaña <gui>Sincronización</gui>. También puede abrir las <gui>Preferencias de Tomboy</gui> desde el diálogo <gui>Buscar en todas las notas</gui>. Desde el menú, elija <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>.</p>
 	
 	<p>Para activar la sincronización automática, marque la casilla <gui>Sincronizar automáticamente en segundo plano cada x minutos</gui> en la parte inferior de la pestaña Sincronización.</p>
diff --git a/help/es/whatsnew.page b/help/es/whatsnew.page
index 6de7575..d019280 100644
--- a/help/es/whatsnew.page
+++ b/help/es/whatsnew.page
@@ -18,7 +18,7 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Lo nuevo en <app>Tomboy</app></title>
+  <title>Novedades en <app>Tomboy</app></title>
 
   <p><app>Tomboy</app> incorpora varias funcionalidades nuevas. Tomboy debería iniciarse notablemente más rápido gracias a las mejoras realizadas en el tiempo de arranque de Tomboy.</p>
   <p>Se ha mejorado el copiar/pegar desde Tomboy hacia otras aplicaciones para soportar el formateo en otras aplicaciones que pueden entender HTML, tales como Evolution, OpenOffice.org y otras.</p>
diff --git a/help/eu/addins-desktop-bugzilla.page b/help/eu/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..c0e4699
--- /dev/null
+++ b/help/eu/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/eu/addins-desktop-printing.page b/help/eu/addins-desktop-printing.page
new file mode 100644
index 0000000..5504aa7
--- /dev/null
+++ b/help/eu/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/eu/addins-desktop.page b/help/eu/addins-desktop.page
deleted file mode 100644
index 133201f..0000000
--- a/help/eu/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="eu">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/eu/addins-formatting-fixed-width.page b/help/eu/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..f761c03
--- /dev/null
+++ b/help/eu/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Zabalera finkoa</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/eu/addins-formatting-underline.page b/help/eu/addins-formatting-underline.page
new file mode 100644
index 0000000..7fed76d
--- /dev/null
+++ b/help/eu/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/eu/addins-formatting.page b/help/eu/addins-formatting.page
deleted file mode 100644
index b1b305b..0000000
--- a/help/eu/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="eu">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/eu/addins-preferences.page b/help/eu/addins-preferences.page
new file mode 100644
index 0000000..d70d80d
--- /dev/null
+++ b/help/eu/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/eu/addins-sync-local.page b/help/eu/addins-sync-local.page
new file mode 100644
index 0000000..983d47c
--- /dev/null
+++ b/help/eu/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/eu/addins-sync-ssh.page b/help/eu/addins-sync-ssh.page
new file mode 100644
index 0000000..cb49dce
--- /dev/null
+++ b/help/eu/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/eu/addins-sync-webdav.page b/help/eu/addins-sync-webdav.page
new file mode 100644
index 0000000..1045639
--- /dev/null
+++ b/help/eu/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/eu/addins-sync-webservice.page b/help/eu/addins-sync-webservice.page
new file mode 100644
index 0000000..412a399
--- /dev/null
+++ b/help/eu/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/eu/addins-sync.page b/help/eu/addins-sync.page
deleted file mode 100644
index ba11634..0000000
--- a/help/eu/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="eu">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/eu/addins-tools-backlinks.page b/help/eu/addins-tools-backlinks.page
new file mode 100644
index 0000000..2781d9d
--- /dev/null
+++ b/help/eu/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Atzeraestekak</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/eu/addins-tools-html-export.page b/help/eu/addins-tools-html-export.page
new file mode 100644
index 0000000..9826414
--- /dev/null
+++ b/help/eu/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Esportatu HTMLra</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/eu/addins-tools-note-of-day.page b/help/eu/addins-tools-note-of-day.page
new file mode 100644
index 0000000..2e2e8b5
--- /dev/null
+++ b/help/eu/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Eguneko oharra</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/eu/addins-tools-timestamp.page b/help/eu/addins-tools-timestamp.page
new file mode 100644
index 0000000..aae1306
--- /dev/null
+++ b/help/eu/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/eu/addins-tools.page b/help/eu/addins-tools.page
deleted file mode 100644
index ee5682c..0000000
--- a/help/eu/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="eu">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Atzeraestekak</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Esportatu HTMLra</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Eguneko oharra</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/eu/addins.page b/help/eu/addins.page
index a6bd17f..5376b0d 100644
--- a/help/eu/addins.page
+++ b/help/eu/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Hobespenak</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/eu/delete-notes.page b/help/eu/delete-notes.page
index 8b20247..ba09b9a 100644
--- a/help/eu/delete-notes.page
+++ b/help/eu/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOMEren dokumentazio-proiektua</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/eu/introduction.page b/help/eu/introduction.page
index ca7c2ba..2593bf3 100644
--- a/help/eu/introduction.page
+++ b/help/eu/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/eu/pin-notes.page b/help/eu/pin-notes.page
new file mode 100644
index 0000000..7da79a9
--- /dev/null
+++ b/help/eu/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="eu">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/eu/sync-setup.page b/help/eu/sync-setup.page
index 1de2eae..69d60a0 100644
--- a/help/eu/sync-setup.page
+++ b/help/eu/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -122,7 +122,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/eu/sync.page b/help/eu/sync.page
index 9ea4f08..a1e9314 100644
--- a/help/eu/sync.page
+++ b/help/eu/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/eu/whatsnew.page b/help/eu/whatsnew.page
index 8112c24..748d08f 100644
--- a/help/eu/whatsnew.page
+++ b/help/eu/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/fr/addins-desktop-bugzilla.page b/help/fr/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..c93a450
--- /dev/null
+++ b/help/fr/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Liens Bugzilla</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/fr/addins-desktop-printing.page b/help/fr/addins-desktop-printing.page
new file mode 100644
index 0000000..75af2dd
--- /dev/null
+++ b/help/fr/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Prise en charge de l'impression</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/fr/addins-desktop.page b/help/fr/addins-desktop.page
deleted file mode 100644
index 4ec0e0c..0000000
--- a/help/fr/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="fr">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Greffons pour l'intégration avec d'autres applications et sites Web.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Greffons d'intégration dans le bureau</title>
-
-	<p>Les greffons d'intégration dans le bureau permettent l'interaction entre d'autres applications ou des sites Web et Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Liens Bugzilla</title>
-  <p>Le greffon de lien avec Bugzilla vous permet de faire glisser une URL Bugzilla depuis votre navigateur vers Tomboy. Après avoir fait glisser un lien dans une note, Tomboy affiche le numéro du bogue comme un lien actif et l'icône de bogue pour montrer qu'il s'agit d'un lien Bugzilla. Un clic sur le lien de la note Tomboy ouvre une fenêtre du navigateur à la page Bugzilla.</p>
-</section>
-
-<section id="evolution">
-  <title>Intégration avec la messagerie Evolution</title>
-  <p>Le greffon d'intégration avec Evolution permet de faire glisser un courriel depuis Evolution dans une note Tomboy. Votre note affiche alors une icône d'enveloppe et le sujet de la note s'affiche comme un lien. Un clic sur ce lien ouvre le courriel dans Evolution.</p>
-</section>
-
-<section id="printing">
-  <title>Prise en charge de l'impression</title>
-  <p>Ce greffon est activé par défaut et vous permet d'imprimer les notes. Si vous désactivez ce greffon vous ne pourrez plus imprimer de notes.</p>
-</section>
-
-
- </page>
diff --git a/help/fr/addins-formatting-fixed-width.page b/help/fr/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..2bd723f
--- /dev/null
+++ b/help/fr/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/fr/addins-formatting-underline.page b/help/fr/addins-formatting-underline.page
new file mode 100644
index 0000000..a97773a
--- /dev/null
+++ b/help/fr/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/fr/addins-formatting.page b/help/fr/addins-formatting.page
deleted file mode 100644
index 38be87d..0000000
--- a/help/fr/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="fr">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Greffons pour ajouter des outils supplémentaires de mise en forme de notes.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Greffon de formatage</title>
-
-<section id="fixedwidth">
-  <title>Greffon chasse fixe</title>
-  <p>Le greffon chasse fixe change la police de texte en chasse fixe dans les notes de Tomboy. Ce greffon est désactivé par défaut. Pour l'activer cliquez sur le bouton <gui>Activer</gui>.</p>
-</section>
-
-<section id="underline">
-  <title>Greffon de soulignement</title>
-  <p>Le greffon de soulignement permet de souligner spécifiquement du texte dans votre note à l'aide de l'icône <gui>texte</gui> de la barre d'outils de la note. Ce greffon est désactivé par défaut. Pour l'activer cliquez sur le bouton <gui>Activer</gui>. Sélectionnez le texte que vous voulez souligner, cliquez sur l'icône <gui>texte</gui> dans la barre d'outils, et choisissez <gui>Souligner</gui> ou pressez <keyseq><key>Ctrl + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/fr/addins-preferences.page b/help/fr/addins-preferences.page
new file mode 100644
index 0000000..94be375
--- /dev/null
+++ b/help/fr/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/fr/addins-sync-local.page b/help/fr/addins-sync-local.page
new file mode 100644
index 0000000..bf7d40e
--- /dev/null
+++ b/help/fr/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Service de synchronisation de dossiers locaux</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/fr/addins-sync-ssh.page b/help/fr/addins-sync-ssh.page
new file mode 100644
index 0000000..fda850e
--- /dev/null
+++ b/help/fr/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Service de synchronisation SSH</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/fr/addins-sync-webdav.page b/help/fr/addins-sync-webdav.page
new file mode 100644
index 0000000..43b0a4b
--- /dev/null
+++ b/help/fr/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Service de synchronisation Webdav</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/fr/addins-sync-webservice.page b/help/fr/addins-sync-webservice.page
new file mode 100644
index 0000000..d1554af
--- /dev/null
+++ b/help/fr/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Service de synchronisation Web</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/fr/addins-sync.page b/help/fr/addins-sync.page
deleted file mode 100644
index 508067b..0000000
--- a/help/fr/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="fr">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Activer d'autres moyens de synchronisation de vos notes avec d'autres périphériques.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Greffons de synchronisation</title>
-
-	<p>Les greffons de synchronisation vous permettent de choisir différentes méthodes et emplacements pour synchroniser vos notes Tomboy. Pour plus d'informations, consultez la page d'aide <link xref="sync-notes"/>.</p>
-
-
-<section id="local">
-  <title>Service de synchronisation de dossiers locaux</title>
-  <p>Le service de synchronisation de dossiers locaux est activé par défaut et permet à Tomboy de synchroniser ses notes avec un autre dossier sur votre ordinateur. Cela facilite la création d'une sauvegarde de vos notes.</p>
-</section>
-
-<section id="ssh">
-  <title>Service de synchronisation SSH</title>
-  <p>Le service de synchronisation SSH vous permet de synchroniser vos notes avec un autre ordinateur via le protocole SSH. Ce greffon est désactivé par défaut. Il se peut que vous ayez besoin d'installer sur votre distribution Linux le paquet <em>sshfs</em> pour que ce greffon fonctionne, ce qui n'est pas le propos de ce manuel.</p>
-</section>
-
-<section id="webdav">
-  <title>Service de synchronisation Webdav</title>
-  <p>Le service de synchronisation WebDav est activé par défaut et permet de synchroniser vos notes avec un serveur distant WebDav. Il se peut que vous ayez besoin d'installer sur votre distribution Linux le paquet <em>système de fichiers FUSE wdfs</em> pour que ce greffon fonctionne, ce qui n'est pas le propos de ce manuel.</p>
-</section>
-
-<section id="webservice">
-  <title>Service de synchronisation Web</title>
-  <p>Le service de synchronisation Web vous permet de synchroniser vos notes vers un serveur ou un service Web distant, comme Tomboy Online. Au moment de la rédaction de ce document, le service Tomboy Online n'est pas encore lancé.</p>
-</section>
-
- </page>
diff --git a/help/fr/addins-tools-backlinks.page b/help/fr/addins-tools-backlinks.page
new file mode 100644
index 0000000..13d14ec
--- /dev/null
+++ b/help/fr/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/fr/addins-tools-html-export.page b/help/fr/addins-tools-html-export.page
new file mode 100644
index 0000000..ed3cd83
--- /dev/null
+++ b/help/fr/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Exportation en HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/fr/addins-tools-note-of-day.page b/help/fr/addins-tools-note-of-day.page
new file mode 100644
index 0000000..dd02a90
--- /dev/null
+++ b/help/fr/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Note du jour</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/fr/addins-tools-timestamp.page b/help/fr/addins-tools-timestamp.page
new file mode 100644
index 0000000..acca65a
--- /dev/null
+++ b/help/fr/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insertion de date</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/fr/addins-tools.page b/help/fr/addins-tools.page
deleted file mode 100644
index 2ab04d0..0000000
--- a/help/fr/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="fr">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Activer des fonctionnalités de note supplémentaires.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Greffons d'outils Tomboy</title>
-
-	<p>Les greffons outils ajoutent des fonctionnalités supplémentaires à votre application Tomboy.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>Le greffon <gui>Backlinks</gui> est activé par défaut et permet de voir quelles notes sont liées à celle que vous visualisez actuellement.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Exportation en HTML</title>
-  <p>Le greffon <gui>Exporter en HTML</gui> est activé par défaut et exporte une note individuelle dans un fichier HTML.</p>
-	<p>Pour exporter une note en HTML, cliquez sur l'icône <gui>Outils</gui> dans la barre d'outils et choisissez <gui>Exporter en HTML</gui>. Une boîte de dialogue s'ouvre pour vous permettre d'enregistrer la note. Choisissez le répertoire dans lequel vous souhaitez enregistrer le fichier et modifiez le nom du nouveau fichier html de la note si vous voulez qu'il soit différent du nom de la note. La note est alors enregistrée en tant que fichier HTML et automatiquement affichée dans votre n [...]
-</section>
-
-<section id="timestamp">
-  <title>Insertion de date</title>
-  <p>Le greffon <gui>Insérer la date</gui> est désactivé par défaut. Pour l'activer, choisissez le greffon <gui>Insérer la date</gui> dans les préférences Tomboy et cliquez sur <gui>Activer</gui>.</p>
-	<p>Pour insérer la date dans vos notes, cliquez sur l'icône <gui>Outils</gui> dans la barre d'outils de la note et choisissez <gui>Insérer la date</gui> ou pressez <key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Note du jour</title>
-  <p>Le greffon <gui>Note du jour</gui> est désactivé par défaut. Pour l'activer, choisissez le greffon <gui>Note du jour</gui> dans les préférences Tomboy et cliquez sur <gui>Activer</gui>.</p>
-	<p>Le greffon <gui>Note du jour</gui> crée une nouvelle note avec par exemple le titre <em>Aujourd'hui : jeudi 21 janvier 2010</em>. La note contient aussi automatiquement les lignes <em>Tâches</em> et <em>Rendez-vous</em>.</p>
-</section>
-
-<section id="watcher">
-  <title>Surveillance de dossier de notes</title>
-  <p>Le greffon de surveillance de dossier surveille le répertoire où vos notes Tomboy sont enregistrées. Si le greffon détecte des modifications dans les notes, il applique ses modifications et elles sont reproduites dans vos notes. Ce greffon est employé en général avec un service de synchronisation tierce tel que Dropbox. Configurer un service de synchronisation tierce n'est pas le propos de ce manuel.</p>
-</section>
-
- </page>
diff --git a/help/fr/addins.page b/help/fr/addins.page
index 8343ae0..82d6a8c 100644
--- a/help/fr/addins.page
+++ b/help/fr/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Ajouter des fonctionnalités à Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Greffons de Tomboy</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Greffons de Tomboy</title>
-    </info>
-    <title>Gestion des greffons de Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/fr/delete-notes.page b/help/fr/delete-notes.page
index 7c536be..3b4208d 100644
--- a/help/fr/delete-notes.page
+++ b/help/fr/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Suppression de notes dans Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Le projet de documentation GNOME</name>
       <years>2010</years>
@@ -19,12 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Suppression d'une note</title>    
-  
-  <p>Pour supprimer une note cliquez sur l'icône <gui>Supprimer</gui> de la barre d'outils de la note que vous voulez supprimer.</p>
-  
-<note style="warning">
-	<p>La suppression d'une note est permanente. Après sa suppression, la note n'est plus récupérable.</p> <p>Lorsque vous supprimez une note, il vous sera demandé <gui>Voulez-vous vraiment supprimer cette note ?</gui></p>  
-</note>
-	
+  <title>Suppression d'une note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/fr/introduction.page b/help/fr/introduction.page
index ab1d525..9f54223 100644
--- a/help/fr/introduction.page
+++ b/help/fr/introduction.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> est une application de prise de notes pour le bureau GNOME, Microsoft Windows et Mac OS X. <app>Tomboy</app> est simple d'utilisation et permet d'organiser les idées et les informations de tous les jours.</p>
   <p><app>Tomboy</app> inclut des fonctionnalités qui vous aident à organiser et à vous souvenir de vos informations et permettent de relier vos notes entre elles pour vous aider à les retrouver et les trier. Vous pouvez aussi organiser plusieurs notes dans un bloc-notes afin de regrouper vos notes plus facilement.</p>
-  <p>Vous pouvez aussi synchroniser vos notes entre différents ordinateurs ce qui vous permet d'emporter vos notes avec vous où que vous soyez.</p>
+  <p>
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
+  </p>
 
   <figure>
     <title>Fenêtre des <gui>Notes Tomboy</gui></title>
diff --git a/help/fr/pin-notes.page b/help/fr/pin-notes.page
new file mode 100644
index 0000000..3a72a09
--- /dev/null
+++ b/help/fr/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="fr">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/fr/sync-setup.page b/help/fr/sync-setup.page
index 77da235..492597d 100644
--- a/help/fr/sync-setup.page
+++ b/help/fr/sync-setup.page
@@ -24,7 +24,14 @@
 	
 	<p><app>Tomboy</app> peut synchroniser vos notes entre plusieurs ordinateurs. Cela permet d'avoir une sauvegarde de vos notes sur un autre ordinateur ou de partager vos notes entre plusieurs ordinateurs pour que vous puissiez toujours accéder à celles-ci.</p>
 	
-	<p>Vous pouvez activer la synchronisation en ouvrant les <gui>Préférences de Tomboy</gui> à l'aide de la souris par un clic droit sur l'icône Tomboy de votre tableau de bord, barre des tâches ou dock et en choisissant l'élément <gui>Préférences</gui>. Sélectionnez ensuite l'onglet <gui>Synchronisation</gui>. Vous pouvez aussi ouvrir les <gui> Préférences de Tomboy</gui> depuis la boîte de dialogue <gui>Rechercher dans toutes les notes</gui> ou dans le menu choisir <guiseq><gui>Édition</ [...]
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </section>
 
@@ -41,7 +48,10 @@
 		<item><p><gui>Renommer ma note locale</gui>. Si cette option est sélectionnée, Tomboy remplace automatiquement la note par une copie de celle de l'ordinateur distant et renomme la note sur votre ordinateur pour que vous ne perdiez pas les informations qu'elle contient.</p>
 		</item>
 		
-		<item><p><gui>Remplacer ma note locale avec celle du serveur</gui>. Si vous avez sélectionné cette option, quand vous synchronisez, Tomboy remplace la note stockée sur votre ordinateur par celle de l'ordinateur distant.</p>
+		<item><p><gui>Replace my local note with the server's update.</gui>
+  		If you have selected this option, when you synchronize, 
+		Tomboy will overwrite and replace your note stored on your
+		computer with a copy from the remote computer.</p>
 		
 		<note style="warning">
 		<p>Remplacer la note automatiquement est définitif. Votre note locale est remplacée par une copie de celle présente sur l'ordinateur distant et vous perdez toutes les informations qui étaient stockées dans cette note avant la synchronisation.</p>
@@ -71,7 +81,17 @@
 	
 	<p>Il est conseillé d'utiliser un troisième ordinateur ou serveur comme ordinateur distant pour stocker les notes qui doivent être synchronisées entre plusieurs postes.</p>
 
-	<p>Ouvrez <app>Mots de passe et clés de chiffrement</app> en choisissant <guiseq><gui>Applications</gui><gui>Accessoires</gui><gui>Mots de passe et clés de chiffrement</gui></guiseq>. Cliquez sur votre clé et choisissez <guiseq><gui>Distant</gui><gui>Configurer la clé pour un shell sécurisé</gui></guiseq> dans le menu, puis saisissez le nom de domaine ou l'adresse IP de l'ordinateur avec lequel vous souhaitez synchroniser vos notes dans <gui>Nom de l'ordinateur</gui>. Saisissez le nom d [...]
+	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
+	<guiseq><gui>Applications</gui><gui>Accessories</gui>
+	<gui>Passwords and Encryption Keys</gui></guiseq>.  
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
+	</p>
 	
 	<p>Dans Tomboy, choisissez <gui>SSH</gui> dans la liste déroulante <gui>Service</gui>. Remplissez les informations de connexion à votre serveur et cliquez ensuite sur le bouton <gui>Enregistrer</gui>. Le <gui>Chemin du dossier</gui>, même s'il est facultatif, devrait indiquer un dossier vide. Vous pouvez désormais synchroniser vos notes.</p>
 
diff --git a/help/fr/sync.page b/help/fr/sync.page
index 87ad8b8..b06873a 100644
--- a/help/fr/sync.page
+++ b/help/fr/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Synchronisation manuelle des notes</title>
 	
-	<p>Vous pouvez synchroniser vos notes de trois façons :</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>Depuis n'importe quelle note, cliquez sur l'icône <gui>Outils</gui> et choisissez <gui>Synchroniser les notes</gui>.</p></item>
@@ -38,13 +38,26 @@
  
  	<title>Synchronisation automatique de vos notes</title>
  	
- 	<p>Tomboy peut synchroniser vos notes automatiquement en arrière-plan. Il est recommandé de configurer la gestion des conflits de notes avant d'activer la synchronisation automatique. Vous pouvez en savoir plus sur la gestion des conflits dans la page <link xref="sync-setup#conflict"/>.</p>
- 	
- 	<p>Vous pouvez activer la synchronisation en ouvrant les <gui>Préférences de Tomboy</gui> à l'aide de la souris par un clic droit sur l'icône Tomboy de votre tableau de bord, barre des tâches ou dock et en choisissant l'élément <gui>Préférences</gui>. Sélectionnez ensuite l'onglet <gui>Synchronisation</gui>. Vous pouvez aussi ouvrir les <gui> Préférences de Tomboy</gui> depuis la boîte de dialogue <gui>Rechercher dans toutes les notes</gui> ou dans le menu choisir <guiseq><gui>Édition< [...]
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 	
 	<p>Pour activer la synchronisation automatique, cochez la case <gui>Synchroniser automatiquement en arrière-plan toutes les x minutes</gui> en bas de l'onglet Synchronisation.</p>
 	
-	<p>L'option par défaut de Tomboy est de synchroniser automatiquement toutes les dix minutes. Pour modifier la fréquence de synchronisation de Tomboy saisissez le nombre de minutes dans la boîte de dialogue ou faites défiler vers le haut ou le bas avec la souris.</p>
+	<p>Tomboy's default option is to autosync every 10 minutes.  To change
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>Pour désactiver la synchronisation automatique, décochez la case <gui>Synchroniser automatiquement en arrière plan toutes les X minutes</gui>.</p>
 	
diff --git a/help/fr/whatsnew.page b/help/fr/whatsnew.page
index 4f7ffef..d9900da 100644
--- a/help/fr/whatsnew.page
+++ b/help/fr/whatsnew.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> présente un certain nombre d'améliorations. Tomboy se lance de façon notablement plus rapide grâce aux améliorations apportées à son processus de démarrage.</p>
   <p>Le copier/coller depuis Tomboy vers d'autres applications est amélioré et prend en charge le formatage dans les autres applications qui gèrent le HTML, telles qu'Evolution, OpenOffice.org entre autres.</p>
-  <p><app>Tomboy</app> peut maintenant synchroniser automatiquement vos notes si vous activez la synchronisation.</p>
+  <p>
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
+  </p>
 
   <p>L'ajout de la fonctionnalité « jump list » de Windows 7 vous permet d'accéder à vos notes, de rechercher ou de créer de nouvelles notes plus rapidement directement depuis la barre des tâches de Windows.</p>
 
diff --git a/help/gl/addins-desktop-bugzilla.page b/help/gl/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..6db34f3
--- /dev/null
+++ b/help/gl/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Ligazóns de Bugzilla</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/gl/addins-desktop-printing.page b/help/gl/addins-desktop-printing.page
new file mode 100644
index 0000000..f191585
--- /dev/null
+++ b/help/gl/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Compatibilidade para impresión</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/gl/addins-desktop.page b/help/gl/addins-desktop.page
deleted file mode 100644
index 6dd8b80..0000000
--- a/help/gl/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="gl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Complementos para integrar con outros aplicativos e sitios web.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Engadidos de integración co escritorio</title>
-
-	<p>Os complementos de integración do escritorio interactúan con outros aplicativos ou sitios web e con Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Ligazóns de Bugzilla</title>
-  <p>O complemento Ligazóns de Bugzilla permítelle arrastrar un URL de Bugzilla desde o seu navegador até o Tomboy. Despois de arrastrar unha ligazón nunha nota de Tomboy, mostraráselle o número do bug como unha ligazón activo ao carón da icona do bug para indicar que é unha ligazón de Bugzilla. Ao premer na ligazón da nota de Tomboy abrirase un navegador levándolle a esa páxina de Bugzilla.</p>
-</section>
-
-<section id="evolution">
-  <title>Integración co correo de Evolution</title>
-  <p>O complemento de integración con Evolution permítelle arrastrar un correo desde Evolution até unha nota de Tomboy. A súa nota mostrará unha icona dun sobre e o asunto da nota mostraráselle como unha ligazón. Ao premer nesta ligazón abrirase o correo usando Evolution.</p>
-</section>
-
-<section id="printing">
-  <title>Compatibilidade para impresión</title>
-  <p>Este complemento actívase de maneira predeterminada e permítelle imprimir as súas notas. Se desactiva este complemento, non poderá imprimir as súas notas.</p>
-</section>
-
-
- </page>
diff --git a/help/gl/addins-formatting-fixed-width.page b/help/gl/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..058eae7
--- /dev/null
+++ b/help/gl/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/gl/addins-formatting-underline.page b/help/gl/addins-formatting-underline.page
new file mode 100644
index 0000000..0c12056
--- /dev/null
+++ b/help/gl/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/gl/addins-formatting.page b/help/gl/addins-formatting.page
deleted file mode 100644
index 6eb2d47..0000000
--- a/help/gl/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="gl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Complementos para engadir formatado adicional de nota.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Engadidos de formatado</title>
-
-<section id="fixedwidth">
-  <title>Engadido de ancho fixo</title>
-  <p>O complemento de ancho fixo cambia o seu texto para que teña un ancho fixo na nota Tomboy. Este complemento está desactivado de maneira predeterminada. Para activalo, prema o botón <gui>Activar</gui>.</p>
-</section>
-
-<section id="underline">
-  <title>Engadido de subliñado</title>
-  <p>O complemente de subliñado permítelle subliñar un texto específico na súa nota usando a icona <gui>Texto</gui> na barra de ferramentas dunha nota. Este complemento está desactivado de maneira predeterminada. Para activalo, prema o botón <gui>Activar</gui>. Seleccione o texto que quere subliñar, prema a icona <gui>Texto</gui> na barra de ferramentas da nota e elixa <gui>Subliñar</gui> ou prema <keyseq><key>Ctrl + S</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/gl/addins-preferences.page b/help/gl/addins-preferences.page
new file mode 100644
index 0000000..5ab1dc6
--- /dev/null
+++ b/help/gl/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/gl/addins-sync-local.page b/help/gl/addins-sync-local.page
new file mode 100644
index 0000000..b19e7bd
--- /dev/null
+++ b/help/gl/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servizo de sincronización de cartafoles locais</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/gl/addins-sync-ssh.page b/help/gl/addins-sync-ssh.page
new file mode 100644
index 0000000..b41fbda
--- /dev/null
+++ b/help/gl/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servizo de sincronización SSH</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/gl/addins-sync-webdav.page b/help/gl/addins-sync-webdav.page
new file mode 100644
index 0000000..ae51dbf
--- /dev/null
+++ b/help/gl/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servizo de sincronización WebDav</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/gl/addins-sync-webservice.page b/help/gl/addins-sync-webservice.page
new file mode 100644
index 0000000..d3eb47b
--- /dev/null
+++ b/help/gl/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Servizo de sincronización Web</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/gl/addins-sync.page b/help/gl/addins-sync.page
deleted file mode 100644
index 364fc66..0000000
--- a/help/gl/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="gl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Activar formas adicionais de sincronizar as súas notas con outros dispositivos.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sincronizar complementos</title>
-
-	<p>Os complementos de sincronización permítelle elixir diferentes métodos e lugares para sincronizar as súas notas Tomboy. Para obter máis información, ou configuración da sincronización, consulte a páxina de axuda <link xref="sync-notes"/>.</p>
-
-
-<section id="local">
-  <title>Servizo de sincronización de cartafoles locais</title>
-  <p>O servizo de sincronización de cartafol local está activado de maneira predeterminada e permítelle a Tomboy sincronizar as súas notas con outro cartafol no seu equipo. Isto é útil para crear copias de respaldo das súas notas.</p>
-</section>
-
-<section id="ssh">
-  <title>Servizo de sincronización SSH</title>
-  <p>O servizo de sincronización SSH permítelle sincronizar as súas notas con outro equipo a través do protocolo SSH. Este complemento está desactivado de maneira predeterminada. É posíbel que deba instalar o paquete <em>sshfs</em> para a súa distribución de Linux para facer que este complemento funcione, algo que está fora do obxectivo deste documento de axuda.</p>
-</section>
-
-<section id="webdav">
-  <title>Servizo de sincronización WebDav</title>
-  <p>O complemento de servizo de sincronización WebDAV está activado de maneira predeterminada e pemítelle sincronizar as súas notas con un servidor WebDAV remoto. Pode necesitar ter instalado o paquete <em>wdfs FUSE file system</em> na súa distribución Linux para que este complemento funcione, o que está fora do obxectivo deste documento.</p>
-</section>
-
-<section id="webservice">
-  <title>Servizo de sincronización Web</title>
-  <p>O complemento de servizo de sincronización web permítelle sincronizar as súas notas con un servizo ou un servidor web remoto, como Tomboy online. No momento de escribir isto, o servizo Tomboy Online non se iniciou.</p>
-</section>
-
- </page>
diff --git a/help/gl/addins-tools-backlinks.page b/help/gl/addins-tools-backlinks.page
new file mode 100644
index 0000000..5c4a2f7
--- /dev/null
+++ b/help/gl/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Retroligazóns</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/gl/addins-tools-html-export.page b/help/gl/addins-tools-html-export.page
new file mode 100644
index 0000000..cd9f991
--- /dev/null
+++ b/help/gl/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Exportar a HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/gl/addins-tools-note-of-day.page b/help/gl/addins-tools-note-of-day.page
new file mode 100644
index 0000000..b685b61
--- /dev/null
+++ b/help/gl/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Nota do día</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/gl/addins-tools-timestamp.page b/help/gl/addins-tools-timestamp.page
new file mode 100644
index 0000000..cfb3d2a
--- /dev/null
+++ b/help/gl/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Inserir marca de tempo</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/gl/addins-tools.page b/help/gl/addins-tools.page
deleted file mode 100644
index c5fdd2a..0000000
--- a/help/gl/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="gl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Activar funcionalidade adicional da nota.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Engadidos de ferramentas de Tomboy</title>
-
-	<p>Os engadidos de ferramentas engaden novas funcionalidades ás Notas de Tomboy.</p>
-
-  <section id="backlinks">
-    <title>Retroligazóns</title>
-	<p>O complemento <gui>Retroligazóns</gui> está activado de maneira predeterminada e permítelle ver que notas ligan coa nota que está vendo actualmente.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Exportar a HTML</title>
-  <p>O complemento <gui>Exportar a HTML</gui> está activado de maneira predeterminada e exportará unha nota individual a HTML.</p>
-	<p>Para exportar unha nota a HTML, prema na icona <gui>Ferramentas</gui> na barra de ferramentas da nota e elixa <gui>Exportar a HTML</gui>. Inmediatamente aparecerá un diálogo para gardar a nota. Seleccione o cartafol no que quere gardar a nota e cambie o nome do ficheiro html novo da nota se quere que sexa diferente do nome da nota. A nota gardarase como un ficheiro HTML e mostrarase automaticamente no seu navegador.</p>
-</section>
-
-<section id="timestamp">
-  <title>Inserir marca de tempo</title>
-  <p>O complemento <gui>Insertar marca de tempo</gui> está desactivado de maneira predeterminada. Para activalo, seleccione o complemento <gui>Insertar marca de tempo</gui> e prema <gui>Activar</gui> nas preferencias de Tomboy.</p>
-	<p>Para engadir unha marca de tempo ás súas notas, prema sobre a icona <gui>Ferramentas</gui> na barra de ferramentas da nota e elixa <gui>Insertar marca de tempo</gui> ou prema <key>Ctrl+D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Nota do día</title>
-  <p>O complemento <gui>Nota do día</gui> está desactivado de maneira predeterminada. Para activalo, elixa o complemento <gui>Nota do día</gui> e prema <gui>Activar</gui> nas preferencias de Tomboy.</p>
-	<p>O complemento <gui>Nota do día</gui> creará unha nota diaria co título <em>Hoxe: Luns, 21 de xaneiro de 2010</em>, por exemplo. A nota tamén engadirá filas a <em>Tarefas</em> e <em>Citas</em> automaticamente.</p>
-</section>
-
-<section id="watcher">
-  <title>Vixiante do cartafol de notas</title>
-  <p>O complemento Vixilante do cartafol de notas monitoriza o cartafol no que Tomboy garda as súas notas. Se o complemento detecta cambios nas súas notas, aplicará estes cambios e mostraranse nas súas notas. Este complemento úsase a miúdo con servizos de sincronización de terceiras partes tales como Dropbox. A configuración de servizos de sincronización de terceiras partes está fora de obxectivo deste documento.</p>
-</section>
-
- </page>
diff --git a/help/gl/addins.page b/help/gl/addins.page
index 5030004..5eba72a 100644
--- a/help/gl/addins.page
+++ b/help/gl/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Engadir funcionalidade adicional a Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Engadidos de Tomboy</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Engadidos de Tomboy</title>
-    </info>
-    <title>Xestionar os complementos de Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/gl/delete-notes.page b/help/gl/delete-notes.page
index d2ff762..e47554c 100644
--- a/help/gl/delete-notes.page
+++ b/help/gl/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Eliminar unha nota en Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Proxecto de Documentación de GNOME</name>
       <years>2010</years>
@@ -19,12 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Eliminar unha nota</title>    
-  
-  <p>Pode eliminar unha nota premendo a icona <gui>Eliminar</gui> na barra de ferramentas da nota que quere eliminar.</p>
-  
-<note style="warning">
-	<p>Eliminar unha nota é permanente. Despois de eliminala, a nota non se poderá eliminar.</p> <p><gui>Preguntaráselle </gui> cando elimine unha nota.</p>  
-</note>
-	
+  <title>Eliminar unha nota</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/gl/introduction.page b/help/gl/introduction.page
index c237b5a..75c35c7 100644
--- a/help/gl/introduction.page
+++ b/help/gl/introduction.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> é un aplicativo para tomar notas no escritorio GNOME, Microsoft Windows e Mac OS X. <app>Tomboy</app> é sinxelo de usar e permítelle organizar as ideas e información coa que trata a diario.</p>
   <p><app>Tomboy</app> inclúe características que lle axudan a organizarse mellor e a recordar a súa información e permítelle ligar as súas notas entre si para encontrar e organizar as súa información de máis facilmente. Tamén pode organizar múltiples notas en cadernos de notas para agrupar notas xuntas máis facilmente.</p>
-  <p>Tamén pode sincronizar as súas notas con múltiples equipos, facendo máis sinxelo levarse as súas notas estea onde estea.</p>
+  <p>
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
+  </p>
 
   <figure>
     <title>Xanela de <gui>Notas de Tomboy</gui></title>
diff --git a/help/gl/pin-notes.page b/help/gl/pin-notes.page
new file mode 100644
index 0000000..fb74781
--- /dev/null
+++ b/help/gl/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="gl">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/gl/sync-setup.page b/help/gl/sync-setup.page
index 6f5dd72..92ae758 100644
--- a/help/gl/sync-setup.page
+++ b/help/gl/sync-setup.page
@@ -24,7 +24,14 @@
 	
 	<p><app>Tomboy</app> pode sincronizar as súas notas entre varios equipos. Isto permítelle ter un respaldo das súas notas noutros equipos ou compartir as súas notas entre outros equipos para que sempre teñan acceso a elas.</p>
 	
-	<p>Pode activar a sincronización abrindo as <gui>Preferencias de Tomboy</gui> usando o botón dereito do seu rato sobre a icona de Tomboy no seu panel, barra de tarefas ou doca e seleccione <gui>Preferencias</gui> e logo <gui>Sincronización</gui>. Tamén pode abrir as <gui>Preferencias de Tomboy</gui> desde o diálogo de <gui>Buscar en todas as notas</gui>. Desde o menú seleccione <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>.</p>
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </section>
 
@@ -42,7 +49,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -80,7 +87,17 @@
 	
 	<p>Recoméndase usar un terceiro equipo ou servidor como o equipo remoto no que almacenar as notas sincronizadas que se van sincronizar entre múltiples equipos.</p>
 
-	<p>Abra <app>Contrasinais e chaves de cifrado</app> elixindo <guiseq><gui>Aplicativos</gui><gui>Accesorios</gui><gui>Contrasinais e chaves de cifrado</gui></guiseq>. Pulse sobre a súa chave e elixa no menú <guiseq><gui>Remota</gui><gui>Configurar chave para Shell segura...</gui></guiseq> e escriba o nome do dominio ou enderezo IP do equipo co que quere sincronizar en <gui>Equipo</gui>. Introduza o nome de usuario do equipo remoto en <gui>Usuario</gui> e prema <gui>Aceptar</gui>. Cando s [...]
+	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
+	<guiseq><gui>Applications</gui><gui>Accessories</gui>
+	<gui>Passwords and Encryption Keys</gui></guiseq>.  
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
+	</p>
 	
 	<p>En Tomboy, elixa <gui>SSH</gui> da lista despregábel <gui>Servizo</gui>. Complete a información para o seu servidor e despois prema o botón <gui>Gardar</gui>. Agora está listo para sincronizar as súas notas. A opción <gui>Ruta do cartafol</gui>, aínda que opcional, debería apuntar a un cartafol baleiro. Agora está listo para sincronizar as súas notas.</p>
 
diff --git a/help/gl/sync.page b/help/gl/sync.page
index c4db87c..2c3faed 100644
--- a/help/gl/sync.page
+++ b/help/gl/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Sincronizar notas manualmente</title>
 	
-	<p>Pode sincronizar as súas notas de tres formas:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>Desde calquera nota prema a icona <gui>Ferramentas</gui> e seleccione <gui>Sincronizar notas</gui></p></item>
@@ -38,13 +38,26 @@
  
  	<title>Sincronizar as súas notas automaticamente</title>
  	
- 	<p>Tomboy pode sincronizar automaticamente as súas notas en segundo plano. Recoméndase que configure como se deben xestionar os conflitos nas notas antes de activar a sincronización automática. Pode saber máis sobre os conflitos coas notas na páxina <link xref="sync-setup#conflicts"/>.</p>
- 	
- 	<p>Pode activar a sincronización abrindo as <gui>Preferencias de Tomboy</gui> usando o botón dereito do seu rato sobre a icona de Tomboy no seu panel, barra de tarefas ou doca e seleccione <gui>Preferencias</gui> e logo <gui>Sincronización</gui>. Tamén pode abrir as <gui>Preferencias de Tomboy</gui> desde o diálogo de <gui>Buscar en todas as notas</gui>. Desde o menú seleccione <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>.</p>
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 	
 	<p>Para activar a autosincronización, comprobe que a caixa de verificación <gui>Sincronizar automaticamente en segundo plano cada x Minutos</gui> na parte inferior do separador Sincronización.</p>
 	
-	<p>A opción predefinida de Tomboy é autosincronizar cada 10 minutos. Para cambiar a frecuencia de sincronización introduza o número de minutos no diálogo ou use o rato para mover o tempo cara arriba ou cara abaixo.</p>
+	<p>Tomboy's default option is to autosync every 10 minutes.  To change
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>Para desactivar a sincronización automática, desmarque a caixa de verificación <gui>Sincronizar automaticamente en segundo plano cada x minutos</gui>.</p>
 	
diff --git a/help/gl/whatsnew.page b/help/gl/whatsnew.page
index 0ad9d8c..1a2b0d6 100644
--- a/help/gl/whatsnew.page
+++ b/help/gl/whatsnew.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> ten agora un bo número de melloras. Debería iniciarse notabelmente máis rápido grazas ás melloras feitas no tempo de inicio do Tomboy.</p>
   <p>Mellorouse o copiado e pegado desde Tomboy a outros aplicativos para admitir o formatado nos aplicativos que poidan entender HTML, como Evolution, OpenOffice.org e outros máis.</p>
-  <p>Agora <app>Tomboy</app> pode sincronizar as súas notas de forma automática por vostede cando teña a sincronización activada.</p>
+  <p>
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
+  </p>
 
   <p>Engadiuse a compatibilidade coas "jump lists" de Microsoft Windows 7 para axudarlle a acceder ás súas notas, buscar e crear unha nova nota de forma máis rápida directamente desde a barra de tarefas de Windows.</p>
 
diff --git a/help/hu/addins-desktop-bugzilla.page b/help/hu/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..1c05bb7
--- /dev/null
+++ b/help/hu/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla hivatkozások</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/hu/addins-desktop-printing.page b/help/hu/addins-desktop-printing.page
new file mode 100644
index 0000000..e84a5fd
--- /dev/null
+++ b/help/hu/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Nyomtatás támogatása</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/hu/addins-desktop.page b/help/hu/addins-desktop.page
deleted file mode 100644
index d5c2af2..0000000
--- a/help/hu/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="hu">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Bővítmények más alkalmazások és weboldalak integrációjához.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Asztali integrációs bővítmények</title>
-
-	<p>Az Asztali integrációs bővítmények más alkalmazások vagy webhelyek és a Tomboy együttműködését segítik.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla hivatkozások</title>
-  <p>A Bugzilla hivatkozások bővítmény lehetővé teszi egy Bugzilla URL áthúzását a Tomboyba. A hivatkozás Tomboy jegyzetbe húzása után a Tomboy a hiba ikon mellett aktív hivatkozásként megjeleníti a hiba számát, így jelezve hogy Bugzilla hivatkozásról van szó. A hivatkozásra kattintás a Tomboy jegyzetben megnyit egy böngészőablakot, amely az adott Bugzilla oldalra viszi.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution levelező integrálása</title>
-  <p>Az Evolution levelező integrálása bővítmény lehetővé teszi egy e-mail áthúzását az Evolutionből Tomboy jegyzetbe. A jegyzet megjelenít egy boríték ikont, és a jegyzet tárgya hivatkozásként jelenik meg. A hivatkozásra kattintva megnyílik a levél az Evolutionben.</p>
-</section>
-
-<section id="printing">
-  <title>Nyomtatás támogatása</title>
-  <p>Ez a bővítmény alapértelmezésben engedélyezett, és lehetővé teszi a jegyzetek kinyomtatását. A bővítmény letiltása esetén nem lesz képes kinyomtatni jegyzeteit.</p>
-</section>
-
-
- </page>
diff --git a/help/hu/addins-formatting-fixed-width.page b/help/hu/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..048f6b6
--- /dev/null
+++ b/help/hu/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/hu/addins-formatting-underline.page b/help/hu/addins-formatting-underline.page
new file mode 100644
index 0000000..cb0a5a6
--- /dev/null
+++ b/help/hu/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/hu/addins-formatting.page b/help/hu/addins-formatting.page
deleted file mode 100644
index bdc6d66..0000000
--- a/help/hu/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="hu">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Bővítmények további jegyzetformázási lehetőségekhez.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formázó bővítmények</title>
-
-<section id="fixedwidth">
-  <title>Rögzített szélesség bővítmény</title>
-  <p>A Rögzített szélesség bővítmény a Tomboy jegyzet szövegét rögzített szélességűvé teszi. Ez a bővítmény alapértelmezésben ki van kapcsolva. Engedélyezéséhez nyomja meg az <gui>Engedélyezés</gui> gombot.</p>
-</section>
-
-<section id="underline">
-  <title>Aláhúzás bővítmény</title>
-  <p>Az Aláhúzás bővítmény lehetővé teszi adott szövegrészek aláhúzását a jegyzet eszköztárának <gui>Szöveg</gui> gombja segítségével. Ez a bővítmény alapértelmezésben ki van kapcsolva. Az engedélyezéséhez nyomja meg az <gui>Engedélyezés</gui> gombot. Jelölje ki az aláhúzni kívánt szöveget, nyomja meg a jegyzet eszköztárán lévő <gui>Szöveg</gui> gombot, és válassza ki az <gui>Aláhúzás</gui> lehetőséget, vagy nyomja meg a <keyseq><key>CONTROL + U</key></keyseq> kombinációt.</p>
-</section>
-
- </page>
diff --git a/help/hu/addins-preferences.page b/help/hu/addins-preferences.page
new file mode 100644
index 0000000..c4b7593
--- /dev/null
+++ b/help/hu/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/hu/addins-sync-local.page b/help/hu/addins-sync-local.page
new file mode 100644
index 0000000..c98b45e
--- /dev/null
+++ b/help/hu/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Helyi könyvtár szinkronizálási szolgáltatás</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/hu/addins-sync-ssh.page b/help/hu/addins-sync-ssh.page
new file mode 100644
index 0000000..f7787c6
--- /dev/null
+++ b/help/hu/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH szinkronizálási szolgáltatás</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/hu/addins-sync-webdav.page b/help/hu/addins-sync-webdav.page
new file mode 100644
index 0000000..da70287
--- /dev/null
+++ b/help/hu/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav szinkronizálási szolgáltatás</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/hu/addins-sync-webservice.page b/help/hu/addins-sync-webservice.page
new file mode 100644
index 0000000..05c8e3d
--- /dev/null
+++ b/help/hu/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Webes szinkronizálási szolgáltatás</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/hu/addins-sync.page b/help/hu/addins-sync.page
deleted file mode 100644
index 0121871..0000000
--- a/help/hu/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="hu">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>További módszerek jegyzetei más eszközökkel való szinkronizálására.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Szinkronizáló bővítmények</title>
-
-	<p>A Szinkronizáló bővítmények lehetővé teszik különböző módszerek és helyek kiválasztását a Tomboy jegyzetei szinkronizálására. A szinkronizálás beállításával kapcsolatos további információkért lásd a <link xref="sync-notes"/> oldalt.</p>
-
-
-<section id="local">
-  <title>Helyi könyvtár szinkronizálási szolgáltatás</title>
-  <p>A Helyi könyvtár szinkronizálási szolgáltatás alapértelmezésben engedélyezett, és lehetővé teszi a Tomboy számára a jegyzetek másik könyvtárba szinkronizálását a számítógépen. Ez a jegyzetek biztonsági mentéséhez hasznos.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH szinkronizálási szolgáltatás</title>
-  <p>Az SSH szinkronizálási szolgáltatás lehetővé teszi jegyzeteinek szinkronizálását másik számítógéppel az SSH protokollon. Ez a bővítmény alapértelmezésben le van tiltva. Ezen bővítmény működéséhez szükség lehet az <em>sshfs</em> csomag telepítésére az Ön által használt Linux disztribúció tárolóiból.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav szinkronizálási szolgáltatás</title>
-  <p>A WebDav szinkronizálási szolgáltatás bővítmény alapértelmezésben engedélyezett, és lehetővé teszi jegyzetei szinkronizálását egy távoli WebDav kiszolgálóval. Ezen bővítmény működéséhez szükség lehet a <em>wdfs FUSE fájlrendszer</em> csomag telepítésére az Ön által használt Linux disztribúció tárolóiból.</p>
-</section>
-
-<section id="webservice">
-  <title>Webes szinkronizálási szolgáltatás</title>
-  <p>A webes szinkronizálási szolgáltatás bővítmény lehetővé teszi jegyzetei szinkronizálását egy távoli webkiszolgálóval vagy szolgáltatással, mint a Tomboy Online. Ezen súgó készítésekor a Tomboy Online szolgáltatás még nem működik.</p>
-</section>
-
- </page>
diff --git a/help/hu/addins-tools-backlinks.page b/help/hu/addins-tools-backlinks.page
new file mode 100644
index 0000000..e908c93
--- /dev/null
+++ b/help/hu/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Visszahivatkozások</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/hu/addins-tools-html-export.page b/help/hu/addins-tools-html-export.page
new file mode 100644
index 0000000..09f41b1
--- /dev/null
+++ b/help/hu/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Exportálás HTML-be</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/hu/addins-tools-note-of-day.page b/help/hu/addins-tools-note-of-day.page
new file mode 100644
index 0000000..4883fc9
--- /dev/null
+++ b/help/hu/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>A nap jegyzete</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/hu/addins-tools-timestamp.page b/help/hu/addins-tools-timestamp.page
new file mode 100644
index 0000000..65cd06d
--- /dev/null
+++ b/help/hu/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Időbélyeg beillesztése</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/hu/addins-tools.page b/help/hu/addins-tools.page
deleted file mode 100644
index 01ffecd..0000000
--- a/help/hu/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="hu">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>További jegyzetszolgáltatások bekapcsolása.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy eszközbővítmények</title>
-
-	<p>Az eszközbővítmények további funkciókat biztosítanak a Tomboy jegyzetek kezeléséhez.</p>
-
-  <section id="backlinks">
-    <title>Visszahivatkozások</title>
-	<p>A <gui>Visszahivatkozások</gui> bővítmény alapértelmezésben engedélyezett, és lehetővé teszi a megjelenített jegyzetre hivatkozó jegyzetek felsorolását.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Exportálás HTML-be</title>
-  <p>Az <gui>Exportálás HTML-be</gui> bővítmény alapértelmezésben engedélyezett, és lehetővé teszi az egyes jegyzetek HTML-be történő exportálását.</p>
-	<p>Jegyzet HTML-be exportálásához nyomja meg a jegyzet eszköztárán lévő <gui>Eszközök</gui> ikont, és válassza az <gui>Exportálás HTML-be</gui> menüpontot. Azonnal megjelenik egy ablak, amelyben elmentheti a jegyzetet. Válassza ki a könyvtárat, amelybe menteni szeretné a jegyzetet, és adja meg az új HTML fájl nevét, ha a jegyzet nevétől különböző nevet szeretne használni. A jegyzet elmentésre kerül HTML formátumba, és megjelenik böngészőjében.</p>
-</section>
-
-<section id="timestamp">
-  <title>Időbélyeg beillesztése</title>
-  <p>Az <gui>Időbélyeg beillesztése</gui> bővítmény alapértelmezetten le van tiltva. Engedélyezéséhez válassza a Tomboy beállításaiban az <gui>Időbélyeg beillesztése</gui> bővítményt, és nyomja meg az <gui>Engedélyezés</gui> gombot.</p>
-	<p>A jegyzeteibe időbélyeg beszúrásához nyomja meg a jegyzet eszköztárán az <gui>Eszközök</gui> gombot, és válassza az <gui>Időbélyeg beszúrása</gui> lehetőséget, vagy nyomja meg a <key>Ctrl + D</key> kombinációt.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>A nap jegyzete</title>
-  <p>Az <gui>A nap jegyzete</gui> bővítmény alapértelmezetten le van tiltva. Engedélyezéséhez válassza a Tomboy beállításaiban az <gui>A nap jegyzete</gui> bővítményt, és nyomja meg az <gui>Engedélyezés</gui> gombot.</p>
-	<p><gui>A nap jegyzete</gui> bővítmény minden nap létrehoz egy jegyzetet a következőhöz hasonló címmel: <em>Ma: vasárnap, 2010. szeptember 26.</em> A jegyzet automatikusan tartalmazni fog egy <em>Feladatok</em> és egy <em>Találkozók</em> sort.</p>
-</section>
-
-<section id="watcher">
-  <title>Jegyzetkönyvtár-figyelő</title>
-  <p>A Jegyzetkönyvtár-figyelő bővítmény figyeli a Tomboy jegyzetek tárolására használt könyvtárat. Ha a bővítmény a jegyzetek változását észleli, akkor alkalmazza ezeket a változásokat, és azok megjelennek a jegyzetekben. Ez a bővítmény általában külső szinkronizációs szolgáltatások, mint például a Dropbox használata esetén hasznos. A külső szinkronizációs szolgáltatások beállításával ez a súgó nem tud foglalkozni.</p>
-</section>
-
- </page>
diff --git a/help/hu/addins.page b/help/hu/addins.page
index 1548b36..225ce08 100644
--- a/help/hu/addins.page
+++ b/help/hu/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>További szolgáltatások a Tomboyhoz.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy bővítmények</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy bővítmények</title>
-    </info>
-    <title>Tomboy bővítmények kezelése</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/hu/delete-notes.page b/help/hu/delete-notes.page
index a8ba044..a1f929f 100644
--- a/help/hu/delete-notes.page
+++ b/help/hu/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Jegyzet törlése a Tomboyban.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME dokumentációs projekt</name>
       <years>2010</years>
@@ -19,12 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Jegyzet törlése</title>    
-  
-  <p>Egy jegyzet a törölni kívánt jegyzet eszköztárának <gui>Törlés</gui> gombjának megnyomásával törölhető.</p>
-  
-<note style="warning">
-	<p>A jegyzet törlése végleges. A törlés után a jegyzet nem állítható vissza.</p> <p>Jegyzet törlésekor a <gui>Biztosan törli ezt a jegyzetet?</gui> kérdést teszi fel a program.</p>  
-</note>
-	
+  <title>Jegyzet törlése</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/hu/introduction.page b/help/hu/introduction.page
index 4e869dc..7c465f9 100644
--- a/help/hu/introduction.page
+++ b/help/hu/introduction.page
@@ -22,7 +22,10 @@
 
   <p>A <app>Tomboy</app> egy jegyzetelő alkalmazás a GNOME asztali környezethez, Microsoft Windows és Mac OS X rendszerekhez. A <app>Tomboy</app> használata egyszerű, és segít rendszerezni ötleteit és a minden nap használt információkat.</p>
   <p>A <app>Tomboy</app> szolgáltatásai segítenek rendszerezni és megjegyezni az információkat, valamint lehetővé teszi a jegyzetek összekapcsolását az információk egyszerűbb keresése és rendezése érdekében. Több jegyzetet jegyzettömbbé szervezhet, így megkönnyítve a jegyzetek csoportosítását.</p>
-  <p>Jegyzeteit szinkronizálhatja is számítógépei között, egyszerűvé téve jegyzetei elérését, bárhol is van.</p>
+  <p>
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
+  </p>
 
   <figure>
     <title>A <gui>Tomboy jegyzettömb</gui> ablak</title>
diff --git a/help/hu/pin-notes.page b/help/hu/pin-notes.page
new file mode 100644
index 0000000..153e8ab
--- /dev/null
+++ b/help/hu/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="hu">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/hu/sync-setup.page b/help/hu/sync-setup.page
index acba418..4176eea 100644
--- a/help/hu/sync-setup.page
+++ b/help/hu/sync-setup.page
@@ -24,7 +24,14 @@
 	
 	<p>A <app>Tomboy</app> képes jegyzeteinek szinkronizálására több számítógép között. Ez lehetővé teszi a jegyzetek biztonsági másolatának másik számítógépen tartását, vagy a jegyzetek megosztását több számítógép között, hogy mindig elérhesse azokat.</p>
 	
-	<p>A szinkronizálást engedélyezheti a <gui>Tomboy beállításai</gui> megnyitásával a jobb egérgombbal kattintva a panelen, tálcán vagy dokkon lévő Tomboy ikonra, és a <gui>Beállítások</gui> menüpont, majd a <gui>Szinkronizálás</gui> lap kiválasztásával. Megnyithatja a <gui>Tomboy beállításait</gui> a <gui>Keresés minden jegyzetben</gui> ablakból is. Itt a menüből válassza a <guiseq><gui>Szerkesztés</gui><gui>Beállítások</gui></guiseq> menüpontot.</p>
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </section>
 
@@ -42,7 +49,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -80,7 +87,17 @@
 	
 	<p>A több számítógép között szinkronizálandó jegyzetek tárolására javasolt egy harmadik számítógép vagy kiszolgáló használata távoli számítógépként.</p>
 
-	<p>Nyissa meg a <app>Jelszavak és titkosítási kulcsok</app> alkalmazást az <guiseq><gui>Alkalmazások</gui><gui>Kellékek</gui><gui>Jelszavak és titkosítási kulcsok</gui></guiseq> menüpont kiválasztásával. Kattintson a kulcsára, és válassza a <guiseq><gui>Távoli</gui><gui>SSH kulcs beállítása</gui></guiseq> menüpontot, majd a <gui>Számítógép neve</gui> mezőben adja meg azon számítógép tartománynevét vagy IP-címét, amelyre szinkronizálni szeretne. A <gui>Bejelentkezési név</gui> mezőben ad [...]
+	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
+	<guiseq><gui>Applications</gui><gui>Accessories</gui>
+	<gui>Passwords and Encryption Keys</gui></guiseq>.  
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
+	</p>
 	
 	<p>A Tomboyban válassza a <gui>Szolgáltatás</gui> legördülő lista <gui>SSH</gui> elemét. Adja meg a kiszolgáló kapcsolatinformációit, és nyomja meg a <gui>Mentés</gui> gombot. A <gui>Mappaútvonal</gui> elhagyható, és egy üres mappára kell mutatnia. Ezzel be is fejezte a jegyzetek szinkronizálásának előkészítését.</p>
 
diff --git a/help/hu/sync.page b/help/hu/sync.page
index a71a5c8..8c295ec 100644
--- a/help/hu/sync.page
+++ b/help/hu/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Jegyzetek kézi szinkronizálása</title>
 	
-	<p>Jegyzeteit háromféleképpen szinkronizálhatja:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>Bármely jegyzeten kattintson az <gui>Eszközök</gui> ikonra, és válassza a <gui>Jegyzetek szinkronizálása</gui> menüpontot.</p></item>
@@ -38,13 +38,26 @@
  
  	<title>Jegyzetek automatikus szinkronizálása</title>
  	
- 	<p>A Tomboy képes jegyzetei automatikus szinkronizálására a háttérben. Az automatikus szinkronizálás beállítása előtt javasolt a jegyzetütközések kezelési módját is beállítani. A jegyzetütközések kezeléséről lásd a <link xref="sync-setup#conflict"/> oldalt.</p>
- 	
- 	<p>A szinkronizálást engedélyezheti a <gui>Tomboy beállításai</gui> megnyitásával a jobb egérgombbal kattintva a panelen, tálcán vagy dokkon lévő Tomboy ikonra, és a <gui>Beállítások</gui> menüpont, majd a <gui>Szinkronizálás</gui> lap kiválasztásával. Megnyithatja a <gui>Tomboy beállításait</gui> a <gui>Keresés minden jegyzetben</gui> ablakból is. Itt a menüből válassza a <guiseq><gui>Szerkesztés</gui><gui>Beállítások</gui></guiseq> menüpontot.</p>
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 	
 	<p>Az automatikus szinkronizálás engedélyezéséhez jelölje be az <gui>Automatikus szinkronizálás a háttérben minden x percben</gui> négyzetet a Szinkronizálás lapon.</p>
 	
-	<p>A Tomboy alapértelmezésben 10 percenként szinkronizál. Ennek módosításához adja meg a kívánt értéket a léptetőmezőben.</p>
+	<p>Tomboy's default option is to autosync every 10 minutes.  To change
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>Az automatikus szinkronizálás kikapcsolásához törölje az <gui>Automatikus szinkronizálás a háttérben minden x percben</gui> négyzetet.</p>
 	
diff --git a/help/hu/whatsnew.page b/help/hu/whatsnew.page
index 2dbf992..ba2bdf2 100644
--- a/help/hu/whatsnew.page
+++ b/help/hu/whatsnew.page
@@ -22,7 +22,10 @@
 
   <p>A <app>Tomboy</app> számos új fejlesztést tartalmaz. A Tomboy észrevehetően gyorsabban indul az indítási időt érintő fejlesztéseknek köszönhetően.</p>
   <p>A másolás és beillesztés a Tomboyból más alkalmazásokba immár támogatja a formázást más, HTML-t értő alkalmazásokba, mint például az Evolution, OpenOffice.org és mások.</p>
-  <p>A <app>Tomboy</app> képes jegyzetei automatikus szinkronizálására, ha a szinkronizálás engedélyezett.</p>
+  <p>
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
+  </p>
 
   <p>A Microsoft Windows 7 Jump listek támogatása segítségével gyorsabban, közvetlenül a Windows tálcáról érheti el jegyzeteit, kereshet vagy hozhat létre új jegyzeteket.</p>
 
diff --git a/help/it/addins-desktop-bugzilla.page b/help/it/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..7c50a1f
--- /dev/null
+++ b/help/it/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/it/addins-desktop-printing.page b/help/it/addins-desktop-printing.page
new file mode 100644
index 0000000..7de4657
--- /dev/null
+++ b/help/it/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/it/addins-desktop.page b/help/it/addins-desktop.page
deleted file mode 100644
index 706f285..0000000
--- a/help/it/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="it">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/it/addins-formatting-fixed-width.page b/help/it/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..8b362aa
--- /dev/null
+++ b/help/it/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Larghezza fissa</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/it/addins-formatting-underline.page b/help/it/addins-formatting-underline.page
new file mode 100644
index 0000000..3a3548f
--- /dev/null
+++ b/help/it/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/it/addins-formatting.page b/help/it/addins-formatting.page
deleted file mode 100644
index 31c1aea..0000000
--- a/help/it/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="it">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/it/addins-preferences.page b/help/it/addins-preferences.page
new file mode 100644
index 0000000..551fe7b
--- /dev/null
+++ b/help/it/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/it/addins-sync-local.page b/help/it/addins-sync-local.page
new file mode 100644
index 0000000..a2d4ede
--- /dev/null
+++ b/help/it/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/it/addins-sync-ssh.page b/help/it/addins-sync-ssh.page
new file mode 100644
index 0000000..0c92cd5
--- /dev/null
+++ b/help/it/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/it/addins-sync-webdav.page b/help/it/addins-sync-webdav.page
new file mode 100644
index 0000000..ea5df8c
--- /dev/null
+++ b/help/it/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/it/addins-sync-webservice.page b/help/it/addins-sync-webservice.page
new file mode 100644
index 0000000..c468e20
--- /dev/null
+++ b/help/it/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/it/addins-sync.page b/help/it/addins-sync.page
deleted file mode 100644
index a4d2025..0000000
--- a/help/it/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="it">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/it/addins-tools-backlinks.page b/help/it/addins-tools-backlinks.page
new file mode 100644
index 0000000..881a62e
--- /dev/null
+++ b/help/it/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/it/addins-tools-html-export.page b/help/it/addins-tools-html-export.page
new file mode 100644
index 0000000..61e71f4
--- /dev/null
+++ b/help/it/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Esporta in HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/it/addins-tools-note-of-day.page b/help/it/addins-tools-note-of-day.page
new file mode 100644
index 0000000..188c758
--- /dev/null
+++ b/help/it/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Note of the Day</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/it/addins-tools-timestamp.page b/help/it/addins-tools-timestamp.page
new file mode 100644
index 0000000..99628a8
--- /dev/null
+++ b/help/it/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/it/addins-tools.page b/help/it/addins-tools.page
deleted file mode 100644
index 8824ab1..0000000
--- a/help/it/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="it">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Esporta in HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Note of the Day</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/it/addins.page b/help/it/addins.page
index 4c7ffd0..257609c 100644
--- a/help/it/addins.page
+++ b/help/it/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferenze</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Sincronizzazione</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/it/delete-notes.page b/help/it/delete-notes.page
index 6669759..6aeade2 100644
--- a/help/it/delete-notes.page
+++ b/help/it/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME Documentation Project</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/it/introduction.page b/help/it/introduction.page
index b400253..91918a6 100644
--- a/help/it/introduction.page
+++ b/help/it/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/it/pin-notes.page b/help/it/pin-notes.page
new file mode 100644
index 0000000..f9a4c04
--- /dev/null
+++ b/help/it/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="it">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/it/sync-setup.page b/help/it/sync-setup.page
index fa777bc..10c479a 100644
--- a/help/it/sync-setup.page
+++ b/help/it/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -118,7 +118,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/it/sync.page b/help/it/sync.page
index 60e6e4a..457b9da 100644
--- a/help/it/sync.page
+++ b/help/it/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/it/whatsnew.page b/help/it/whatsnew.page
index b349b3b..fdf1139 100644
--- a/help/it/whatsnew.page
+++ b/help/it/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/lt/addins-desktop-bugzilla.page b/help/lt/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..08d77b0
--- /dev/null
+++ b/help/lt/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/lt/addins-desktop-printing.page b/help/lt/addins-desktop-printing.page
new file mode 100644
index 0000000..c470b70
--- /dev/null
+++ b/help/lt/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/lt/addins-desktop.page b/help/lt/addins-desktop.page
deleted file mode 100644
index fe8ed73..0000000
--- a/help/lt/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="lt">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/lt/addins-formatting-fixed-width.page b/help/lt/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..1bfd54b
--- /dev/null
+++ b/help/lt/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fiksuoto pločio</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/lt/addins-formatting-underline.page b/help/lt/addins-formatting-underline.page
new file mode 100644
index 0000000..115f18d
--- /dev/null
+++ b/help/lt/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/lt/addins-formatting.page b/help/lt/addins-formatting.page
deleted file mode 100644
index be68057..0000000
--- a/help/lt/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="lt">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/lt/addins-preferences.page b/help/lt/addins-preferences.page
new file mode 100644
index 0000000..b4a3c0e
--- /dev/null
+++ b/help/lt/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/lt/addins-sync-local.page b/help/lt/addins-sync-local.page
new file mode 100644
index 0000000..46bf1a1
--- /dev/null
+++ b/help/lt/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/lt/addins-sync-ssh.page b/help/lt/addins-sync-ssh.page
new file mode 100644
index 0000000..ef3e988
--- /dev/null
+++ b/help/lt/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/lt/addins-sync-webdav.page b/help/lt/addins-sync-webdav.page
new file mode 100644
index 0000000..46323f9
--- /dev/null
+++ b/help/lt/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/lt/addins-sync-webservice.page b/help/lt/addins-sync-webservice.page
new file mode 100644
index 0000000..a770934
--- /dev/null
+++ b/help/lt/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/lt/addins-sync.page b/help/lt/addins-sync.page
deleted file mode 100644
index f12bc16..0000000
--- a/help/lt/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="lt">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/lt/addins-tools-backlinks.page b/help/lt/addins-tools-backlinks.page
new file mode 100644
index 0000000..689edcc
--- /dev/null
+++ b/help/lt/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Atgalinės nuorodos</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/lt/addins-tools-html-export.page b/help/lt/addins-tools-html-export.page
new file mode 100644
index 0000000..a1d77f7
--- /dev/null
+++ b/help/lt/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Eksportas į HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/lt/addins-tools-note-of-day.page b/help/lt/addins-tools-note-of-day.page
new file mode 100644
index 0000000..76eab7c
--- /dev/null
+++ b/help/lt/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Dienos raštelis</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/lt/addins-tools-timestamp.page b/help/lt/addins-tools-timestamp.page
new file mode 100644
index 0000000..86cd4a9
--- /dev/null
+++ b/help/lt/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/lt/addins-tools.page b/help/lt/addins-tools.page
deleted file mode 100644
index 8d757ee..0000000
--- a/help/lt/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="lt">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Atgalinės nuorodos</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Eksportas į HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Dienos raštelis</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/lt/addins.page b/help/lt/addins.page
index cc69347..3a3b503 100644
--- a/help/lt/addins.page
+++ b/help/lt/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Nustatymai</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Sinchronizavimas</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/lt/delete-notes.page b/help/lt/delete-notes.page
index 92776c2..cbe5cc5 100644
--- a/help/lt/delete-notes.page
+++ b/help/lt/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME Dokumentacijos Projektas</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/lt/introduction.page b/help/lt/introduction.page
index 9577dc7..4a527b0 100644
--- a/help/lt/introduction.page
+++ b/help/lt/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/lt/pin-notes.page b/help/lt/pin-notes.page
new file mode 100644
index 0000000..2422eb9
--- /dev/null
+++ b/help/lt/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="lt">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/lt/sync-setup.page b/help/lt/sync-setup.page
index db8881b..868a684 100644
--- a/help/lt/sync-setup.page
+++ b/help/lt/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -118,7 +118,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/lt/sync.page b/help/lt/sync.page
index f6fac46..828be2b 100644
--- a/help/lt/sync.page
+++ b/help/lt/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/lt/whatsnew.page b/help/lt/whatsnew.page
index 3abde74..0568d80 100644
--- a/help/lt/whatsnew.page
+++ b/help/lt/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/lv/addins-desktop-bugzilla.page b/help/lv/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..2d46e0b
--- /dev/null
+++ b/help/lv/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/lv/addins-desktop-printing.page b/help/lv/addins-desktop-printing.page
new file mode 100644
index 0000000..915d516
--- /dev/null
+++ b/help/lv/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Drukāšanas atbalsts</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/lv/addins-desktop.page b/help/lv/addins-desktop.page
deleted file mode 100644
index dea0018..0000000
--- a/help/lv/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="lv">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Spraudņi integrācijai ar citām programmām un tīmekļa lapām.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Darbvirsmas integrācijas pievienojumprogrammas</title>
-
-	<p>Darbvirsmas integrācijas pievienojumprogrammas sadarbojas starp citām programmām vai tīmekļa lapām un Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>Bugzilla Links pievienojumprogramma ļauj tev pārvilkt Bugzilla URL no tavas pārlūkprogrammas uz Tomboy. Pēc saites pārvilkšanas uz Tomboy piezīmi, Tomboy attēlos kļūdas numuru kā aktīvu saiti blakus kļūdas ikonai, tādējādi norādot, ka tā ir Bugzilla saite. Nospiežot uz saites Tomboy piezīmē, tiks atvērts pārlūks ar Bugzilla lapu.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integrācija</title>
-  <p>Evolution Mail integrācijas spraudnis ļauj tev pārvilkt e-pastu no Evolution uz Tomboy piezīmi. Tavai piezīmei būs vēstules ikona un piezīmes tēma tiks norādīta kā saite. Nospiežot uz saites tiks atvērts šis e-pasts Evolution programmā.</p>
-</section>
-
-<section id="printing">
-  <title>Drukāšanas atbalsts</title>
-  <p>Šī pievienojumprogramma pēc noklusējuma ir aktivēta un ļauj tev izdrukāt piezīmes. Ja tu deaktivēsi šo pievienojumprogrammu, piezīmju drukāšana nebūs pieejama.</p>
-</section>
-
-
- </page>
diff --git a/help/lv/addins-formatting-fixed-width.page b/help/lv/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..c643a72
--- /dev/null
+++ b/help/lv/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/lv/addins-formatting-underline.page b/help/lv/addins-formatting-underline.page
new file mode 100644
index 0000000..4ab2d85
--- /dev/null
+++ b/help/lv/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/lv/addins-formatting.page b/help/lv/addins-formatting.page
deleted file mode 100644
index 8414001..0000000
--- a/help/lv/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="lv">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Spraudņi papildus piezīmju formatēšanas iespējām.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatēšanas pievienojumprogrammas</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width pievienojumprogramma</title>
-  <p>Fixed Width pievienojumprogramma maina tavu tekstu uz fiksētu platumu Tomboy piezīmēs. Šī pievienojumprogramma pēc noklusējuma ir deaktivēta. Lai aktivētu, spied <gui>Aktivēt</gui> pogu.</p>
-</section>
-
-<section id="underline">
-  <title>Underline pievienojumprogramma</title>
-  <p>Underline pievienojumprogramma ļauj tev pasvītrot teksta daļas tavā piezīmē, izmantojot <gui>Teksts</gui> ikonu rīkjoslā. Šī pievienojumprogramma pēc noklusējuma ir deaktivēta. Lai aktivētu, spied <gui>Aktivēt</gui> pogu. Iezīmē tekstu, kuru vēlies pasvītrot, spied <gui>Teksts</gui> ikonu rīkjoslā un izvēlies <gui>Pasvītrot</gui> vai nospied <keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/lv/addins-preferences.page b/help/lv/addins-preferences.page
new file mode 100644
index 0000000..c33d544
--- /dev/null
+++ b/help/lv/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/lv/addins-sync-local.page b/help/lv/addins-sync-local.page
new file mode 100644
index 0000000..01a60df
--- /dev/null
+++ b/help/lv/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Vietējā direktorija sinhronizācijas serviss</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/lv/addins-sync-ssh.page b/help/lv/addins-sync-ssh.page
new file mode 100644
index 0000000..ef64bfd
--- /dev/null
+++ b/help/lv/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH sinhronizācijas serviss</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/lv/addins-sync-webdav.page b/help/lv/addins-sync-webdav.page
new file mode 100644
index 0000000..fad4e44
--- /dev/null
+++ b/help/lv/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sinhronizācijas Serviss</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/lv/addins-sync-webservice.page b/help/lv/addins-sync-webservice.page
new file mode 100644
index 0000000..621a38f
--- /dev/null
+++ b/help/lv/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Tīmekļa sinhronizācijas serviss</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/lv/addins-sync.page b/help/lv/addins-sync.page
deleted file mode 100644
index 6f42493..0000000
--- a/help/lv/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="lv">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Iespējo papildu veidus, kā sinhronizēt piezīmes ar citām ierīcēm.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sinhronizācijas pievienojumprogrammas</title>
-
-	<p>Sinhronizācijas pievienojumprogrammas ļauj tev izvēlēties vairākas dažādus veidus un vietas piezīmju sinhronizācijai. Vairāk informācijai par sinhronizācijas konfigurēšanu, lasi <link xref="sync-notes"/> palīdzības lapu.</p>
-
-
-<section id="local">
-  <title>Vietējā direktorija sinhronizācijas serviss</title>
-  <p>Vietējā direktorija sinhronizācijas serviss pēc noklusējuma ir aktivēts un ļauj Tomboy sinhronizēt tā piezīmes ar citu direktoriju tavā datorā. Tas ir noderīgi kopiju izveidošanai datorā.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH sinhronizācijas serviss</title>
-  <p>SSH sinhronizācijas serviss ļauj tev sinhronizēt piezīmes ar citu datoru caur SSH protokolu. Šis spraudnis pēc noklusējuma ir deaktivēts. Tev, iespējams, vajadzēs instalēt <em>sshfs</em> paku tavai Linux distribūcijai, lai šī pievienojumprogramma strādātu, bet tā uzstādīšanas pamācības apraksts nav iekļauts šajā palīdzības dokumentā.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sinhronizācijas Serviss</title>
-  <p>WebDav sinhronizācijas servisa pievienojumprogramma pēc noklusējuma ir aktivēta un ļauj tev sinhronizēt piezīmes ar attālu WebDav serveri. Tev, iespējams, būs nepieciešama <em>wdfs FUSE failu sistēmas</em> paka, instalēta tavai Linux distribūcijai, lai šī pievienojumprogramma strādātu, bet tās uzstādīšanas pamācības apraksts nav iekļauts šajā palīdzības failā.</p>
-</section>
-
-<section id="webservice">
-  <title>Tīmekļa sinhronizācijas serviss</title>
-  <p>Tīmekļa sinhronizācijas servisa pievienojumprogramma ļauj tev sinhronizēt tavas piezīmes ar attālu web serveri vai servisu, piemēram Tomboy Online. Pašreiz Tomboy Online serviss vēl nav palaists.</p>
-</section>
-
- </page>
diff --git a/help/lv/addins-tools-backlinks.page b/help/lv/addins-tools-backlinks.page
new file mode 100644
index 0000000..92ba6f4
--- /dev/null
+++ b/help/lv/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Atpakaļsaites</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/lv/addins-tools-html-export.page b/help/lv/addins-tools-html-export.page
new file mode 100644
index 0000000..fa551c8
--- /dev/null
+++ b/help/lv/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Eksportēt uz HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/lv/addins-tools-note-of-day.page b/help/lv/addins-tools-note-of-day.page
new file mode 100644
index 0000000..4acf4e3
--- /dev/null
+++ b/help/lv/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Dienas piezīme</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/lv/addins-tools-timestamp.page b/help/lv/addins-tools-timestamp.page
new file mode 100644
index 0000000..8a9c334
--- /dev/null
+++ b/help/lv/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Ievietot laika spiedogu</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/lv/addins-tools.page b/help/lv/addins-tools.page
deleted file mode 100644
index 44d5d20..0000000
--- a/help/lv/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="lv">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Aktivē papildu piezīmju funkcionalitāti.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools pievienojumprogrammas</title>
-
-	<p>Rīku pievienojumprogrammas papildina funkcionalitāti tavām Tomboy piezīmēm.</p>
-
-  <section id="backlinks">
-    <title>Atpakaļsaites</title>
-	<p><gui>Atpakaļsaites</gui> pievienojumprogramma pēc noklusējuma ir aktivēta un ļauj redzēt, kuras piezīmes ir piesaistītas piezīmei, kuru pašreiz skaties.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Eksportēt uz HTML</title>
-  <p><gui>Eksportēt uz HTML</gui> pievienojumprogramma pēc noklusējuma ir aktivēta un eksportē individuālu piezīmi uz HTML.</p>
-	<p>Lai eksportētu piezīmi uz HTML, spied <gui>Rīki</gui> ikonu, piezīmju rīkjoslā, un izvēlies <gui>Eksportēt uz HTML</gui>. Tev uzreiz tiks dots piezīmes saglabāšanas logs. Izvēlies mapi, kurā saglabāt piezīmi un izmaini nosaukumu, ja tu vēlies, lai tas būtu citādāks, nekā piezīmes faila nosaukums. Piezīme tiks saglabāta HTML formātā un automātiski tiks attēlota tavā pārlūkprogrammā.</p>
-</section>
-
-<section id="timestamp">
-  <title>Ievietot laika spiedogu</title>
-  <p><gui>Ievietot laika spiedogu</gui> pievienojumprogramma pēc noklusējuma ir deaktivēta. Lai to aktivētu, Tomboy iestatījumu logā izvēlies <gui>Ievietot laika spiedogu</gui> pievienojumprogrammu un tad nospied <gui>Aktivēt</gui>.</p>
-	<p>Lai piezīmē ievietotu laika spiedogu, spied <gui>Rīki</gui> ikonu rīkjoslā un izvēlies <gui>Ievietot laika spiedogu</gui> vai nospied <key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Dienas piezīme</title>
-  <p><gui>Dienas piezīme</gui> pievienojumprogramma pēc noklusējuma ir deaktivēta. Lai to aktivētu, Tomboy iestatījumos izvēlies <gui>Dienas Piezīme</gui> pievienojumprogrammu un nospied <gui>Aktivēt</gui>.</p>
-	<p><gui>Dienas piezīme</gui> pievienojumprogramma izveidos jaunu piezīmi katru dienu ar tās dienas datuma virsrakstu, piemēram, <em>Šodien: Sestdiena, 25. decembris, 2011</em>. Piezīmē arī automātiski ievietos tās dienas <em>Uzdevumus</em> un <em>Tikšanās</em>.</p>
-</section>
-
-<section id="watcher">
-  <title>Piezīmju direktorija uzraugs</title>
-  <p>Piezīmju direktorija uzraugs pievienojumprogramma novēro tavu Tomboy piezīmju direktoriju. Ja pievienojumprogramma konstatē izmaiņas piezīmēs, tā automātiski piemēros izmaiņas un tās tiks attēlotas tavās piezīmēs. Šī pievienojumprogramma parasti tiek izmantota ar 3. puses sinhronizācijas servisiem, piemēram, Dropbox. 3. pušu sinhronizācijas servisu uzstādīšanas pamācības neietilpst šajā Palīdzībā.</p>
-</section>
-
- </page>
diff --git a/help/lv/addins.page b/help/lv/addins.page
index e926094..97c3303 100644
--- a/help/lv/addins.page
+++ b/help/lv/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Pievieno papildus funkcionalitāti Tomboy programmai.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy pievienojumprogrammas</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy pievienojumprogrammas</title>
-    </info>
-    <title>Pārvaldi Tomboy pievienojumprogrammas</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/lv/delete-notes.page b/help/lv/delete-notes.page
index 2cc0b82..15ca028 100644
--- a/help/lv/delete-notes.page
+++ b/help/lv/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Izdzēst piezīmi Tomboy programmā.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME Dokumentācijas Projekts</name>
       <years>2010</years>
@@ -19,12 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Izdzēst piezīmi</title>    
-  
-  <p>Tu vari izdzēst piezīmi, nospiežot <gui>Izdzēst</gui> ikonu, piezīmes, kuru vēlies izdzēst, rīkjoslā.</p>
-  
-<note style="warning">
-	<p>Piezīmju dzēšana ir neatgriezeniska un pēc dzēšanas piezīme nav atgūstama.</p> <p>Tev vaicās pēc apstiprinājuma <gui>Vai tiešām izdzēst šo piezīmi?</gui> pirms piezīmes dzēšanas.</p>  
-</note>
-	
+  <title>Izdzēst piezīmi</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/lv/introduction.page b/help/lv/introduction.page
index 128b7a7..ce2244e 100644
--- a/help/lv/introduction.page
+++ b/help/lv/introduction.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> ir piezīmju pierakstīšanas programma GNOME Desktop, Microsoft Windows un Mac OS X. <app>Tomboy</app> ir vienkārši lietot un palīdz tev organizēt idejas un informāciju, ar ko strādā katru dienu.</p>
   <p><app>Tomboy</app> ir funkcijas, kas tev palīdz labāk organizēt un atcerēties informāciju, un ļauj tev sasaistīt piezīmes kopā, lai tev vieglāk būtu meklēt un sakārtot informāciju. Kā arī tu vari vairākas piezīmes sakārtot piezīmju blokos, lai piezīmju grupēšana būtu vieglāka.</p>
-  <p>Kā arī, tu vari sinhronizēt piezīmes starp vairākiem datoriem, paņemot līdzi savas piezīmes, lai kur tu būtu.</p>
+  <p>
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
+  </p>
 
   <figure>
     <title><gui>Tomboy piezīmes</gui> logs</title>
diff --git a/help/lv/pin-notes.page b/help/lv/pin-notes.page
new file mode 100644
index 0000000..b8cb9b2
--- /dev/null
+++ b/help/lv/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="lv">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/lv/sync-setup.page b/help/lv/sync-setup.page
index 5f9fe7c..6767e78 100644
--- a/help/lv/sync-setup.page
+++ b/help/lv/sync-setup.page
@@ -24,7 +24,14 @@
 	
 	<p><app>Tomboy</app> spēj sinhronizēt tavas piezīmes starp vairākiem datoriem. Tas tev ļauj izveidot piezīmju rezerves kopijas citā datorā vai dalīties ar piezīmēm starp citiem datoriem tā, lai tev tām vienmēr būtu pieeja.</p>
 	
-	<p>Tu vari aktivēt sinhronizāciju, atverot <gui>Tomboy Iestatījumi</gui>, izmantojot savu peli, lai veiktu labo klikšķi uz Tomboy ikonas savā panelī, uzdevumu joslā vai dokā. Izvēlies <gui>Iestatījumi</gui> un tad izvēlies <gui>Sinhronizācija</gui> cilni. Tu vari arī atvērt <gui>Tomboy iestatījumi</gui> no <gui>Meklēt visas piezīmes</gui> izvēlnes. No šīs izvēlnes paņem <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq>.</p>
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </section>
 
@@ -41,7 +48,10 @@
 		<item><p><gui>Pārsaukt manu lokālo piezīmi.</gui> Ja ir izvēlēta šī iespēja, Tomboy automātiski aizvietos piezīmi ar kopiju no attālā datora un pārsauks to, lai tu nepazaudētu tajā esošo informāciju.</p>
 		</item>
 		
-		<item><p><gui>Aizvietot manu lokālo piezīmi ar servera atjauninājumu.</gui> Ja ir paņemta šī iespēja, kad tu sinhronizēsi, Tomboy pārrakstīs un aizvietos tavu piezīmi ar kopiju no attālā datora.</p>
+		<item><p><gui>Replace my local note with the server's update.</gui>
+  		If you have selected this option, when you synchronize, 
+		Tomboy will overwrite and replace your note stored on your
+		computer with a copy from the remote computer.</p>
 		
 		<note style="warning">
 		<p>Automātiskā piezīmju pārrakstīšana ir neatsaucama. Tava lokālā piezīme tiks aizvietota ar kopiju no attālā datora un tu pazaudēsi visu informāciju, kura bija pirms sinhronizēšanas.</p>
@@ -71,7 +81,17 @@
 	
 	<p>Ir ieteicams izmantot trešo datoru vai serveri kā attālināto datoru, lai uzglabātu sinhronizētās piezīmes, kuras ir plānots sinhronizēt starp vairākiem datoriem.</p>
 
-	<p>Atver <app>Passwords and Encryption Keys</app>, izvēloties  <guiseq><gui>Lietotnes</gui><gui>Piederumi</gui><gui>Passwords and Encryption Keys</gui></guiseq>. Nospied uz savas atslēgas un no izvēlnes, izvēlies <guiseq><gui>Attālināti</gui><gui>Konfigurē atslēgu drošai čaulai</gui></guiseq> un ievadi datora, ar kuru vēlies sinhronizēt piezīmes, domēna vārdu vai IP adresi, <gui>Datora Nosaukums</gui> laukā. Ievadi attālinātā datora lietotājvārdu <gui>Lietotājvārds</gui> laukā un spied  [...]
+	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
+	<guiseq><gui>Applications</gui><gui>Accessories</gui>
+	<gui>Passwords and Encryption Keys</gui></guiseq>.  
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
+	</p>
 	
 	<p>Tomboy programmā, izvēlies <gui>SSH</gui> no <gui>Serviss</gui> lejupkrītošā saraksta. Aizpildi servera savienojuma datus un nospied <gui>Saglabāt</gui> pogu. Kā <gui>Mapes Ceļš</gui>, neobligāts lauks, vajadzētu norādīt uz tukšu mapi. Tu esi gatavs sinhronizēt savas piezīmes.</p>
 
diff --git a/help/lv/sync.page b/help/lv/sync.page
index 67adf11..4a3b050 100644
--- a/help/lv/sync.page
+++ b/help/lv/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Pašrocīga piezīmju sinhronizācija</title>
 	
-	<p>Tu vari sinhronizēt savas piezīmes 3 veidos:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>No jebkuras piezīmes, nospied <gui>Rīki</gui> ikonu un nospied <gui>Sinhronizēt piezīmes</gui>.</p></item>
@@ -38,13 +38,26 @@
  
  	<title>Sinhronizē piezīmes automātiski</title>
  	
- 	<p>Tomboy var automātiski fonā sinhronizēt tavas piezīmes. Ir ieteicams uzstādīt to, kā tu kontrolē piezīmju konfliktus, pirms automātiskās sinhronizācijas aktivēšanas. Par piezīmju konfliktu kontrolēšanu lasi <link xref="sync-setup#conflict"/> lapu.</p>
- 	
- 	<p>Tu vari aktivēt sinhronizāciju, atverot <gui>Tomboy Iestatījumi</gui>, izmantojot savu peli, lai veiktu labo klikšķi uz Tomboy ikonas savā panelī, uzdevumu joslā vai dokā. Izvēlies <gui>Iestatījumi</gui> un tad izvēlies <gui>Sinhronizācija</gui> cilni. Tu vari arī atvērt <gui>Tomboy iestatījumi</gui> no <gui>Meklēt visas piezīmes</gui> izvēlnes. No šīs izvēlnes paņem <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq>.</p>
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 	
 	<p>Lai aktivētu automātisko sinhronizāciju, atzīmē <gui>Sinhronizēt piezīmes automātiski fonā katras x minūtes</gui> lauku, Sinhronizācijas cilnes lejā.</p>
 	
-	<p>Noklusētais automātiskās sinhronizācijas intervāls ir katras 10 minūtes. Lai pamainītu intervālu, cik bieži Tomboy vajadzētu sinhronizēt piezīmes, ievadi šo skaitli attiecīgajā laukā vai izmanto peli, lai virzītu laiku uz augšu vai leju.</p>
+	<p>Tomboy's default option is to autosync every 10 minutes.  To change
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>Lai deaktivētu automātisko sinhronizāciju, atslēdz <gui>Sinhronizēt piezīmes automātiski fonā katras x minūtes</gui> lauku.</p>
 	
diff --git a/help/lv/whatsnew.page b/help/lv/whatsnew.page
index 360af60..7fe4d4b 100644
--- a/help/lv/whatsnew.page
+++ b/help/lv/whatsnew.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> iekļauj sevī vairākus jaunus uzlabojumus. Tomboy vajadzētu startēties ievērojami ātrāk, pateicoties Tomboy uzsākšanas laika uzlabojumos.</p>
   <p>Kopēšana un ielīmēšana no Tomboy uz citām programmām ir uzlabota, lai atbalstītu formatēšanu citās programmās, kuras saprot HTML, piemēram, Evolution, OpenOffice.org u.c.</p>
-  <p>Tagad <app>Tomboy</app> spēj automātiski sinhronizēt tavas piezīmes, kad tev ir aktivēta sinhronizācija.</p>
+  <p>
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
+  </p>
 
   <p>Ir pievienots atbalsts Microsoft Windows 7 lēcējsarakstiem, kas palīdzēs tieši no Windows uzdevumu joslas gūt pieeju tavām piezīmēm, meklēt vai izveidot jaunas piezīmes.</p>
 
diff --git a/help/oc/addins-desktop-bugzilla.page b/help/oc/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..bfee829
--- /dev/null
+++ b/help/oc/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/oc/addins-desktop-printing.page b/help/oc/addins-desktop-printing.page
new file mode 100644
index 0000000..0ee2220
--- /dev/null
+++ b/help/oc/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/oc/addins-desktop.page b/help/oc/addins-desktop.page
deleted file mode 100644
index 44d610e..0000000
--- a/help/oc/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="oc">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/oc/addins-formatting-fixed-width.page b/help/oc/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..89612c5
--- /dev/null
+++ b/help/oc/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/oc/addins-formatting-underline.page b/help/oc/addins-formatting-underline.page
new file mode 100644
index 0000000..f2fba9f
--- /dev/null
+++ b/help/oc/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/oc/addins-formatting.page b/help/oc/addins-formatting.page
deleted file mode 100644
index 4338c0b..0000000
--- a/help/oc/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="oc">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/oc/addins-preferences.page b/help/oc/addins-preferences.page
new file mode 100644
index 0000000..761d232
--- /dev/null
+++ b/help/oc/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/oc/addins-sync-local.page b/help/oc/addins-sync-local.page
new file mode 100644
index 0000000..9dcf9f8
--- /dev/null
+++ b/help/oc/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/oc/addins-sync-ssh.page b/help/oc/addins-sync-ssh.page
new file mode 100644
index 0000000..43857b5
--- /dev/null
+++ b/help/oc/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/oc/addins-sync-webdav.page b/help/oc/addins-sync-webdav.page
new file mode 100644
index 0000000..ae0eab6
--- /dev/null
+++ b/help/oc/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/oc/addins-sync-webservice.page b/help/oc/addins-sync-webservice.page
new file mode 100644
index 0000000..0914e65
--- /dev/null
+++ b/help/oc/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/oc/addins-sync.page b/help/oc/addins-sync.page
deleted file mode 100644
index 74735ce..0000000
--- a/help/oc/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="oc">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/oc/addins-tools-backlinks.page b/help/oc/addins-tools-backlinks.page
new file mode 100644
index 0000000..e3fa3f6
--- /dev/null
+++ b/help/oc/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/oc/addins-tools-html-export.page b/help/oc/addins-tools-html-export.page
new file mode 100644
index 0000000..3e843ba
--- /dev/null
+++ b/help/oc/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Exportar en HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/oc/addins-tools-note-of-day.page b/help/oc/addins-tools-note-of-day.page
new file mode 100644
index 0000000..77897fd
--- /dev/null
+++ b/help/oc/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Nòta del jorn</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/oc/addins-tools-timestamp.page b/help/oc/addins-tools-timestamp.page
new file mode 100644
index 0000000..531fa39
--- /dev/null
+++ b/help/oc/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/oc/addins-tools.page b/help/oc/addins-tools.page
deleted file mode 100644
index edf24ca..0000000
--- a/help/oc/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="oc">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Exportar en HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Nòta del jorn</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/oc/addins.page b/help/oc/addins.page
index d87f9b9..b2cc527 100644
--- a/help/oc/addins.page
+++ b/help/oc/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferéncias</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/oc/delete-notes.page b/help/oc/delete-notes.page
index 43f773c..9afcfd7 100644
--- a/help/oc/delete-notes.page
+++ b/help/oc/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Projècte de documentacion de GNOME</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/oc/introduction.page b/help/oc/introduction.page
index 755299b..51e0127 100644
--- a/help/oc/introduction.page
+++ b/help/oc/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/oc/pin-notes.page b/help/oc/pin-notes.page
new file mode 100644
index 0000000..b925603
--- /dev/null
+++ b/help/oc/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="oc">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/oc/sync-setup.page b/help/oc/sync-setup.page
index 15fc3fe..29fa240 100644
--- a/help/oc/sync-setup.page
+++ b/help/oc/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -122,7 +122,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/oc/sync.page b/help/oc/sync.page
index c7d56f4..33de31f 100644
--- a/help/oc/sync.page
+++ b/help/oc/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/oc/whatsnew.page b/help/oc/whatsnew.page
index 56a53cd..1b91fb7 100644
--- a/help/oc/whatsnew.page
+++ b/help/oc/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/pl/addins-desktop-bugzilla.page b/help/pl/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..aaf3caa
--- /dev/null
+++ b/help/pl/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/pl/addins-desktop-printing.page b/help/pl/addins-desktop-printing.page
new file mode 100644
index 0000000..a596378
--- /dev/null
+++ b/help/pl/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Obsługa drukowania</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/pl/addins-desktop.page b/help/pl/addins-desktop.page
deleted file mode 100644
index 9b89671..0000000
--- a/help/pl/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="pl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Dodatki integracji z innymi programami i stronami internetowymi.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Dodatki integracji z pulpitem</title>
-
-	<p>Dodatki integracji z pulpitem współdziałają z innymi programami lub stronami internetowymi i programem Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>Dodatek Bugzilla Links umożliwia użytkownikowi przeciąganie adresu URL Bugzilli z przeglądarki do programu Tomboy. Po przeciągnięciu adresu numer błędu zostanie wyświetlony jako aktywny odnośnik. Kliknięcie adresu otworzy odpowiednią stronę serwisu Bugzilla w przeglądarce użytkownika.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>Dodatek Evolution Mail Integration umożliwia użytkownikowi przeciąganie wiadomości e-mail do notatki programu Tomboy. W notatce pojawi się ikona koperty, a nazwa notatki będzie odnośnikiem, którego kliknięcie otworzy wiadomość w programie Evolution.</p>
-</section>
-
-<section id="printing">
-  <title>Obsługa drukowania</title>
-  <p>Dodatek umożliwia użytkownikowi drukowanie notatek i jest domyślnie włączony. Jeśli dodatek zostanie wyłączony, opcja drukowania notatek będzie niedostępna.</p>
-</section>
-
-
- </page>
diff --git a/help/pl/addins-formatting-fixed-width.page b/help/pl/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..8f6834f
--- /dev/null
+++ b/help/pl/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/pl/addins-formatting-underline.page b/help/pl/addins-formatting-underline.page
new file mode 100644
index 0000000..bc474ea
--- /dev/null
+++ b/help/pl/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/pl/addins-formatting.page b/help/pl/addins-formatting.page
deleted file mode 100644
index 98f0393..0000000
--- a/help/pl/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="pl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Wtyczki dodatkowego formatowania notatek.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Dodatki formatowania</title>
-
-<section id="fixedwidth">
-  <title>Stała szerokość</title>
-  <p>Dodatek stałej szerokości zmienia szerokość tekstu w notatce na stałą. Dodatek jest domyślnie wyłączony. Aby włączyć dodatek, należy nacisnąć przycisk <gui>Włącz</gui>.</p>
-</section>
-
-<section id="underline">
-  <title>Dodatek opcji podkreślenia</title>
-  <p>Dodatek opcji podkreślenia umożliwia użytkownikowi podkreślenie wybranych części notatki przy użyciu ikony <gui>Tekst</gui> na pasku narzędziowym notatki. Dodatek jest domyślnie wyłączony. Aby włączyć dodatek, należy nacisnąć przycisk <gui>Włącz</gui>. Wyróżnij tekst, który ma zostać podkreślony, a następnie kliknij ikonę <gui>Tekst</gui> na pasku narzędziowym notatki oraz wybierz polecenie <gui>Podkreśl</gui> lub naciśnij klawisze <keyseq><key>Ctrl + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/pl/addins-preferences.page b/help/pl/addins-preferences.page
new file mode 100644
index 0000000..96a8fcf
--- /dev/null
+++ b/help/pl/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/pl/addins-sync-local.page b/help/pl/addins-sync-local.page
new file mode 100644
index 0000000..aea5494
--- /dev/null
+++ b/help/pl/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Usługa synchronizacji z katalogiem lokalnym</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/pl/addins-sync-ssh.page b/help/pl/addins-sync-ssh.page
new file mode 100644
index 0000000..aeebcd5
--- /dev/null
+++ b/help/pl/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Usługa synchronizacji SSH</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/pl/addins-sync-webdav.page b/help/pl/addins-sync-webdav.page
new file mode 100644
index 0000000..885b8da
--- /dev/null
+++ b/help/pl/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Usługa synchronizacji WebDav</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/pl/addins-sync-webservice.page b/help/pl/addins-sync-webservice.page
new file mode 100644
index 0000000..e6bf8c1
--- /dev/null
+++ b/help/pl/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Usługa synchronizacji sieciowej</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/pl/addins-sync.page b/help/pl/addins-sync.page
deleted file mode 100644
index ac269c6..0000000
--- a/help/pl/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="pl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Włączanie dodatkowych metod synchronizacji notatek z innymi urządzeniami.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Dodatki synchronizacji</title>
-
-	<p>Dodatki synchronizacji umożliwiają użytkownikowi wybór różnych metod oraz miejsc synchronizacji notatek programu Tomboy. Więcej informacji na temat konfiguracji synchronizacji: strona pomocy <link xref="sync-notes"/>.</p>
-
-
-<section id="local">
-  <title>Usługa synchronizacji z katalogiem lokalnym</title>
-  <p>Usługa synchronizacji z katalogiem lokalnym jest domyślnie włączona. Usługa umożliwia synchronizację notatek do innego katalogu na komputerze użytkownika, pozwalając na łatwiejsze tworzenie kopii zapasowych notatek.</p>
-</section>
-
-<section id="ssh">
-  <title>Usługa synchronizacji SSH</title>
-  <p>Usługa synchronizacji protokołu SSH umożliwia synchronizację notatek z innym komputerem poprzez protokół SSH. Wtyczka jest domyślnie wyłączona. Aby dodatek działał prawidłowo, należy zainstalować pakiet <em>sshfs</em> odpowiedni dla dystrybucji systemu Linux użytkownika. Informacje na temat instalacji pakietu nie znajdują się w niniejszym dokumencie pomocy.</p>
-</section>
-
-<section id="webdav">
-  <title>Usługa synchronizacji WebDav</title>
-  <p>Dodatek synchronizacji z serwerem WebDav jest domyślnie włączony. Pozwala on użytkownikowi na synchronizowanie notatek przy użyciu zdalnego serwera WebDav. Aby opcja działała prawidłowo, należy zainstalować odpowiedni dla dystrybucji systemu Linux użytkownika pakiet <em>system plików wdfs FUSE</em>. Informacje na temat instalacji pakietu nie znajdują się w niniejszym dokumencie pomocy.</p>
-</section>
-
-<section id="webservice">
-  <title>Usługa synchronizacji sieciowej</title>
-  <p>Usługa synchronizacji sieciowej umożliwia synchronizację notatek do zdalnego serwera sieciowego lub usługi sieciowej, np. Tomboy Online. W trakcie tworzenia dokumentu pomocy usługa Tomboy Online nie została jeszcze uruchomiona.</p>
-</section>
-
- </page>
diff --git a/help/pl/addins-tools-backlinks.page b/help/pl/addins-tools-backlinks.page
new file mode 100644
index 0000000..1fec333
--- /dev/null
+++ b/help/pl/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/pl/addins-tools-html-export.page b/help/pl/addins-tools-html-export.page
new file mode 100644
index 0000000..cee07ad
--- /dev/null
+++ b/help/pl/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Eksportuj do formatu HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/pl/addins-tools-note-of-day.page b/help/pl/addins-tools-note-of-day.page
new file mode 100644
index 0000000..85daab1
--- /dev/null
+++ b/help/pl/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Note of the Day</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/pl/addins-tools-timestamp.page b/help/pl/addins-tools-timestamp.page
new file mode 100644
index 0000000..92419d2
--- /dev/null
+++ b/help/pl/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp (Wstaw znacznik czasu)</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/pl/addins-tools.page b/help/pl/addins-tools.page
deleted file mode 100644
index 09fdc8c..0000000
--- a/help/pl/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="pl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Włączanie dodatkowych funkcji notatek.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Dodatki narzędziowe do programu</title>
-
-	<p>Dodatki narzędziowe dodają do programu nowe funkcje.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>Dodatek <gui>Backlinks</gui> jest domyślnie włączony. Dodatek umożliwia użytkownikowi podgląd notatek, które zawierają odnośniki do otworzonej notatki.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Eksportuj do formatu HTML</title>
-  <p>Dodatek <gui>Eksportuj do formatu HTML</gui> jest domyślnie włączony. Dodatek umożliwia użytkownikowi eksportowanie wybranej notatki do formatu HTML.</p>
-	<p>Aby eksportować notatkę do formatu HTML, należy kliknąć na pasku narzędziowym notatki ikonę <gui>Narzędzia</gui>, a następnie wybrać polecenie <gui>Eksportuj do formatu HTML</gui>. Zostanie wyświetlone okno dialogowe zapisu. Należy wybrać katalog, w którym ma być zapisana notatka i opcjonalnie zmienić nazwę pliku HTML. Notatka zapisana jako plik HTML zostanie automatycznie otworzona w przeglądarce internetowej użytkownika.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp (Wstaw znacznik czasu)</title>
-  <p>Dodatek <gui>Insert Timestamp</gui> jest domyślnie wyłączony. Aby włączyć dodatek, należy zaznaczyć nazwę dodatku, a następnie kliknąć w preferencjach programu polecenie <gui>Włącz</gui>.</p>
-	<p>Aby dodać znacznik czasu do notatki, należy kliknąć na pasku narzędziowym notatki ikonę <gui>Narzędzia</gui>, a następnie wybrać polecenie <gui>Wstaw znacznik czasu</gui> lub nacisnąć kombinację klawiszy <key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Note of the Day</title>
-  <p>Dodatek <gui>Note of the Day</gui> jest domyślnie wyłączony. Aby włączyć dodatek, należy zaznaczyć nazwę dodatku, a następnie kliknąć w preferencjach programu polecenie <gui>Włącz</gui>.</p>
-	<p>Dodatek <gui>Note of the Day</gui> tworzy codziennie nową notatkę o tytule stanowiącym datę danego dnia, np. <em>Dzisiaj: czwartek, 21 stycznia 2010</em>. Do tabel <em>Zadania</em> i <em>Spotkania</em> zostaną automatycznie dodane wiersze.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>Dodatek Note Directory Watcher monitoruje katalog, w którym zapisywane są notatki. Jeśli dodatek wykryje zmiany, zostaną one zapisane i pojawią się w notatkach. Dodatku Note Directory Watcher zwykle używa się z usługami synchronizacyjnymi strony trzeciej, np. Dropbox. Informacje na temat instalacji usług synchronizacyjnych strony trzeciej nie znajdują się w niniejszym dokumencie pomocy.</p>
-</section>
-
- </page>
diff --git a/help/pl/addins.page b/help/pl/addins.page
index 7250774..ca8850c 100644
--- a/help/pl/addins.page
+++ b/help/pl/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Dodawanie nowych funkcji do programu Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Dodatki do programu Tomboy</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Dodatki do programu Tomboy</title>
-    </info>
-    <title>Zarządzanie dodatkami do programu Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/pl/delete-notes.page b/help/pl/delete-notes.page
index f8fe989..169f41f 100644
--- a/help/pl/delete-notes.page
+++ b/help/pl/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Usuwanie notatek.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Projekt dokumentacji GNOME</name>
       <years>2010</years>
@@ -19,12 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Usuwanie notatki</title>    
-  
-  <p>Aby usunąć notatkę, należy kliknąć na pasku narzędziowym usuwanej notatki ikonę <gui>Usuń</gui>.</p>
-  
-<note style="warning">
-	<p>Opcja usunięcia notatki jest nieodwracalna. Nie można odzyskać notatki po jej usunięciu.</p> <p>Podczas usuwania notatki pojawi się monit potwierdzenia <gui>Na pewno usunąć tę notatkę?</gui>.</p>  
-</note>
-	
+  <title>Usuwanie notatki</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/pl/pin-notes.page b/help/pl/pin-notes.page
new file mode 100644
index 0000000..64a17c5
--- /dev/null
+++ b/help/pl/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="pl">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/pl/pl.po b/help/pl/pl.po
index a009461..11296cd 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -4,11 +4,16 @@
 # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
 # gnomepl at aviary.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Joanna Mazgaj <jmazgaj at aviary.pl>, 2008.
+# Aleksander Łukasiewicz <aleksander at lukasiewicz.org>, 2009.
+# Asia Słowik <asiaslowik at gmail.com>, 2011.
+# Piotr Drąg <piotrdrag at gmail.com>, 2011-2013.
+# Aviary.pl <gnomepl at aviary.pl>, 2008-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy-help\n"
-"POT-Creation-Date: 2013-03-16 19:18+0000\n"
-"PO-Revision-Date: 2013-03-20 19:10+0100\n"
+"POT-Creation-Date: 2013-08-23 20:24+0000\n"
+"PO-Revision-Date: 2013-09-05 16:15+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <gnomepl at aviary.pl>\n"
 "Language: pl\n"
@@ -71,7 +76,7 @@ msgstr ""
 #: C/whatsnew.page:36(p)
 msgid ""
 "<app>Tomboy</app> can now synchronize your notes automatically for you when "
-"you when you have sync enabled."
+"you when you have synchronize enabled."
 msgstr ""
 "Po włączeniu opcji synchronizowania program <app>Tomboy</app> automatycznie "
 "synchronizuje notatki."
@@ -119,11 +124,11 @@ msgstr ""
 
 #: C/sync-setup.page:33(p) C/sync.page:54(p)
 msgid ""
-"You can enable sync by opening <gui>Tomboy Preferences</gui> by using your "
-"mouse to right click on the Tomboy icon in your panel, taskbar or dock and "
-"choose <gui>Preferences</gui> and then select the <gui>Synchronization</gui> "
-"tab. You can also open <gui> Tomboy Preferences</gui> from the <gui>Search "
-"All Notes</gui> dialog. From the menu choose <guiseq><gui>Edit</"
+"You can enable synchronize by opening <gui>Tomboy Preferences</gui> by using "
+"your mouse to right click on the Tomboy icon in your panel, taskbar or dock "
+"and choose <gui>Preferences</gui> and then select the <gui>Synchronization</"
+"gui> tab. You can also open <gui> Tomboy Preferences</gui> from the "
+"<gui>Search All Notes</gui> dialog. From the menu choose <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui></guiseq>."
 msgstr ""
 "Użytkownik może włączyć opcję synchronizacji, otwierając menu "
@@ -185,8 +190,9 @@ msgstr ""
 #: C/sync-setup.page:70(p)
 msgid ""
 "<gui>Replace my local note with the server's update.</gui> If you have "
-"selected this option, when you sync, Tomboy will overwrite and replace your "
-"note stored on your computer with a copy from the remote computer."
+"selected this option, when you synchronize, Tomboy will overwrite and "
+"replace your note stored on your computer with a copy from the remote "
+"computer."
 msgstr ""
 "<gui>Zastąp kopię lokalną aktualizacją z serwera.</gui> Jeśli ta opcja "
 "zostanie zaznaczona, w czasie synchronizacji notatka przechowywana w "
@@ -267,10 +273,10 @@ msgid ""
 "<guiseq><gui>Applications</gui><gui>Accessories</gui><gui>Passwords and "
 "Encryption Keys</gui></guiseq>. Click on your key, and from the menu choose "
 "<guiseq><gui>Remote</gui><gui>Configure Key for Secure Shell</gui></guiseq> "
-"and enter the domain name or IP address of the computer you want to sync to "
-"in <gui>Computer Name</gui>. Enter the username of the remote computer in "
-"<gui>Login Name:</gui> and press <gui>Set Up</gui>. When prompted, enter the "
-"password and setting up your key will be completed."
+"and enter the domain name or IP address of the computer you want to "
+"synchronize to in <gui>Computer Name</gui>. Enter the username of the remote "
+"computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. When "
+"prompted, enter the password and setting up your key will be completed."
 msgstr ""
 "Z menu <guiseq><gui>Programy</gui><gui>Akcesoria</gui></guiseq> otwórz "
 "program <app>Hasła i klucze szyfrujące</app>, a następnie kliknij klucz i z "
@@ -332,7 +338,7 @@ msgid "Manually Syncing Notes"
 msgstr "Ręczna synchronizacja notatek"
 
 #: C/sync.page:29(p)
-msgid "You can sync your notes one of three ways:"
+msgid "You can synchronize your notes one of three ways:"
 msgstr "Można synchronizować notatki na trzy sposoby:"
 
 #: C/sync.page:32(p)
@@ -366,10 +372,10 @@ msgstr "Automatyczna synchronizacja notatek"
 
 #: C/sync.page:48(p)
 msgid ""
-"Tomboy can automatically sync your notes for you in the background. It is "
-"recommended that you configure how you handle note conflicts before enabling "
-"syncing automatically. You can learn about handling note conflicts in the "
-"<link xref=\"sync-setup#conflict\"/> page."
+"Tomboy can automatically synchronize your notes for you in the background.It "
+"is recommended that you configure how you handle note conflicts before "
+"enabling syncing automatically. You can learn about handling note conflicts "
+"in the <link xref=\"sync-setup#conflict\"/> page."
 msgstr ""
 "Istnieje możliwość automatycznej synchronizacji notatki w tle. Przed "
 "włączeniem tej opcji zaleca się skonfigurować zarządzanie konfliktów "
@@ -388,8 +394,8 @@ msgstr ""
 #: C/sync.page:66(p)
 msgid ""
 "Tomboy's default option is to autosync every 10 minutes. To change how often "
-"Tomboy should sync enter the number of minutes in the dialog or use your "
-"mouse to move the time up or down."
+"Tomboy should synchronize enter the number of minutes in the dialog or use "
+"your mouse to move the time up or down."
 msgstr ""
 "Program domyślnie automatycznie synchronizuje notatki co 10 minut. Aby "
 "zmienić częstość synchronizacji, należy wprowadzić numer w polu lub zmienić "
@@ -715,8 +721,8 @@ msgstr ""
 
 #: C/introduction.page:36(p)
 msgid ""
-"You can also sync your notes across multiple computers, making it easy to "
-"take your notes with you wherever you are."
+"You can also synchronize your notes across multiple computers, making it "
+"easy to take your notes with you wherever you are."
 msgstr ""
 "Program pozwala także na synchronizację notatek pomiędzy komputerami, co "
 "umożliwia łatwe tworzenie notatek i szybki do nich dostęp bez względu na "
@@ -1402,7 +1408,8 @@ msgstr ""
 #: C/index.page:0(None)
 msgid "translator-credits"
 msgstr ""
-"Aviary.pl <gnomepl at aviary.pl>, 2008, 2009, 2011, 2012, 2013\n"
 "Joanna Mazgaj <jmazgaj at aviary.pl>, 2008\n"
 "Aleksander Łukasiewicz <aleksander at lukasiewicz.org>, 2009\n"
-"Asia Słowik <asiaslowik at gmail.com>, 2011"
+"Asia Słowik <asiaslowik at gmail.com>, 2011\n"
+"Piotr Drąg <piotrdrag at gmail.com>, 2011-2013\n"
+"Aviary.pl <gnomepl at aviary.pl>, 2008-2013"
diff --git a/help/pl/sync.page b/help/pl/sync.page
index 7c6ce2f..314a145 100644
--- a/help/pl/sync.page
+++ b/help/pl/sync.page
@@ -38,8 +38,8 @@
  
  	<title>Automatyczna synchronizacja notatek</title>
  	
- 	<p>Istnieje możliwość automatycznej synchronizacji notatki w tle. Przed włączeniem tej opcji zaleca się skonfigurować zarządzanie konfliktów notatek. Więcej na temat zarządzania konfliktami notatek: strona pomocy <link xref="sync-setup#conflict"/>.</p>
- 	
+	<p>Istnieje możliwość automatycznej synchronizacji notatki w tle. Przed włączeniem tej opcji zaleca się skonfigurować zarządzanie konfliktów notatek. Więcej na temat zarządzania konfliktami notatek: strona pomocy <link xref="sync-setup#conflict"/>.</p>
+
  	<p>Użytkownik może włączyć opcję synchronizacji, otwierając menu <gui>Preferencje</gui>. Aby przejść do preferencji programu, należy kliknąć prawym przyciskiem myszy na ikonę programu w panelu GNOME, na pasku zadań systemu Microsoft Windows lub w docku systemu Mac OS X, a następnie wybrać <gui>Preferencje</gui> oraz kartę <gui>Synchronizacja</gui>. <gui>Preferencje</gui> można także otworzyć z okna <gui>"Przeszukiwanie notatek"</gui>, wybierając opcję <guiseq><gui>Edycja</gui><gui>Pref [...]
 	
 	<p>Aby włączyć automatyczne synchronizowanie, należy zaznaczyć na karcie synchronizacji pole <gui>Automatyczne synchronizowanie w tle co x minut</gui>.</p>
diff --git a/help/pt_BR/addins-desktop-bugzilla.page b/help/pt_BR/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..145415c
--- /dev/null
+++ b/help/pt_BR/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Link do Bugzilla</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/pt_BR/addins-desktop-printing.page b/help/pt_BR/addins-desktop-printing.page
new file mode 100644
index 0000000..930d05b
--- /dev/null
+++ b/help/pt_BR/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/pt_BR/addins-desktop.page b/help/pt_BR/addins-desktop.page
deleted file mode 100644
index 4e40519..0000000
--- a/help/pt_BR/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="pt_BR">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Link do Bugzilla</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Integração de e-mail do Evolution</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/pt_BR/addins-formatting-fixed-width.page b/help/pt_BR/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..fa95f51
--- /dev/null
+++ b/help/pt_BR/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/pt_BR/addins-formatting-underline.page b/help/pt_BR/addins-formatting-underline.page
new file mode 100644
index 0000000..6957eaa
--- /dev/null
+++ b/help/pt_BR/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/pt_BR/addins-formatting.page b/help/pt_BR/addins-formatting.page
deleted file mode 100644
index 41510d7..0000000
--- a/help/pt_BR/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="pt_BR">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/pt_BR/addins-preferences.page b/help/pt_BR/addins-preferences.page
new file mode 100644
index 0000000..c78b723
--- /dev/null
+++ b/help/pt_BR/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/pt_BR/addins-sync-local.page b/help/pt_BR/addins-sync-local.page
new file mode 100644
index 0000000..732b471
--- /dev/null
+++ b/help/pt_BR/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/pt_BR/addins-sync-ssh.page b/help/pt_BR/addins-sync-ssh.page
new file mode 100644
index 0000000..79b5edb
--- /dev/null
+++ b/help/pt_BR/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/pt_BR/addins-sync-webdav.page b/help/pt_BR/addins-sync-webdav.page
new file mode 100644
index 0000000..2bea16c
--- /dev/null
+++ b/help/pt_BR/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/pt_BR/addins-sync-webservice.page b/help/pt_BR/addins-sync-webservice.page
new file mode 100644
index 0000000..0557421
--- /dev/null
+++ b/help/pt_BR/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/pt_BR/addins-sync.page b/help/pt_BR/addins-sync.page
deleted file mode 100644
index 3a02dcd..0000000
--- a/help/pt_BR/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="pt_BR">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/pt_BR/addins-tools-backlinks.page b/help/pt_BR/addins-tools-backlinks.page
new file mode 100644
index 0000000..0ca6f64
--- /dev/null
+++ b/help/pt_BR/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/pt_BR/addins-tools-html-export.page b/help/pt_BR/addins-tools-html-export.page
new file mode 100644
index 0000000..9bf6d92
--- /dev/null
+++ b/help/pt_BR/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Exportar para HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/pt_BR/addins-tools-note-of-day.page b/help/pt_BR/addins-tools-note-of-day.page
new file mode 100644
index 0000000..a14c2ce
--- /dev/null
+++ b/help/pt_BR/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Nota do Dia</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/pt_BR/addins-tools-timestamp.page b/help/pt_BR/addins-tools-timestamp.page
new file mode 100644
index 0000000..fafe4d1
--- /dev/null
+++ b/help/pt_BR/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/pt_BR/addins-tools.page b/help/pt_BR/addins-tools.page
deleted file mode 100644
index 262dc9a..0000000
--- a/help/pt_BR/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="pt_BR">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Exportar para HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Nota do Dia</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/pt_BR/addins.page b/help/pt_BR/addins.page
index 255c9a0..3d950e7 100644
--- a/help/pt_BR/addins.page
+++ b/help/pt_BR/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/pt_BR/delete-notes.page b/help/pt_BR/delete-notes.page
index 7d334f6..3749bcf 100644
--- a/help/pt_BR/delete-notes.page
+++ b/help/pt_BR/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Projeto de Documentação do GNOME</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/pt_BR/introduction.page b/help/pt_BR/introduction.page
index 915046a..100227d 100644
--- a/help/pt_BR/introduction.page
+++ b/help/pt_BR/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/pt_BR/pin-notes.page b/help/pt_BR/pin-notes.page
new file mode 100644
index 0000000..dafdb46
--- /dev/null
+++ b/help/pt_BR/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="pt_BR">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/pt_BR/sync-setup.page b/help/pt_BR/sync-setup.page
index 113d3fe..081319c 100644
--- a/help/pt_BR/sync-setup.page
+++ b/help/pt_BR/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -118,7 +118,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/pt_BR/sync.page b/help/pt_BR/sync.page
index 07fab52..11c4098 100644
--- a/help/pt_BR/sync.page
+++ b/help/pt_BR/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/pt_BR/whatsnew.page b/help/pt_BR/whatsnew.page
index e162ec7..3fcadf3 100644
--- a/help/pt_BR/whatsnew.page
+++ b/help/pt_BR/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/ru/addins-desktop-bugzilla.page b/help/ru/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..bb06eb6
--- /dev/null
+++ b/help/ru/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/ru/addins-desktop-printing.page b/help/ru/addins-desktop-printing.page
new file mode 100644
index 0000000..3902a1b
--- /dev/null
+++ b/help/ru/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/ru/addins-desktop.page b/help/ru/addins-desktop.page
deleted file mode 100644
index 9cd387f..0000000
--- a/help/ru/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="ru">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/ru/addins-formatting-fixed-width.page b/help/ru/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..68cfcb0
--- /dev/null
+++ b/help/ru/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Фиксированная ширина</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/ru/addins-formatting-underline.page b/help/ru/addins-formatting-underline.page
new file mode 100644
index 0000000..24ee7ba
--- /dev/null
+++ b/help/ru/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/ru/addins-formatting.page b/help/ru/addins-formatting.page
deleted file mode 100644
index 5a0c0ee..0000000
--- a/help/ru/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="ru">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/ru/addins-preferences.page b/help/ru/addins-preferences.page
new file mode 100644
index 0000000..8860aa8
--- /dev/null
+++ b/help/ru/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/ru/addins-sync-local.page b/help/ru/addins-sync-local.page
new file mode 100644
index 0000000..3958f20
--- /dev/null
+++ b/help/ru/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/ru/addins-sync-ssh.page b/help/ru/addins-sync-ssh.page
new file mode 100644
index 0000000..7a85ca9
--- /dev/null
+++ b/help/ru/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/ru/addins-sync-webdav.page b/help/ru/addins-sync-webdav.page
new file mode 100644
index 0000000..ec62575
--- /dev/null
+++ b/help/ru/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/ru/addins-sync-webservice.page b/help/ru/addins-sync-webservice.page
new file mode 100644
index 0000000..ed00875
--- /dev/null
+++ b/help/ru/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/ru/addins-sync.page b/help/ru/addins-sync.page
deleted file mode 100644
index cb51ab4..0000000
--- a/help/ru/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="ru">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/ru/addins-tools-backlinks.page b/help/ru/addins-tools-backlinks.page
new file mode 100644
index 0000000..b31beb6
--- /dev/null
+++ b/help/ru/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Обратные ссылки</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/ru/addins-tools-html-export.page b/help/ru/addins-tools-html-export.page
new file mode 100644
index 0000000..34147ea
--- /dev/null
+++ b/help/ru/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Экспортировать в HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/ru/addins-tools-note-of-day.page b/help/ru/addins-tools-note-of-day.page
new file mode 100644
index 0000000..1843b20
--- /dev/null
+++ b/help/ru/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Заметка дня</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/ru/addins-tools-timestamp.page b/help/ru/addins-tools-timestamp.page
new file mode 100644
index 0000000..202b35f
--- /dev/null
+++ b/help/ru/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/ru/addins-tools.page b/help/ru/addins-tools.page
deleted file mode 100644
index 23dd798..0000000
--- a/help/ru/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="ru">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Обратные ссылки</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Экспортировать в HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Заметка дня</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/ru/addins.page b/help/ru/addins.page
index 8cb63a4..a231cf6 100644
--- a/help/ru/addins.page
+++ b/help/ru/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Параметры</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Синхронизация</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/ru/delete-notes.page b/help/ru/delete-notes.page
index 74a3832..37028de 100644
--- a/help/ru/delete-notes.page
+++ b/help/ru/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME Documentation Project</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/ru/introduction.page b/help/ru/introduction.page
index 1bf0f9d..5e6de83 100644
--- a/help/ru/introduction.page
+++ b/help/ru/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/ru/pin-notes.page b/help/ru/pin-notes.page
new file mode 100644
index 0000000..86f36bb
--- /dev/null
+++ b/help/ru/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="ru">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/ru/sync-setup.page b/help/ru/sync-setup.page
index 925fb79..43f71cc 100644
--- a/help/ru/sync-setup.page
+++ b/help/ru/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -118,7 +118,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/ru/sync.page b/help/ru/sync.page
index b81e13e..f2d8c44 100644
--- a/help/ru/sync.page
+++ b/help/ru/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/ru/whatsnew.page b/help/ru/whatsnew.page
index 3f6a626..44afe01 100644
--- a/help/ru/whatsnew.page
+++ b/help/ru/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/sl/addins-desktop-bugzilla.page b/help/sl/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..8d01bed
--- /dev/null
+++ b/help/sl/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Povezave Bugzilla</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/sl/addins-desktop-printing.page b/help/sl/addins-desktop-printing.page
new file mode 100644
index 0000000..bb869e6
--- /dev/null
+++ b/help/sl/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Podpora tiskanja</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/sl/addins-desktop.page b/help/sl/addins-desktop.page
deleted file mode 100644
index 1232c88..0000000
--- a/help/sl/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="sl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Vstavki za vključitev z drugimi programi in spletnimi stranmi.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Vstavki vključitve v namizje</title>
-
-	<p>Vstavki vključitve v namizje se sporazumevajo z drugimi programi ali spletnimi stranmi in Tomboyem.</p>
-
-<section id="bugzilla">
-  <title>Povezave Bugzilla</title>
-  <p>Vstavek povezav Bugzilla vam omogoča veliko URL-jev Bugzilla iz vašega brskalnika v Tomboy. Po vlečenju povezave v sporočilce Tomboy, bo Tomboy prikazal številko hrošča kot dejavno povezavo poleg ikone hrošča, ki vam kaže, da je to povezava Bugzilla. Klik na povezavo v Tomboyu bo odprl brskalnik, ki vam to prikazal to stran Bugzilla.</p>
-</section>
-
-<section id="evolution">
-  <title>Vključitev v Evolution Pošto</title>
-  <p>Vstavek vključitve v Evolution Pošto vam omogoča vlečenje elektronske pošte iz programa Evolution v vaše sporočilce Tomboy. Vaše sporočilce bo prikazalo ikono ovojnice in zadeva sporočilca bo prikazana kot povezava. Klik na to povezavo bo elektronsko sporočilo odprl s programom Evolution.</p>
-</section>
-
-<section id="printing">
-  <title>Podpora tiskanja</title>
-  <p>Ta vstavek je privzeto omogočen in vam omogoča tiskanje sporočilc. V primeru, da ta vstavek onemogočite, sporočilc ne boste mogli več tiskati.</p>
-</section>
-
-
- </page>
diff --git a/help/sl/addins-formatting-fixed-width.page b/help/sl/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..23e4cce
--- /dev/null
+++ b/help/sl/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/sl/addins-formatting-underline.page b/help/sl/addins-formatting-underline.page
new file mode 100644
index 0000000..1e5aef3
--- /dev/null
+++ b/help/sl/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/sl/addins-formatting.page b/help/sl/addins-formatting.page
deleted file mode 100644
index 2a26e17..0000000
--- a/help/sl/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="sl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Vstavki za dodajanje dodatnega oblikovanja sporočilc.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Vstavki oblikovanja</title>
-
-<section id="fixedwidth">
-  <title>Vstavek stalne širine</title>
-  <p>Vstavek stalna širina spremeni vaše besedilo v sporočilcih Tomboy v besedilo stalne širine. Ta vstavek je privzeto onemogočen. Za omogočitev pritisnite gumb <gui>Omogoči</gui>.</p>
-</section>
-
-<section id="underline">
-  <title>Vstavek podčrtanja</title>
-  <p>Vstavek podčrtanja vam omogoča podčrtovanje določenega besedila v vašem sporočilcu z uporabo ikone <gui>Besedilo</gui> v orodni vrstici sporočilca. Za omogočitev pritisnite gumb <gui>Omogoči</gui>. Poudarite besedilo, ki ga želite podčrtati, pritisnite ikono <gui>Besedilo</gui> v orodni vrstici sporočilca in izberite <gui>Podčrtaj</gui> ali pritisnite <keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/sl/addins-preferences.page b/help/sl/addins-preferences.page
new file mode 100644
index 0000000..d3046b9
--- /dev/null
+++ b/help/sl/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/sl/addins-sync-local.page b/help/sl/addins-sync-local.page
new file mode 100644
index 0000000..80d7174
--- /dev/null
+++ b/help/sl/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Storitev krajevne mape usklajevanja</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/sl/addins-sync-ssh.page b/help/sl/addins-sync-ssh.page
new file mode 100644
index 0000000..9998cc8
--- /dev/null
+++ b/help/sl/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Storitev usklajevanja SSH</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/sl/addins-sync-webdav.page b/help/sl/addins-sync-webdav.page
new file mode 100644
index 0000000..76c69b5
--- /dev/null
+++ b/help/sl/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Storitev usklajevanja WebDac</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/sl/addins-sync-webservice.page b/help/sl/addins-sync-webservice.page
new file mode 100644
index 0000000..7b45edf
--- /dev/null
+++ b/help/sl/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Storitev spletnega usklajevanja</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/sl/addins-sync.page b/help/sl/addins-sync.page
deleted file mode 100644
index 0f2ec77..0000000
--- a/help/sl/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="sl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Omogočite dodatne načine za usklajevanje svojih sporočilc z drugimi napravami.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Vstavki usklajevanja</title>
-
-	<p>Vstavek usklajevanja vam omogoča izbiro različnih načinov in mest za usklajevanje vaših sporočilc Tomboy. Za več podrobnosti o nastavljanju usklajevanje, obiščite stran pomoči <link xref="sync-notes"/>.</p>
-
-
-<section id="local">
-  <title>Storitev krajevne mape usklajevanja</title>
-  <p>Storitev krajevne mape usklajevanja je privzeto omogočena in Tomboyu omogoča usklajevanje njegovih sporočilc v drugo mapo na vašem računalniku. To pride prav pri ustvarjanju varnostnih kopij vaših sporočilc.</p>
-</section>
-
-<section id="ssh">
-  <title>Storitev usklajevanja SSH</title>
-  <p>Storitev usklajevanja SSH vam omogoča usklajevanje vaših sporočilc z drugim računalnikom preko protokola SSH. Vstavek je privzeto onemogočen. Za delovanje tega vstavka boste morda morali namestiti paket <em>sshfs</em> za svojo Linux distribucijo. To je izven obsega tega dokumenta pomoči.</p>
-</section>
-
-<section id="webdav">
-  <title>Storitev usklajevanja WebDac</title>
-  <p>Vstavek storitve usklajevanja WebDav je privzeto omogočen in vam omogoča usklajevanje svojih sporočilc z oddaljenim strežnikom WebDav. Morda boste morali namestiti paket <em>datotečnega sistema wdfs FUSE</em> za svojo Linux distribucijo. To je izven obsega tega dokumenta pomoči.</p>
-</section>
-
-<section id="webservice">
-  <title>Storitev spletnega usklajevanja</title>
-  <p>Vstavek storitve spletnega usklajevanja vam omogoča usklajevanje svojih sporočilc z oddaljenim spletnim strežnikom ali storitvijo kot je Tomboy Online. V času pisanja storitev Tomboy Online še ni delovala.</p>
-</section>
-
- </page>
diff --git a/help/sl/addins-tools-backlinks.page b/help/sl/addins-tools-backlinks.page
new file mode 100644
index 0000000..0ae44a5
--- /dev/null
+++ b/help/sl/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Povratne povezave</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/sl/addins-tools-html-export.page b/help/sl/addins-tools-html-export.page
new file mode 100644
index 0000000..fd6f738
--- /dev/null
+++ b/help/sl/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Izvozi v HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/sl/addins-tools-note-of-day.page b/help/sl/addins-tools-note-of-day.page
new file mode 100644
index 0000000..ec95ee8
--- /dev/null
+++ b/help/sl/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Sporočilce dneva</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/sl/addins-tools-timestamp.page b/help/sl/addins-tools-timestamp.page
new file mode 100644
index 0000000..f00ec79
--- /dev/null
+++ b/help/sl/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Vstavi časovni žig</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/sl/addins-tools.page b/help/sl/addins-tools.page
deleted file mode 100644
index 2ec06c5..0000000
--- a/help/sl/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="sl">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Omogoči dodatne zmožnosti sporočilc.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Vstavki orodij Tomboy</title>
-
-	<p>Vstavki orodij dodajo dodatne zmožnosti vašim sporočilcem Tomboy.</p>
-
-  <section id="backlinks">
-    <title>Povratne povezave</title>
-	<p>Vstavek <gui>Povratne povezave</gui> je privzeto omogočen in vam omogoča ogled sporočilc, ki se povezujejo na trenutno videno sporočilce.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Izvozi v HTML</title>
-  <p>Vstavek <gui>Izvozi v HTML</gui> je privzeto omogočen in bo posamezno sporočilce izvozil v HTML.</p>
-	<p>Za izvoz sporočilca v HTML pritisnite ikono <gui>Orodja</gui> v orodni vrstici sporočilca in izberite <gui>Izvozi v HTML</gui>.  Takoj se bo pojavilo pogovorno okno za shranjevanje sporočilca. Izberite mapo v katero želite shraniti sporočilce in spremenite ime nove html datoteke sporočilca, če želite, da je drugačna kot ime sporočilca. Sporočilce bo nato shranjeno kot datoteka HTML in samodejno prikazano v vašem brskalniku.</p>
-</section>
-
-<section id="timestamp">
-  <title>Vstavi časovni žig</title>
-  <p>Vstavek  <gui>Vstavi časovni žig</gui> je privzeto onemogočen. Za omogočitev izberite vstavek <gui>Vstavi časovni žig</gui> in nato pritisnite <gui>Omogoči</gui> v možnostih Tomboy.</p>
-	<p>Za dodajanje časovnega žiga svojim sporočilcem pritisnite ikono <gui>Orodja</gui> v orodni vrstici sporočilc in izberite <gui>Vstavi časovni žig</gui> ali pritisnite <key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Sporočilce dneva</title>
-  <p>Vstavek <gui>Sporočilce dneva</gui> je privzeto onemogočen. Za omogočitev izberite vstavek <gui>Sporočilce dneva</gui> in nato pritisnite <gui>Omogoči</gui> v možnostih Tomboy.</p>
-	<p>Vstavek <gui>Sporočilce dneva</gui> bo dnevno ustvaril sporočilce z naslovom oblike <em>Danes: Četrtek, 21. januar 2010</em>. Sporočilce bo samodejno dodalo vrstice za <em>Naloge</em> in <em>Sestanke</em>.</p>
-</section>
-
-<section id="watcher">
-  <title>Opazovalnik mape sporočilc</title>
-  <p>Opazovalnik mape sporočilc nadzira mapo v kateri so shranjena vaša sporočilca Tomboy. V primeru, da vstavek zazna spremembe vaših sporočilc, jih bo uveljavil in prikazal v vaših sporočilcih. Ta vstavek se običajno uporablja s storitvami usklajevanja tretjih oseb kot so Dropbox. </p>
-</section>
-
- </page>
diff --git a/help/sl/addins.page b/help/sl/addins.page
index 03dc2f0..b1bf9bc 100644
--- a/help/sl/addins.page
+++ b/help/sl/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Dodajte dodatne zmožnosti v Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Vstavki Tomboy</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Vstavki Tomboy</title>
-    </info>
-    <title>Upravljanje vstavkov za Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/sl/delete-notes.page b/help/sl/delete-notes.page
index e55c775..66842c1 100644
--- a/help/sl/delete-notes.page
+++ b/help/sl/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Izbris sporočilc v Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME Documentation Project</name>
       <years>2010</years>
@@ -19,13 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Izbris sporočilca</title>    
-  
-  <p>Besedilo lahko izbrišete s pritiskom na ikono <gui>Izbriši</gui> v orodji vrstici sporočilca, ki ga želite izbrisati.</p>
-  
-<note style="warning">
-	<p>Izbris sporočilca je trajen. Po izbrisu sporočilca ni mogoče obnoviti.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Izbris sporočilca</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/sl/introduction.page b/help/sl/introduction.page
index 0816a75..677cadd 100644
--- a/help/sl/introduction.page
+++ b/help/sl/introduction.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> je namizni program za pisanje sporočilc za GNOME, Microsoft Windows in Mac OS X. Je preprost ter enostaven za uporabo in vam omogoča organizacijo idej in podatkov s katerimi se ubadate vsak dan.</p>
   <p><app>Tomboy</app> vsebuje zmožnosti, ki vam omogočajo boljšo organizacijo in pomnjenje vaših podatkov. Omogoča vam povezavo vaših sporočilc skupaj, kar vam olajša iskanje in razvrščanje vaših podatkov. Več sporočilc lahko organizirate skupaj v beležko, kar vam olajša združevanje sporočilc skupaj.</p>
-  <p>Svoja sporočilca lahko uskladite preko več računalnikov, kar vam olajša pisanje sporočilc, kjerkoli že ste.</p>
+  <p>
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
+  </p>
 
   <figure>
     <title>Okno <gui>Sporočilca Tomboy</gui></title>
diff --git a/help/sl/pin-notes.page b/help/sl/pin-notes.page
new file mode 100644
index 0000000..b878797
--- /dev/null
+++ b/help/sl/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="sl">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/sl/sync-setup.page b/help/sl/sync-setup.page
index f0c40d0..9eaf876 100644
--- a/help/sl/sync-setup.page
+++ b/help/sl/sync-setup.page
@@ -28,7 +28,14 @@
 	access to your notes.
 	</p>
 	
-	<p>Usklajevanje lahko omogočite z odpiranjem <gui>Možnosti Tomboy</gui>, kar storite z desnim klikom na ikono Tomboy v vašem pultu, opravilni vrstici ali sidrišču in izbiro <gui>Možnosti</gui> in nato izbiro zavihka <gui>Usklajevanje</gui>. <gui>Možnosti Tomboy</gui> lahko odprete tudi iz pogovornega okna <gui>Iskanje vseh sporočilc</gui>. V meniju izberite <guiseq><gui>Uredi</gui><gui>Možnosti</gui></guiseq>.</p>
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </section>
 
@@ -46,7 +53,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -86,7 +93,17 @@
 	computer to store the synchronized notes that are to be synced between 
 	multiple computers.</p>
 
-	<p>Odprite <app>Gesla in šifrirni ključi</app> z izbiro <guiseq><gui>Programi</gui><gui>Pripomočki</gui><gui>Gesla in šifrirni ključi</gui></guiseq>. Kliknite na svoj ključ in v meniju izberite  <guiseq><gui>Oddaljeno</gui><gui>Nastavi ključ za varno lupino ...</gui></guiseq> in v <gui>Ime računalnika</gui> vnesite ime domene ali IP naslov računalnika, s katerim želite usklajevati. Vnesite uporabniško ime oddaljenega računalnika v <gui>Ime računalnika:</gui> in kliknite <gui>Nastavitev< [...]
+	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
+	<guiseq><gui>Applications</gui><gui>Accessories</gui>
+	<gui>Passwords and Encryption Keys</gui></guiseq>.  
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
+	</p>
 	
 	<p>V spustnem seznamu <gui>Storitev</gui> izberite <gui>SSH</gui>. Zapolnite podrobnosti povezave za svoj strežnik in nato izberite gumb <gui>Shrani</gui>. <gui>Pot mape</gui> je izbirna, vendar mora kazati na prazno mapo. Sedaj ste pripravljeni na usklajevanje svojih sporočilc.</p>
 
diff --git a/help/sl/sync.page b/help/sl/sync.page
index d4aceec..ee49a25 100644
--- a/help/sl/sync.page
+++ b/help/sl/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Ročno usklajevanje sporočilc</title>
 	
-	<p>Svoja sporočilca lahko usklajujete na enega od treh načinov:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>Iz kateregakoli sporočilca lahko kliknete ikono <gui>Orodja</gui> in izberete <gui>Uskladi sporočilca</gui>.</p></item>
@@ -38,13 +38,26 @@
  
  	<title>Samodejno usklajevanje vaših sporočilc</title>
  	
- 	<p>Tomboy lahko v ozadju samodejno uskladi vaša sporočilca. Priporočamo vam, da pred omogočitvijo samodejnega usklajevanja nastavite upravljanje sporov sporočilc. O upravljanju sporov sporočilc si lahko več preberete na strani <link xref="sync-setup#conflict"/>.</p>
- 	
- 	<p>Usklajevanje lahko omogočite z odpiranjem <gui>Možnosti Tomboy</gui>, kar storite z desnim klikom na ikono Tomboy v vašem pultu, opravilni vrstici ali sidrišču in izbiro <gui>Možnosti</gui> in nato izbiro zavihka <gui>Usklajevanje</gui>. <gui>Možnosti Tomboy</gui> lahko odprete tudi iz pogovornega okna <gui>Iskanje vseh sporočilc</gui>. V meniju izberite <guiseq><gui>Uredi</gui><gui>Možnosti</gui></guiseq>.</p>
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 	
 	<p>Za omogočitev samodejnega usklajevanja izberite polje <gui>Samodejno uskladi v ozadju vsakih x minut</gui> na dnu zavihka usklajevanje.</p>
 	
-	<p>Privzeta možnost Tomboy je samodejno shranjevanje vsakih 10 minut. Za spremembo kako pogosto naj Tomboy uskladi sporočilca vnesite število minut v pogovorno okno ali uporabite svojo miško za premikanje časa navzgor ali navzdol. </p>
+	<p>Tomboy's default option is to autosync every 10 minutes.  To change
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>Za onemogočenje samodejnega usklajevanja odstranite izbiro polje <gui>Samodejno uskladi v ozadju vsakih x minut</gui>.</p>
 	
diff --git a/help/sl/whatsnew.page b/help/sl/whatsnew.page
index 79ffe66..b79f231 100644
--- a/help/sl/whatsnew.page
+++ b/help/sl/whatsnew.page
@@ -22,7 +22,10 @@
 
   <p><app>Tomboy</app> vsebuje številne nove izboljšave. Tomboy bi se sedaj moral zagnati opazno hitreje zaradi izboljšav v zagonu Tomboya.</p>
   <p>Kopiranje in lepljenje iz Tomboya v druge programe je bilo izboljšano. Sedaj ima podporo za oblikovanje pri lepljenju v programe, ki razumejo HTML kot so Evolution, OpenOffice.org in drugi programi.</p>
-  <p><app>Tomboy</app> lahko sedaj v primeru omogočenega usklajevanja samodejno uskladi vaša sporočilca.</p>
+  <p>
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
+  </p>
 
   <p>Dodana je bila podpora za skočne sezname Microsoft Windows 7, ki vam pomaga pri dostopu do svojih sporočil in iskanju ali ustvarjanju novega sporočilca hitreje iz opravilne vrstice Windows.</p>
 
diff --git a/help/sv/addins-desktop-bugzilla.page b/help/sv/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..b0c5d1d
--- /dev/null
+++ b/help/sv/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/sv/addins-desktop-printing.page b/help/sv/addins-desktop-printing.page
new file mode 100644
index 0000000..8ac72cc
--- /dev/null
+++ b/help/sv/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/sv/addins-desktop.page b/help/sv/addins-desktop.page
deleted file mode 100644
index 9166a90..0000000
--- a/help/sv/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="sv">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/sv/addins-formatting-fixed-width.page b/help/sv/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..ba8287d
--- /dev/null
+++ b/help/sv/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fast bredd</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/sv/addins-formatting-underline.page b/help/sv/addins-formatting-underline.page
new file mode 100644
index 0000000..0252350
--- /dev/null
+++ b/help/sv/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/sv/addins-formatting.page b/help/sv/addins-formatting.page
deleted file mode 100644
index 11ae88c..0000000
--- a/help/sv/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="sv">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/sv/addins-preferences.page b/help/sv/addins-preferences.page
new file mode 100644
index 0000000..4cdda54
--- /dev/null
+++ b/help/sv/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/sv/addins-sync-local.page b/help/sv/addins-sync-local.page
new file mode 100644
index 0000000..78160fe
--- /dev/null
+++ b/help/sv/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/sv/addins-sync-ssh.page b/help/sv/addins-sync-ssh.page
new file mode 100644
index 0000000..e6d9b8a
--- /dev/null
+++ b/help/sv/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/sv/addins-sync-webdav.page b/help/sv/addins-sync-webdav.page
new file mode 100644
index 0000000..57974f4
--- /dev/null
+++ b/help/sv/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/sv/addins-sync-webservice.page b/help/sv/addins-sync-webservice.page
new file mode 100644
index 0000000..5d33520
--- /dev/null
+++ b/help/sv/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/sv/addins-sync.page b/help/sv/addins-sync.page
deleted file mode 100644
index 3264027..0000000
--- a/help/sv/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="sv">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/sv/addins-tools-backlinks.page b/help/sv/addins-tools-backlinks.page
new file mode 100644
index 0000000..76ae2af
--- /dev/null
+++ b/help/sv/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bakåtlänkar</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/sv/addins-tools-html-export.page b/help/sv/addins-tools-html-export.page
new file mode 100644
index 0000000..f981a15
--- /dev/null
+++ b/help/sv/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Exportera till HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/sv/addins-tools-note-of-day.page b/help/sv/addins-tools-note-of-day.page
new file mode 100644
index 0000000..77d1836
--- /dev/null
+++ b/help/sv/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Dagens anteckning</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/sv/addins-tools-timestamp.page b/help/sv/addins-tools-timestamp.page
new file mode 100644
index 0000000..9ac9da9
--- /dev/null
+++ b/help/sv/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/sv/addins-tools.page b/help/sv/addins-tools.page
deleted file mode 100644
index 83ffe80..0000000
--- a/help/sv/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="sv">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Bakåtlänkar</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Exportera till HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Dagens anteckning</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/sv/addins.page b/help/sv/addins.page
index 07de069..1db4466 100644
--- a/help/sv/addins.page
+++ b/help/sv/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Inställningar</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synkronisering</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/sv/delete-notes.page b/help/sv/delete-notes.page
index 0fc5b68..16225a1 100644
--- a/help/sv/delete-notes.page
+++ b/help/sv/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Dokumentationsprojekt för GNOME</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/sv/introduction.page b/help/sv/introduction.page
index bd52fee..6dc15c7 100644
--- a/help/sv/introduction.page
+++ b/help/sv/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/sv/pin-notes.page b/help/sv/pin-notes.page
new file mode 100644
index 0000000..9304973
--- /dev/null
+++ b/help/sv/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="sv">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/sv/sync-setup.page b/help/sv/sync-setup.page
index f80f378..f9ae652 100644
--- a/help/sv/sync-setup.page
+++ b/help/sv/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -118,7 +118,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/sv/sync.page b/help/sv/sync.page
index 6c9b1f1..bba702b 100644
--- a/help/sv/sync.page
+++ b/help/sv/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/sv/whatsnew.page b/help/sv/whatsnew.page
index fe4907c..0626c35 100644
--- a/help/sv/whatsnew.page
+++ b/help/sv/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/uk/addins-desktop-bugzilla.page b/help/uk/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..78ed005
--- /dev/null
+++ b/help/uk/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/uk/addins-desktop-printing.page b/help/uk/addins-desktop-printing.page
new file mode 100644
index 0000000..930113b
--- /dev/null
+++ b/help/uk/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/uk/addins-desktop.page b/help/uk/addins-desktop.page
deleted file mode 100644
index 93952db..0000000
--- a/help/uk/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="uk">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/uk/addins-formatting-fixed-width.page b/help/uk/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..6217eb0
--- /dev/null
+++ b/help/uk/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Фіксована ширина</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/uk/addins-formatting-underline.page b/help/uk/addins-formatting-underline.page
new file mode 100644
index 0000000..b49d2c3
--- /dev/null
+++ b/help/uk/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/uk/addins-formatting.page b/help/uk/addins-formatting.page
deleted file mode 100644
index 97888df..0000000
--- a/help/uk/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="uk">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/uk/addins-preferences.page b/help/uk/addins-preferences.page
new file mode 100644
index 0000000..e253670
--- /dev/null
+++ b/help/uk/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/uk/addins-sync-local.page b/help/uk/addins-sync-local.page
new file mode 100644
index 0000000..f9e787d
--- /dev/null
+++ b/help/uk/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/uk/addins-sync-ssh.page b/help/uk/addins-sync-ssh.page
new file mode 100644
index 0000000..fdfc6a7
--- /dev/null
+++ b/help/uk/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/uk/addins-sync-webdav.page b/help/uk/addins-sync-webdav.page
new file mode 100644
index 0000000..60bd9f3
--- /dev/null
+++ b/help/uk/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/uk/addins-sync-webservice.page b/help/uk/addins-sync-webservice.page
new file mode 100644
index 0000000..0519346
--- /dev/null
+++ b/help/uk/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/uk/addins-sync.page b/help/uk/addins-sync.page
deleted file mode 100644
index 15b4b3f..0000000
--- a/help/uk/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="uk">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/uk/addins-tools-backlinks.page b/help/uk/addins-tools-backlinks.page
new file mode 100644
index 0000000..546f30f
--- /dev/null
+++ b/help/uk/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Зворотні посилання</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/uk/addins-tools-html-export.page b/help/uk/addins-tools-html-export.page
new file mode 100644
index 0000000..086ccf6
--- /dev/null
+++ b/help/uk/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Експортувати в HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/uk/addins-tools-note-of-day.page b/help/uk/addins-tools-note-of-day.page
new file mode 100644
index 0000000..7e41c69
--- /dev/null
+++ b/help/uk/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Примітка для</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/uk/addins-tools-timestamp.page b/help/uk/addins-tools-timestamp.page
new file mode 100644
index 0000000..ea5e59a
--- /dev/null
+++ b/help/uk/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/uk/addins-tools.page b/help/uk/addins-tools.page
deleted file mode 100644
index fdfc180..0000000
--- a/help/uk/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="uk">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Зворотні посилання</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Експортувати в HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Примітка для</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/uk/addins.page b/help/uk/addins.page
index a49a2f5..7f26ab0 100644
--- a/help/uk/addins.page
+++ b/help/uk/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Параметри</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/uk/delete-notes.page b/help/uk/delete-notes.page
index 0e0014e..51336c0 100644
--- a/help/uk/delete-notes.page
+++ b/help/uk/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Проект документування GNOME</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/uk/introduction.page b/help/uk/introduction.page
index b5be2f9..86b9829 100644
--- a/help/uk/introduction.page
+++ b/help/uk/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/uk/pin-notes.page b/help/uk/pin-notes.page
new file mode 100644
index 0000000..6a3ab00
--- /dev/null
+++ b/help/uk/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="uk">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/uk/sync-setup.page b/help/uk/sync-setup.page
index 7165b66..3a4625d 100644
--- a/help/uk/sync-setup.page
+++ b/help/uk/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -122,7 +122,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/uk/sync.page b/help/uk/sync.page
index 9b5f6ff..a3cfe7e 100644
--- a/help/uk/sync.page
+++ b/help/uk/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/uk/whatsnew.page b/help/uk/whatsnew.page
index a81855b..de5dfab 100644
--- a/help/uk/whatsnew.page
+++ b/help/uk/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/vi/addins-desktop-bugzilla.page b/help/vi/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..4bd5ef8
--- /dev/null
+++ b/help/vi/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla Links</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/vi/addins-desktop-printing.page b/help/vi/addins-desktop-printing.page
new file mode 100644
index 0000000..ed5a83a
--- /dev/null
+++ b/help/vi/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Printing Support</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/vi/addins-desktop.page b/help/vi/addins-desktop.page
deleted file mode 100644
index c7d8ba2..0000000
--- a/help/vi/addins-desktop.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="vi">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to integrate with other applications and websites.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Desktop Integration Addins</title>
-
-	<p>Desktop Integration addins interact with other applications
-	or websites and Tomboy.</p>
-
-<section id="bugzilla">
-  <title>Bugzilla Links</title>
-  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
-	browser into Tomboy.  After dragging a link into a Tomboy note, Tomboy
-	will display the bug number as an active link next to bug icon to show
-	you this is a Bugzilla link.  Clicking the link in the Tomboy note
-	will open a browser window taking you to that Bugzilla page.</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution Mail Integration</title>
-  <p>The Evolution Mail Integration plugin allows you to drag an email from Evolution
-	into a Tomboy note.  Your note will display an envelope icon and the 
-	subject of the note will be displayed as a link.  Clicking this link
-	will open the email using Evolution.  </p>
-</section>
-
-<section id="printing">
-  <title>Printing Support</title>
-  <p>This addin is enabled by default and allows you print notes out.
-	If you disable this addin you will no longer be able to print notes.</p>
-</section>
-
-
- </page>
diff --git a/help/vi/addins-formatting-fixed-width.page b/help/vi/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..90ab0eb
--- /dev/null
+++ b/help/vi/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Độ rộng cố định</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/vi/addins-formatting-underline.page b/help/vi/addins-formatting-underline.page
new file mode 100644
index 0000000..69b2467
--- /dev/null
+++ b/help/vi/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/vi/addins-formatting.page b/help/vi/addins-formatting.page
deleted file mode 100644
index f0ba41e..0000000
--- a/help/vi/addins-formatting.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="vi">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Plugins to add addition note formatting.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Formatting Addins</title>
-
-<section id="fixedwidth">
-  <title>Fixed Width Addin</title>
-  <p>The Fixed Width addin changes your text to be of a fixed width in the Tomboy note.
-	This addin is disabled by default.  To enable, press the <gui>Enable</gui> button.</p>
-</section>
-
-<section id="underline">
-  <title>Underline Addin</title>
-  <p>The Underline addin allows you to underline specific text in your note using
-	the <gui>Text</gui> icon in a note toolbar.  This addin is disabled by
-	 default.  To enable, press the <gui>Enable</gui> button.  Highlight
-	the text you would like to underline, press the <gui>Text</gui>
-	icon in the note toolbar, and choose <gui>Underline</gui> or press
-	<keyseq><key>CONTROL + U</key></keyseq>.</p>
-</section>
-
- </page>
diff --git a/help/vi/addins-preferences.page b/help/vi/addins-preferences.page
new file mode 100644
index 0000000..078f249
--- /dev/null
+++ b/help/vi/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/vi/addins-sync-local.page b/help/vi/addins-sync-local.page
new file mode 100644
index 0000000..a9be05f
--- /dev/null
+++ b/help/vi/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Local Directory Sync Service</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/vi/addins-sync-ssh.page b/help/vi/addins-sync-ssh.page
new file mode 100644
index 0000000..024ba2f
--- /dev/null
+++ b/help/vi/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH Sync Service</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/vi/addins-sync-webdav.page b/help/vi/addins-sync-webdav.page
new file mode 100644
index 0000000..0c1f920
--- /dev/null
+++ b/help/vi/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav Sync Service</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/vi/addins-sync-webservice.page b/help/vi/addins-sync-webservice.page
new file mode 100644
index 0000000..b8223b0
--- /dev/null
+++ b/help/vi/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web Sync Service</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/vi/addins-sync.page b/help/vi/addins-sync.page
deleted file mode 100644
index 9c975cb..0000000
--- a/help/vi/addins-sync.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="vi">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional ways to sync your notes with other devices.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Sync Addins</title>
-
-	<p>Sync Addins allow you to choose different methods and places
-	to sync your Tomboy notes.  For more information on configuring sync,
-	visit the <link xref="sync-notes"/> help page.</p>
-
-
-<section id="local">
-  <title>Local Directory Sync Service</title>
-  <p>The Local Directory Sync Service is enabled by default and allows
-	Tomboy to sync its notes to another directory on your computer.
-	This is helpful to create a backup of your notes.</p>
-</section>
-
-<section id="ssh">
-  <title>SSH Sync Service</title>
-  <p>The SSH Sync Service allows you to sync your notes with another computer
-	via the SSH protocol.  This plugin is disabled by default.  You may
-	need to install the <em>sshfs</em> package for your Linux distribution
-	to make this addin work, which is outside the scope of this help 
-	document.</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav Sync Service</title>
-  <p>The WebDav Sync Service addin is enabled by default and allows you to
-	sync your notes with a WebDav remote server.  You may need to have
-	the <em>wdfs FUSE file system</em> package installed for your Linux
-	distribution to make this addin work which is outside the scope of 
-	this help document.</p>
-</section>
-
-<section id="webservice">
-  <title>Web Sync Service</title>
-  <p>The Web Sync Service addin allows you to sync your notes to a remote 
-	web server or service, such as Tomboy Online.  At the time of writing, the Tomboy Online service has not launched.</p>
-</section>
-
- </page>
diff --git a/help/vi/addins-tools-backlinks.page b/help/vi/addins-tools-backlinks.page
new file mode 100644
index 0000000..e1d2b22
--- /dev/null
+++ b/help/vi/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Backlinks</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/vi/addins-tools-html-export.page b/help/vi/addins-tools-html-export.page
new file mode 100644
index 0000000..33f7e3b
--- /dev/null
+++ b/help/vi/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Xuất dạng HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/vi/addins-tools-note-of-day.page b/help/vi/addins-tools-note-of-day.page
new file mode 100644
index 0000000..3853a96
--- /dev/null
+++ b/help/vi/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Ghi chú hàng ngày</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/vi/addins-tools-timestamp.page b/help/vi/addins-tools-timestamp.page
new file mode 100644
index 0000000..c154314
--- /dev/null
+++ b/help/vi/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>Insert Timestamp</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/vi/addins-tools.page b/help/vi/addins-tools.page
deleted file mode 100644
index 9590ebd..0000000
--- a/help/vi/addins-tools.page
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="vi">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>Enable additional note functionality.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>Tomboy Tools Addins</title>
-
-	<p>Tools addins add additional functionality to your Tomboy notes.</p>
-
-  <section id="backlinks">
-    <title>Backlinks</title>
-	<p>The <gui>Backlinks</gui> addin is enabled by default and allows you
-	to see which notes link to the note you are currently viewing.</p> 
-  </section>
-
-<section id="html-export">
-  <title>Xuất dạng HTML</title>
-  <p>The <gui>Export to HTML</gui> addin is enabled by default and will export
-	an individual note to HTML.</p>
-	<p>To export a note to HTML, press the <gui>Tools</gui> icon in the note
-	toolbar and choose <gui>Export to HTML</gui>.  You will immediately be
-	presented with a dialog to save the note.  Choose the directory you 
-	wish to save the note in and change the name of note's new html file if 
-	you wish it to be different than the note name.  The note will then be
-	saved as an HTML file and automatically displayed in your browser.</p>
-</section>
-
-<section id="timestamp">
-  <title>Insert Timestamp</title>
-  <p>The <gui>Insert Timestamp</gui> addin is disabled by default.  To enable it,
-	choose the <gui>Insert Timestamp</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p>To add a timestamp to your notes, press the <gui>Tools</gui> icon in
-	the note toolbar and choose <gui>Insert Timestamp</gui> or press 
-	<key>Ctrl + D</key>.</p>
-</section>
-
-<section id="noteoftheday">
-  <title>Ghi chú hàng ngày</title>
-  <p>The <gui>Note of the Day</gui> addin is disabled by default.  To enable,
-	choose the <gui>Note of the Day</gui> addin and then press
-	<gui>Enable</gui> in the Tomboy Preferences.</p>
-	<p><gui>Note of the Day</gui> addin will create a new note daily with the 
-	title <em>Today: Thursday, January 21 2010</em> for example.  The note will
-	also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
-</section>
-
-<section id="watcher">
-  <title>Note Directory Watcher</title>
-  <p>The Note Directory Watcher addin monitors the directory your Tomboy notes
-	are saved in.  If the addin detects changes to your notes, it will apply
-	those changes and they will be displayed in your notes.  This addin is
-	typically used with 3rd party sync services such as Dropbox.  Setting
-	up 3rd party sync services is outside the scope of this help.</p>
-</section>
-
- </page>
diff --git a/help/vi/addins.page b/help/vi/addins.page
index 7f6bdc5..8f1cdef 100644
--- a/help/vi/addins.page
+++ b/help/vi/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>Add additional functionality to Tomboy.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Tomboy Addins</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Tùy thích</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">Tomboy Addins</title>
-    </info>
-    <title>Manage addins for Tomboy</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Đồng bộ</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/vi/delete-notes.page b/help/vi/delete-notes.page
index ac32ae6..689bf34 100644
--- a/help/vi/delete-notes.page
+++ b/help/vi/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>Delete a note in Tomboy.</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>Dự án Tài liệu GNOME</name>
       <years>2010</years>
@@ -19,15 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>Delete a note</title>    
-  
-  <p>You can delete a note by pressing the <gui>Delete</gui> icon in the 
-  toolbar of the note you wish to delete.</p>
-  
-<note style="warning">
-	<p>Deleting a note is permanent.  After deletion, the note is 
-	not recoverable.</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>Delete a note</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/vi/introduction.page b/help/vi/introduction.page
index b225de6..94a1b3c 100644
--- a/help/vi/introduction.page
+++ b/help/vi/introduction.page
@@ -33,8 +33,8 @@
     also organize multiple notes in a notebook to make grouping notes together easier.
   </p>
   <p>
-    You can also sync your notes across multiple computers, making it easy to take your notes with you 
-    wherever you are.
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
   </p>
 
   <figure>
diff --git a/help/vi/pin-notes.page b/help/vi/pin-notes.page
new file mode 100644
index 0000000..f2bb5fa
--- /dev/null
+++ b/help/vi/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="vi">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/vi/sync-setup.page b/help/vi/sync-setup.page
index b346a48..b2dad0d 100644
--- a/help/vi/sync-setup.page
+++ b/help/vi/sync-setup.page
@@ -28,8 +28,8 @@
 	access to your notes.
 	</p>
 	
-	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
-	using your mouse to right click on the Tomboy icon in your panel,
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
 	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
@@ -66,7 +66,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -118,7 +118,7 @@
 	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
 	<gui>Configure Key for Secure Shell</gui></guiseq>  
 	and enter the domain name or IP address of the computer you want to 
-	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
 	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
 	When prompted, enter the password and setting up your key will 
 	be completed.
diff --git a/help/vi/sync.page b/help/vi/sync.page
index 0790a99..2a9df71 100644
--- a/help/vi/sync.page
+++ b/help/vi/sync.page
@@ -24,7 +24,7 @@
 
 	<title>Manually Syncing Notes</title>
 	
-	<p>You can sync your notes one of three ways:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>From any note click the <gui>Tools</gui> icon
@@ -43,13 +43,13 @@
  
  	<title>Sync Your Notes Automatically</title>
  	
- 	<p>Tomboy can automatically sync your notes for you in the background.
- 	It is recommended that you configure how you handle note conflicts
- 	before enabling syncing automatically.  You can learn about handling
- 	note conflicts in the <link xref="sync-setup#conflict"/> 
- 	page.</p>
- 	
- 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
 	using your mouse to right click on the Tomboy icon in your panel,
 	taskbar or dock and choose <gui>Preferences</gui> and then select
 	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
@@ -62,8 +62,8 @@
 	Every x Minutes</gui> box at the bottom of the Synchronization tab.</p>
 	
 	<p>Tomboy's default option is to autosync every 10 minutes.  To change
-	how often Tomboy should sync enter the number of minutes in the dialog
-	or use your mouse to move the time up or down.</p>
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>To disable autosync, uncheck  the <gui>Automatically Sync in	
 	Background Every x Minutes</gui> box.</p>
diff --git a/help/vi/whatsnew.page b/help/vi/whatsnew.page
index 309ca5f..3162019 100644
--- a/help/vi/whatsnew.page
+++ b/help/vi/whatsnew.page
@@ -32,8 +32,8 @@
 	and other applications.
   </p>
   <p>
-    <app>Tomboy</app> can now synchronize your notes automatically for you when you
-	when you have sync enabled.
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
   </p>
 
   <p>Support for Microsoft Windows 7 jump lists have been added helping you access your notes,
diff --git a/help/zh_CN/addins-desktop-bugzilla.page b/help/zh_CN/addins-desktop-bugzilla.page
new file mode 100644
index 0000000..3a189c3
--- /dev/null
+++ b/help/zh_CN/addins-desktop-bugzilla.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-bugzilla" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Plugin to automatically link to bugzilla pages.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Bugzilla  链接</title>
+
+  <p>The Bugzilla Links addin allows you to drag a Bugzilla URL from your
+  browser into Tomboy.</p>
+
+  <steps>
+    <item>
+        <p>Drag a bugzilla link containing the bug number from your web
+        browser into a <app>Tomboy</app> note.</p>
+    </item>
+  </steps>
+
+  <p><app>Tomboy</app> will display the bug number as an active link next to
+  bug icon to indicate that this is a <app>Bugzilla</app> link. You can click
+  on this link to open it in your web browser.</p>
+
+</page>
diff --git a/help/zh_CN/addins-desktop-printing.page b/help/zh_CN/addins-desktop-printing.page
new file mode 100644
index 0000000..2e83f0d
--- /dev/null
+++ b/help/zh_CN/addins-desktop-printing.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop-printing" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#desktop-integration"/>
+    <desc>Send notes to a printer.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>打印支持</title>
+
+    <note style="important">
+      <p>Printing with <app>Tomboy</app> requires that you have connected and configured your printer. If you have not done this, please consult the <link href="help:gnome-help/printing">printing help for GNOME</link>.</p>
+    </note>
+
+    <p>You can send <app>Tomboy</app> notes to your printer. This add-in is enabled by default.</p>
+
+    <steps>
+      <title>To print a note:</title>
+      <item>
+        <p>Open the desired note.</p>
+      </item>
+      <item>
+        <p>From the gears icon in the note toolbar, select
+        <gui style="menuitem">Print</gui>. Alternatively, you can also use the
+        keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.</p>
+      </item>
+    </steps>
+
+    <note style="warning">
+      <p>If you disable this addin you will not be able to print
+      <app>Tomboy</app> notes.</p>
+    </note>
+
+ </page>
diff --git a/help/zh_CN/addins-desktop.page b/help/zh_CN/addins-desktop.page
deleted file mode 100644
index 12e750a..0000000
--- a/help/zh_CN/addins-desktop.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-desktop" xml:lang="zh_CN">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>与其他应用程序或网站集成的插件。</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>桌面集成扩展</title>
-
-	<p>桌面集成扩展将其他应用程序或网站与阿帖便笺整合在一起。</p>
-
-<section id="bugzilla">
-  <title>Bugzilla  链接</title>
-  <p>Bugzilla  链接扩展允许您从浏览器中直接拖拽 Bugzilla 地址到便笺里。拖进来以后,bug 号被当作链接插入,旁边有一个小 bug 图标,点击这个链接将会在浏览器中打开这个地址。</p>
-</section>
-
-<section id="evolution">
-  <title>Evolution 邮件集成</title>
-  <p>Evolution 邮件集成插件,允许您从 Evolution 程序中拖动一个邮箱地址到便笺内,便笺内显示一个信封图标,邮件主题会显示为一个链接,点击链接将会在 Evolution 里打开相应的邮件信息。</p>
-</section>
-
-<section id="printing">
-  <title>打印支持</title>
-  <p>这个扩展默认已经启用,允许您打印输出便笺。如果禁用了此扩展,您将不能打印便笺。</p>
-</section>
-
-
- </page>
diff --git a/help/zh_CN/addins-formatting-fixed-width.page b/help/zh_CN/addins-formatting-fixed-width.page
new file mode 100644
index 0000000..d3fa1c7
--- /dev/null
+++ b/help/zh_CN/addins-formatting-fixed-width.page
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-fixed-width" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to set fixed width font in notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Fixed Width</title>
+
+  <p>The Fixed Width add-in sets the text in your <app>Tomboy</app> notes to
+  be Fixed Width. This addin is disabled by default.</p>
+
+  <steps>
+    <title>To use Fixed Width font in your <app>Tomboy</app> notes:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Fixed Width add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text in a <app>Tomboy</app> note.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in the note toolbar, select
+      <gui style="menuitem">Fixed Width</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly set any selected text to the Fixed Width font, press
+    <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/zh_CN/addins-formatting-underline.page b/help/zh_CN/addins-formatting-underline.page
new file mode 100644
index 0000000..63fb62f
--- /dev/null
+++ b/help/zh_CN/addins-formatting-underline.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting-underline" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#formatting"/>
+    <desc>Plugin to underline text in note.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Underline Add-in</title>
+
+  <p>The Underline add-in allows you to underline specific text in your note.
+  This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the Underline add-in:</title>
+    <item>
+      <p><link xref="addins">Enable</link> the Underline add-in.</p>
+    </item>
+    <item>
+      <p>Select the desired text.</p>
+    </item>
+    <item>
+      <p>From the <gui style="button">Text</gui> icon in a note, select <gui style="menuitem">Underline</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly underline any selected text, press <keyseq><key>Control</key><key>U</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/zh_CN/addins-formatting.page b/help/zh_CN/addins-formatting.page
deleted file mode 100644
index 6c751b0..0000000
--- a/help/zh_CN/addins-formatting.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-formatting" xml:lang="zh_CN">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>添加便笺文本格式的扩展插件。</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>文本格式扩展</title>
-
-<section id="fixedwidth">
-  <title>固定宽度扩展</title>
-  <p>固定宽度扩展允许您在便笺中,设定文本使用等宽字体。这个扩展默认是禁用的,要启用它,点 <gui>启用</gui> 按钮。</p>
-</section>
-
-<section id="underline">
-  <title>下划线扩展</title>
-  <p>下划线扩展允许您点工具栏上的 <gui>文本</gui> 图标,为文本添加下划线。这个扩展默认是禁用的,要启用它,点 <gui>启用</gui> 按钮。选中文本后点工具栏上的 <gui>文本</gui> 图标,然后选 <gui>下划线</gui> 或者按组合键 <keyseq><key>Ctrl + U</key></keyseq>。</p>
-</section>
-
- </page>
diff --git a/help/zh_CN/addins-preferences.page b/help/zh_CN/addins-preferences.page
new file mode 100644
index 0000000..9c86609
--- /dev/null
+++ b/help/zh_CN/addins-preferences.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="addins-preferences" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#preferences"/>
+    <link type="seealso" xref="pin-notes"/>
+    <desc>Enable advanced options plugins.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-14" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+ <title>Advanced Preferences</title>
+
+  <p>The <gui>Advanced Preferences</gui> add-in allows you to set the number of recent notes that are shown in the recent list. This addin must be <link xref="addins">enabled</link> for you to be able to use it.</p>
+
+ <section id="recent-notes">
+  <title>Control recent notes</title>
+    <p>You can set the minimum and maximum recent notes to be
+    displayed when you click on <app>Tomboy</app> message tray icon:</p>
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Set the minimum and maximum number of notes to be shown in the recent notes list.</p>
+      </item>
+    </steps>
+
+  </section>
+
+  <section id="startup-notes">
+    <title>Startup notes</title>
+
+    <steps>
+      <title>To enable startup notes:</title>
+      <item>
+        <p>Click on the <app>Tomboy</app> icon and select
+          <guiseq><gui style="menuitem">Preferences</gui>
+          <gui style="tab">Advanced</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select <gui style="checkbox">Enable startup notes</gui>,</p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/zh_CN/addins-sync-local.page b/help/zh_CN/addins-sync-local.page
new file mode 100644
index 0000000..7aea877
--- /dev/null
+++ b/help/zh_CN/addins-sync-local.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-local" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a local directory.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>本地文件夹同步服务</title>
+
+  <p>The Local Directory Sync Service add-in allows you to synchronize <app>Tomboy</app> notes to a folder on your computer. This is helpful to create a backup of your notes. This add-in is enabled by default.</p>
+
+</page>
diff --git a/help/zh_CN/addins-sync-ssh.page b/help/zh_CN/addins-sync-ssh.page
new file mode 100644
index 0000000..64dc434
--- /dev/null
+++ b/help/zh_CN/addins-sync-ssh.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-ssh" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to another computer through SSH.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>SSH 同步服务</title>
+
+  <p>The SSH Sync Service add-in allows you to synchronize your notes with
+  another computer using the SSH protocol. This add-in is disabled by
+  default.</p>
+
+  <p>To use this add-in, you may need to install the <em>sshfs</em> package
+  for your Linux distribution. User help to setup SSH support is outside the
+  scope of this document.</p>
+
+</page>
diff --git a/help/zh_CN/addins-sync-webdav.page b/help/zh_CN/addins-sync-webdav.page
new file mode 100644
index 0000000..f0f70de
--- /dev/null
+++ b/help/zh_CN/addins-sync-webdav.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webdav" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a WebDav server.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>WebDav 同步服务</title>
+
+  <p>The WebDav Sync Service add-in allows you to synchronize your notes with
+  WebDav remote server. This addin is enabled by default.</p>
+
+  <p>To use the WebDav Sync Service, you will need to have the
+  <em>wdfs FUSE file system</em> package installed for your Linux distribution.
+  The user help for which is outside the scope of this document.</p>
+
+ </page>
diff --git a/help/zh_CN/addins-sync-webservice.page b/help/zh_CN/addins-sync-webservice.page
new file mode 100644
index 0000000..0dd8c7b
--- /dev/null
+++ b/help/zh_CN/addins-sync-webservice.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-sync-webservice" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#sync"/>
+    <desc>Sync your notes to a service on the Internet.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2010-08-01" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Web 同步服务</title>
+
+  <p>The Web Sync Service add-in allows you to synchronize your notes to a
+  remote web server or other compatible web services.</p>
+
+ </page>
diff --git a/help/zh_CN/addins-sync.page b/help/zh_CN/addins-sync.page
deleted file mode 100644
index c3fa22d..0000000
--- a/help/zh_CN/addins-sync.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="sync-addins-sync" xml:lang="zh_CN">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>启用额外的方法来与其他设备同步便笺。</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>同步扩展</title>
-
-	<p>同步扩展允许您选择不同的方法和位置来同步阿帖便笺,更多配置同步的相关信息,请访问 <link xref="sync-notes"/> 帮助页面。</p>
-
-
-<section id="local">
-  <title>本地文件夹同步服务</title>
-  <p>本地文件夹同步服务默认默认已经启用,允许便笺同步到您计算机上的其他文件夹。这有助于创建一个便笺备份。</p>
-</section>
-
-<section id="ssh">
-  <title>SSH 同步服务</title>
-  <p>SSH 同步服务允许您通过 SSH 协议与其他计算机同步便笺,这个插件默认是禁用的,您可以通过安装 <em>sshfs</em> 来让它在您的 Linux 发行版工作,这超出了此帮助文档的讲述范围。</p>
-</section>
-
-<section id="webdav">
-  <title>WebDav 同步服务</title>
-  <p>WebDav 同步服务扩展默认已经启用,允许您与一个 WebDav 远程服务器同步便笺。您需要安装 <em>wdfs FUSE 文件系统</em> 以便它能在您的 Linux 发行版工作,这超出了此帮助文档的讲述范围。</p>
-</section>
-
-<section id="webservice">
-  <title>Web 同步服务</title>
-  <p>Web 同步服务扩展允许您与一个远程服务器或服务同步便笺,比如 Tomboy Online。在写这个文档时,Tomboy Online 服务还未运行。</p>
-</section>
-
- </page>
diff --git a/help/zh_CN/addins-tools-backlinks.page b/help/zh_CN/addins-tools-backlinks.page
new file mode 100644
index 0000000..549d6bb
--- /dev/null
+++ b/help/zh_CN/addins-tools-backlinks.page
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-backlinks" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>See notes that link to each other.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>反向链接</title>
+
+	<p>The <gui>Backlinks</gui> addin is enabled by default. This addin enables you to view which notes link to the note you are currently viewing. Such links to a note are called <em>Backlinks</em>.</p>
+
+  <steps>
+    <title>To create and view backlinks of a note:</title>
+    <item>
+      <p>Start typing the title of a note in any note.</p>
+    </item>
+  </steps>
+  <note style="important">
+    <p>For <app>Tomboy</app> to create automatic links to existing notes, the text you type must match the title of an existing note.</p>
+  </note>
+ </page>
diff --git a/help/zh_CN/addins-tools-html-export.page b/help/zh_CN/addins-tools-html-export.page
new file mode 100644
index 0000000..4412600
--- /dev/null
+++ b/help/zh_CN/addins-tools-html-export.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-html-export" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Export notes to HTML.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>导出为 HTML</title>
+
+  <p>You can export individual <app>Tomboy</app> notes to HTML pages with the <gui>Export to HTML</gui> add-in. This addin is enabled by default.</p>
+
+  <steps>
+    <title>To export a note to HTML:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select <gui style="menuitem">Export to HTML</gui>.</p>
+    </item>
+    <item>
+      <p>Browse and select the directory you wish to save the note to. You may change the name of the html file, if you wish it to be different than the name of the note.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Save</gui>.</p>
+    </item>
+  </steps>
+
+   <p>The note will then be saved as an HTML file and opened in your default web browser.</p>
+
+</page>
diff --git a/help/zh_CN/addins-tools-note-of-day.page b/help/zh_CN/addins-tools-note-of-day.page
new file mode 100644
index 0000000..562efae
--- /dev/null
+++ b/help/zh_CN/addins-tools-note-of-day.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Automatically create notes for each day.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-16" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>日记</title>
+
+  <p>You can automatically create notes for each day. These notes come ready
+  with text containing day and date information for the day.Example:
+  <em>Today: Thursday, January 21 2010</em>. This add-in is disabled by
+  default.</p>
+
+  <steps>
+    <title>To open the note of the day:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in your message tray.</p>
+    </item>
+    <item>
+      <p>Select from the list of notes, note with current date.</p>
+    </item>
+  </steps>
+
+	<note style="tip">
+    <p>The note will also add rows for <em>Tasks</em> and <em>Appointment</em> automatically.</p>
+  </note>
+
+</page>
diff --git a/help/zh_CN/addins-tools-timestamp.page b/help/zh_CN/addins-tools-timestamp.page
new file mode 100644
index 0000000..2102a4c
--- /dev/null
+++ b/help/zh_CN/addins-tools-timestamp.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools-timestamp" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="addins#tools"/>
+    <desc>Insert date and time in your notes.</desc>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-06" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+  <title>插入时间戳</title>
+
+  <p>The <gui>Insert Timestamp</gui> add-in allows you to insert date and
+  time into your notes. This add-in is disabled by default.</p>
+
+  <steps>
+    <title>To use the <gui>Insert Timestamp</gui> addin:</title>
+    <item>
+      <p>From the gears icon in the note toolbar, select
+      <gui style="menuitem">Insert Timestamp</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To quickly insert a timestamp in a note, press
+    <keyseq><key>Ctrl</key><key>D</key></keyseq>.</p>
+  </note>
+
+</page>
diff --git a/help/zh_CN/addins-tools.page b/help/zh_CN/addins-tools.page
deleted file mode 100644
index 9fbb3d6..0000000
--- a/help/zh_CN/addins-tools.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="addins-tools" xml:lang="zh_CN">
-
-  <info>
-    <link type="guide" xref="addins#manage"/>
-    <desc>启用额外的便笺功能。</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-    <credit type="author">
-      <name>Paul Cutler</name>
-      <email>pcutler at gnome.org</email>
-    </credit>    
-<!--
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-  </info>
-
- <title>阿帖便笺工具扩展</title>
-
-	<p>工具扩展为您的阿帖便笺增加额外的功能。</p>
-
-  <section id="backlinks">
-    <title>反向链接</title>
-	<p><gui>反向链接</gui> 扩展默认是启用的,允许您查看哪些便笺链接到您当前查看的便笺。</p> 
-  </section>
-
-<section id="html-export">
-  <title>导出为 HTML</title>
-  <p><gui>导出为 HTML</gui> 扩展默认是启用的,可以把指定的便笺导出为 HTML 网页。</p>
-	<p>要导出一个便笺为 HTML,点工具栏上的 <gui>工具</gui> 图标,然后选 <gui>导出为 HTML</gui>,出来一个保存便笺的对话框。选择保存便笺的文件夹,还可以给导出的 HTML 文件换一个文件名。保存的 HTML 文件会立刻自动显示在浏览器中。</p>
-</section>
-
-<section id="timestamp">
-  <title>插入时间戳</title>
-  <p><gui>插入时间戳</gui> 扩展默认是禁用的,要启用它,在首选项选中 <gui>插入时间戳</gui> 扩展,然后点 <gui>启用</gui>。</p>
-	<p>要在便笺中添加时间戳,点工具栏上的 <gui>工具</gui> 图标,然后选 <gui>插入时间戳</gui>,或者按  <key>Ctrl + D</key>。</p>
-</section>
-
-<section id="noteoftheday">
-  <title>日记</title>
-  <p><gui>日记</gui> 扩展默认是禁用的,要启用它,在首选项选中 <gui>日记</gui> 扩展,然后点 <gui>启用</gui>。 </p>
-	<p><gui>日记</gui> 扩展每天创建一个新便笺,例如标题是 <em>今天: 2010年1月21日 星期二</em>。便笺会自动添加 <em>任务</em> 和 <em>约会</em> 两行。</p>
-</section>
-
-<section id="watcher">
-  <title>便笺文件夹监视器</title>
-  <p>便笺文件夹监视器扩展监视您保存阿帖便笺的文件夹。如果它检测到您的便笺发生变化,它会立即应用这些变化,并在您的便笺中显示。这个扩展一般和第三方同步服务配合使用,比如 Dropbox。设置第三方同步服务超出了此帮助文档的讲述范围。</p>
-</section>
-
- </page>
diff --git a/help/zh_CN/addins.page b/help/zh_CN/addins.page
index 8c29347..9b72cc2 100644
--- a/help/zh_CN/addins.page
+++ b/help/zh_CN/addins.page
@@ -4,28 +4,63 @@
   <info>
     <link type="guide" xref="index#prefs"/>
     <desc>向阿帖便笺添加额外功能。</desc>
-    <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
+    <revision pkgversion="3.8" version="0.1" date="2013-08-02" status="draft"/>
     <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
     </credit>
-<!--    
-    <copyright>
-      <year>2010</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->    
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>阿帖便笺扩展</title>
+  <title>Tomboy add-ins</title>
+
+  <p><gui>add-ins</gui> are <app>Tomboy</app> plugins that give you extended
+  features and functionality which are not available by default.</p>
+
+  <steps>
+    <title>To enable an add-in:</title>
+    <item>
+      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Add-ins</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>+</gui> to expand the add-in category.</p>
+    </item>
+    <item>
+      <p>Select the add-in you wish to enable.</p>
+    </item>
+    <item>
+      <p>Press <gui style="button">Enable</gui>.</p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>To download more add-ins from the internet, from the
+    <gui><app>Tomboy</app> Preferences</gui> window, in the
+    <gui style="tab">Add-ins</gui> tab, click on <gui style="button">Get More Add-Ins…</gui>.</p>
+  </note>
+
+  <section id="preferences" style="2column">
+    <title>Preferences</title>
+  </section>
 
-  <section id="manage" style="2column">
-    <info>
-      <title type="link">阿帖便笺扩展</title>
-    </info>
-    <title>管理阿帖便笺扩展</title>
+  <section id="tools" style="2column">
+    <title>Tools</title>
   </section>
 
+  <section id="desktop-integration" style="2column">
+    <title>Desktop Integration</title>
+  </section>
 
+  <section id="sync" style="2column">
+    <title>Synchronization</title>
+    <p>Synchronization add-ins allow you to choose different methods and places to synchronize your Tomboy notes.</p>
+  </section>
+
+  <section id="formatting" style="2column">
+    <title>Formatting</title>
+  </section>
 </page>
diff --git a/help/zh_CN/delete-notes.page b/help/zh_CN/delete-notes.page
index 4b20c8a..8a04c1d 100644
--- a/help/zh_CN/delete-notes.page
+++ b/help/zh_CN/delete-notes.page
@@ -7,11 +7,14 @@
     <link type="seealso" xref="edit-notes"/>
     <desc>删除便笺。</desc>
     <revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
-
-        <credit type="author">
+    <credit type="author">
       <name>Paul Cutler</name>
       <email>pcutler at gnome.org</email>
-    </credit>    
+    </credit>
+    <credit type="editor">
+      <name>Sindhu S</name>
+      <email>sindhus at live.in</email>
+    </credit>
     <credit type="author copyright">
       <name>GNOME Documentation Project</name>
       <years>2010</years>
@@ -19,13 +22,25 @@
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
   </info>
 
-  <title>删除一个便笺</title>    
-  
-  <p>您可以在便笺窗口内,点工具栏上的 <gui>删除</gui> 图标来删除当前便笺。</p>
-  
-<note style="warning">
-	<p>删除便笺是永久性的。删除后,这个便笺将不能恢复。</p> <p> You will be prompted <gui>Really delete 
-	this note?</gui> when deleting a note.</p>  
-</note>
-	
+  <title>删除一个便笺</title>
+
+  <p>If you wish to remove notes that you no longer need,
+  you can delete them from <app>Tomboy</app>.</p>
+
+  <steps>
+    <title>To delete a note:</title>
+    <item>
+      <p>Open the desired note.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Delete</gui> icon from the toolbar. You will be prompted
+      to confirm the deletion.</p>
+    </item>
+  </steps>
+
+  <note style="warning">
+    <p>Deleting a note is a permanent action. Notes once deleted, cannot be
+    recovered.</p>
+  </note>
+
 </page>
diff --git a/help/zh_CN/introduction.page b/help/zh_CN/introduction.page
index 0d171dc..6388324 100644
--- a/help/zh_CN/introduction.page
+++ b/help/zh_CN/introduction.page
@@ -22,7 +22,10 @@
 
   <p><app>阿帖便笺</app> 是 GNOME 桌面中的一款笔记程序,也可运行在 Microsoft Windows 和 Mac OS X 之上。它简单易用,能帮助您随时整理思路保存信息。</p>
   <p><app>阿帖便笺</app> 包括许多功能特性,帮助您整理思路保存信息,允许您把它们相互关联起来,便于查找和排序,您还可以轻松地将多个便笺组织成一个笔记本。</p>
-  <p>您也可以在多台计算机上同步您的便笺,无论在哪都能很方便地使用便笺。</p>
+  <p>
+    You can also synchronize your notes across multiple computers, making it
+    easy to take your notes with you wherever you are.
+  </p>
 
   <figure>
     <title><app>阿帖便笺</app> 窗口</title>
diff --git a/help/zh_CN/pin-notes.page b/help/zh_CN/pin-notes.page
new file mode 100644
index 0000000..a83c3c8
--- /dev/null
+++ b/help/zh_CN/pin-notes.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="pin-notes" xml:lang="zh_CN">
+
+  <info>
+    <link type="guide" xref="index#notes"/>
+    <link type="seealso" xref="addins-preferences"/>
+    <desc>Access notes from <app>Tomboy</app> message tray icon.</desc>
+    <revision pkgversion="3.10" version="0.1" date="2013-10-10" status="draft"/>
+    <credit type="author">
+      <name>Sindhu S</name>
+      <email>sindhus at gnome.org</email>
+    </credit>
+
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+  </info>
+
+  <title>Pin a note</title>
+
+  <p>The recent list of <app>Tomboy</app> notes you have accessed are shown
+  when you click on the <link xref="">message tray icon</link>. This list is
+  limited to twenty recent notes. If you have more than twenty notes, opening
+  a note that is not in the recent list will require you to
+  <link xref="search">search all notes</link>.</p>
+
+  <p>To quickly access less frequently used notes, you can <em>pin</em> notes
+  to the recent list.</p>
+
+  <steps>
+    <title>To pin a note:</title>
+    <item>
+      <p>Click on the <app>Tomboy</app> icon in the message tray.</p>
+    </item>
+    <item>
+      <p>In the recent list, click on the gray pin icon to the right hand
+      side of the note you wish to pin. The pin icon will change to in color
+      to be green.</p>
+    </item>
+  </steps>
+
+  <p>A note with a green pin icon indicates that the note has been <em>pinned</em> to the list.</p>
+
+  <note style="tip">
+    <p>To remove a note <em>pinned</em> to the recent list, click on the green
+    pin icon.</p>
+  </note>
+
+</page>
diff --git a/help/zh_CN/sync-setup.page b/help/zh_CN/sync-setup.page
index 12c40cc..aa1a273 100644
--- a/help/zh_CN/sync-setup.page
+++ b/help/zh_CN/sync-setup.page
@@ -24,7 +24,14 @@
 	
 	<p><app>阿帖便笺</app>能够在多台计算机之间同步你的便笺,这样您就能够在其他计算机上备份您的便笺,或在不同电脑之间分享,让您总是可以访问到您的便笺。 </p>
 	
-	<p>您可以通过在面板、任务栏、浮动面板的阿帖便笺图标上点右键,然后选 <gui>首选项</gui> 来打开 <gui>阿帖便笺首选项</gui>,再选 <gui>同步便笺</gui> 标签。也可以在 <gui>搜索全部便笺</gui> 对话框里,打开 <gui>首选项</gui>,点菜单 <guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。</p>
+	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui>
+	by using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </section>
 
@@ -42,7 +49,7 @@
 		</item>
 		
 		<item><p><gui>Replace my local note with the server's update.</gui>
-  		If you have selected this option, when you sync, 
+  		If you have selected this option, when you synchronize, 
 		Tomboy will overwrite and replace your note stored on your
 		computer with a copy from the remote computer.</p>
 		
@@ -80,7 +87,17 @@
 	
 	<p>推荐使用第三方计算机或服务器作为远程计算机来存放需要在多台计算机之间同步的便笺。</p>
 
-	<p>点菜单 <guiseq><gui>应用程序</gui><gui>附件</gui><gui>密码和加密密钥 </gui></guiseq>,打开<app>密码和加密密钥</app>程序,点击您的密钥,然后点菜单 <guiseq><gui>远程</gui><gui>为 SSH 配置密钥</gui></guiseq>,然后在<gui>计算机名</gui>中输入您想同步的计算机域名或 IP 地址,在<gui>登录名:</gui>中输入访问远程计算机的用户名,然后 点<gui>设定</gui>,出来提示时,输入密码然后完成密钥的设置。</p>
+	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
+	<guiseq><gui>Applications</gui><gui>Accessories</gui>
+	<gui>Passwords and Encryption Keys</gui></guiseq>.  
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	synchronize to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Login Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
+	</p>
 	
 	<p>在阿帖便笺中,在<gui>服务</gui>下拉列表中,选择<gui>SSH</gui>,输入服务器的连接信息,然后点<gui>保存</gui>按钮。如果要设置 <gui>文件夹路径</gui>,应该选择一个空文件夹,然后就可以使用便笺同步功能了。</p>
 
diff --git a/help/zh_CN/sync.page b/help/zh_CN/sync.page
index 9255fdd..e2ae5d6 100644
--- a/help/zh_CN/sync.page
+++ b/help/zh_CN/sync.page
@@ -24,7 +24,7 @@
 
 	<title>手动同步便笺</title>
 	
-	<p>您可以用三种方法同步便笺:</p>
+	<p>You can synchronize your notes one of three ways:</p>
 	
 	<list type="numbered">
 	  <item><p>在一个便笺里点 <gui>工具</gui> 图标,然后选择 <gui>同步便笺</gui>。</p></item>
@@ -38,13 +38,26 @@
  
  	<title>自动同步便笺</title>
  	
- 	<p>阿帖便笺可以在后台自动同步便笺,建议您在启用自动同步前,配置好如何处理便笺冲突。您可以在 <link xref="sync-setup#conflicts"/> 页,学习配置和设置同步便笺。</p>
- 	
- 	<p>您可以通过在面板、任务栏、浮动面板的阿帖便笺图标上点右键,然后选 <gui>首选项</gui> 来打开 <gui>阿帖便笺首选项</gui>,再选 <gui>同步便笺</gui> 标签。也可以在 <gui>搜索全部便笺</gui> 对话框里,打开 <gui>首选项</gui>,点菜单 <guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。</p>
+	<p>Tomboy can automatically synchronize your notes for you in the
+	background.It is recommended that you configure how you handle note
+	conflicts before enabling syncing automatically. You can learn about
+	handling note conflicts in the <link xref="sync-setup#conflict"/>
+	page.</p>
+
+ 	<p>You can enable synchronize by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 	
 	<p>要启用同步功能,在同步标签的底部,选中 <gui>每隔多少分钟在后台自动同步</gui> 复选框。</p>
 	
-	<p>阿帖便笺默认每隔 10 分钟同步一次。要更改同步频率,在时间框里输入一个数,或者用鼠标点击上下微调按钮(单位:分钟)。</p>
+	<p>Tomboy's default option is to autosync every 10 minutes.  To change
+	how often Tomboy should synchronize enter the number of minutes in the
+	dialog or use your mouse to move the time up or down.</p>
 	
 	<p>要禁用自动同步,不选中 <gui>每隔多少分钟在后台自动同步</gui> 复选框。</p>
 	
diff --git a/help/zh_CN/whatsnew.page b/help/zh_CN/whatsnew.page
index 4b61961..8f98f45 100644
--- a/help/zh_CN/whatsnew.page
+++ b/help/zh_CN/whatsnew.page
@@ -22,7 +22,10 @@
 
   <p><app>阿帖便笺</app>改善了一些特性,得益于对阿帖便笺启动的改进,它应该启动更快。</p>
   <p>从阿帖便笺复制和粘贴到其他应用程序的功能得到改进,支持将文本的格式也复制到其他支持 HTML 的程序,比如 Evolution、OpenOffice.org 等其他应用程序。</p>
-  <p>如果您启用了同步功能,<app>阿帖便笺</app>可以立即自动同步您的便笺。</p>
+  <p>
+    <app>Tomboy</app> can now synchronize your notes automatically for you
+    when you when you have synchronize enabled.
+  </p>
 
   <p>添加了支持 Microsoft Windows 7 跳转列表,帮助您访问便笺,直接在窗口任务栏上快速查找和创建便笺。</p>
 
diff --git a/libtomboy/Makefile.in b/libtomboy/Makefile.in
index 89fbaf1..f0f9aa1 100644
--- a/libtomboy/Makefile.in
+++ b/libtomboy/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = libtomboy
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -96,22 +124,47 @@ libtomboy_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 am_libtomboy_la_OBJECTS = libtomboy_la-tomboykeybinder.lo \
 	libtomboy_la-tomboyutil.lo libtomboy_la-eggaccelerators.lo
 libtomboy_la_OBJECTS = $(am_libtomboy_la_OBJECTS)
-libtomboy_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libtomboy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtomboy_la_CFLAGS) \
 	$(CFLAGS) $(libtomboy_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libtomboy_la_SOURCES)
 DIST_SOURCES = $(libtomboy_la_SOURCES)
 am__can_run_installinfo = \
@@ -119,6 +172,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -368,6 +438,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-tomboylibLTLIBRARIES: $(tomboylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(tomboylib_LTLIBRARIES)'; test -n "$(tomboylibdir)" || list=; \
@@ -402,8 +473,9 @@ clean-tomboylibLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+
 libtomboy.la: $(libtomboy_la_OBJECTS) $(libtomboy_la_DEPENDENCIES) $(EXTRA_libtomboy_la_DEPENDENCIES) 
-	$(libtomboy_la_LINK) -rpath $(tomboylibdir) $(libtomboy_la_OBJECTS) $(libtomboy_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libtomboy_la_LINK) -rpath $(tomboylibdir) $(libtomboy_la_OBJECTS) $(libtomboy_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -416,46 +488,46 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtomboy_la-tomboyutil.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libtomboy_la-tomboykeybinder.lo: tomboykeybinder.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -MT libtomboy_la-tomboykeybinder.lo -MD -MP -MF $(DEPDIR)/libtomboy_la-tomboykeybinder.Tpo -c -o libtomboy_la-tomboykeybinder.lo `test -f 'tomboykeybinder.c' || echo '$(srcdir)/'`tomboykeybinder.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtomboy_la-tomboykeybinder.Tpo $(DEPDIR)/libtomboy_la-tomboykeybinder.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tomboykeybinder.c' object='libtomboy_la-tomboykeybinder.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -MT libtomboy_la-tomboykeybinder.lo -MD -MP -MF $(DEPDIR)/libtomboy_la-tomboykeybinder.Tpo -c -o libtomboy_la-tomboykeybinder.lo `test -f 'tomboykeybinder.c' || echo '$(srcdir)/'`tomboykeybinder.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtomboy_la-tomboykeybinder.Tpo $(DEPDIR)/libtomboy_la-tomboykeybinder.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tomboykeybinder.c' object='libtomboy_la-tomboykeybinder.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -c -o libtomboy_la-tomboykeybinder.lo `test -f 'tomboykeybinder.c' || echo '$(srcdir)/'`tomboykeybinder.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -c -o libtomboy_la-tomboykeybinder.lo `test -f 'tomboykeybinder.c' || echo '$(srcdir)/'`tomboykeybinder.c
 
 libtomboy_la-tomboyutil.lo: tomboyutil.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -MT libtomboy_la-tomboyutil.lo -MD -MP -MF $(DEPDIR)/libtomboy_la-tomboyutil.Tpo -c -o libtomboy_la-tomboyutil.lo `test -f 'tomboyutil.c' || echo '$(srcdir)/'`tomboyutil.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtomboy_la-tomboyutil.Tpo $(DEPDIR)/libtomboy_la-tomboyutil.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tomboyutil.c' object='libtomboy_la-tomboyutil.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -MT libtomboy_la-tomboyutil.lo -MD -MP -MF $(DEPDIR)/libtomboy_la-tomboyutil.Tpo -c -o libtomboy_la-tomboyutil.lo `test -f 'tomboyutil.c' || echo '$(srcdir)/'`tomboyutil.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtomboy_la-tomboyutil.Tpo $(DEPDIR)/libtomboy_la-tomboyutil.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tomboyutil.c' object='libtomboy_la-tomboyutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -c -o libtomboy_la-tomboyutil.lo `test -f 'tomboyutil.c' || echo '$(srcdir)/'`tomboyutil.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -c -o libtomboy_la-tomboyutil.lo `test -f 'tomboyutil.c' || echo '$(srcdir)/'`tomboyutil.c
 
 libtomboy_la-eggaccelerators.lo: eggaccelerators.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -MT libtomboy_la-eggaccelerators.lo -MD -MP -MF $(DEPDIR)/libtomboy_la-eggaccelerators.Tpo -c -o libtomboy_la-eggaccelerators.lo `test -f 'eggaccelerators.c' || echo '$(srcdir)/'`eggaccelerators.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtomboy_la-eggaccelerators.Tpo $(DEPDIR)/libtomboy_la-eggaccelerators.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eggaccelerators.c' object='libtomboy_la-eggaccelerators.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -MT libtomboy_la-eggaccelerators.lo -MD -MP -MF $(DEPDIR)/libtomboy_la-eggaccelerators.Tpo -c -o libtomboy_la-eggaccelerators.lo `test -f 'eggaccelerators.c' || echo '$(srcdir)/'`eggaccelerators.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtomboy_la-eggaccelerators.Tpo $(DEPDIR)/libtomboy_la-eggaccelerators.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eggaccelerators.c' object='libtomboy_la-eggaccelerators.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -c -o libtomboy_la-eggaccelerators.lo `test -f 'eggaccelerators.c' || echo '$(srcdir)/'`eggaccelerators.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtomboy_la_CFLAGS) $(CFLAGS) -c -o libtomboy_la-eggaccelerators.lo `test -f 'eggaccelerators.c' || echo '$(srcdir)/'`eggaccelerators.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -463,26 +535,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -494,15 +555,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -511,9 +568,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -670,9 +728,9 @@ uninstall-am: uninstall-tomboylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-tomboylibLTLIBRARIES cscopelist ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-tomboylibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -683,7 +741,8 @@ uninstall-am: uninstall-tomboylibLTLIBRARIES
 	installdirs maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-tomboylibLTLIBRARIES
+	tags tags-am uninstall uninstall-am \
+	uninstall-tomboylibLTLIBRARIES
 
 
 maintainer-clean-local:
diff --git a/ltmain.sh b/ltmain.sh
old mode 100755
new mode 100644
index 3061e3c..63ae69d
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 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.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@ case $progpath in
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@ opt_finish=false
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@ esac
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@ func_mode_compile ()
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@ func_mode_link ()
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7330,7 @@ func_mode_link ()
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7432,7 +7447,7 @@ func_mode_link ()
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8070,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8078,7 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9168,8 @@ EOF
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@ EOF
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 06a8cfe..01f9702 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -33,8 +33,7 @@ exec_prefix = @exec_prefix@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p at .
@@ -108,7 +107,7 @@ install-data-no: all
 install-data-yes: all
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
 	  if test -r $$lang.gmo; then \
 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@ install-exec installcheck:
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 
 check: all $(GETTEXT_PACKAGE).pot
diff --git a/po/cs.po b/po/cs.po
index feea3a2..c86b6f8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -16,10 +16,10 @@ 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: 2013-01-20 01:02+0000\n"
-"PO-Revision-Date: 2013-01-23 08:01+0100\n"
+"POT-Creation-Date: 2013-11-22 17:25+0000\n"
+"PO-Revision-Date: 2013-12-07 18:12+0100\n"
 "Last-Translator: Marek Černocký <marek at manet.cz>\n"
-"Language-Team: čeština <gnome-cs-list at gnome.org>\n"
+"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,9 +242,11 @@ msgid ""
 "note menu."
 msgstr "Maximální délka názvu poznámky, který se zobrazí v nabídce appletu."
 
+#. Enable Startup Notes option
 #: ../data/tomboy.schemas.in.h:29
+#: ../Tomboy/Addins/AdvancedPreferences/EnableStartupNotesPreference.cs:27
 msgid "Enable startup notes"
-msgstr "Otevřít poznámky při startu"
+msgstr "Otevřít poznámky při spuštění"
 
 #: ../data/tomboy.schemas.in.h:30
 msgid ""
@@ -708,17 +710,17 @@ msgid "Start synchronizing notes"
 msgstr "Začít synchronizovat poznámky"
 
 #. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:26
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:24
 msgid "Advanced"
 msgstr "Pokročilé"
 
 #. Menu Min Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:34
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:35
 msgid "Minimum number of notes to show in Recent list"
 msgstr "Minimální počet poznámek zobrazených v Nedávné poznámky"
 
 #. Menu Max Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:58
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:59
 msgid "Maximum number of notes to show in Recent list"
 msgstr "Maximální počet poznámek zobrazených v Nedávné poznámky"
 
@@ -805,28 +807,28 @@ msgstr "Zahrnout všechny související poznámky"
 msgid "Export to HTML"
 msgstr "Exportovat do HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:116
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "Vaše poznámka byla exportována do „{0}“."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:127
 msgid "Note exported successfully"
 msgstr "Poznámka úspěšně exportována"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 #: ../Tomboy/ExportAllApplicationAddin.cs:250
 #: ../Tomboy/ExportAllApplicationAddin.cs:328
 msgid "Access denied."
 msgstr "Přístup odmítnut."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:135
 #: ../Tomboy/ExportAllApplicationAddin.cs:255
 #: ../Tomboy/ExportAllApplicationAddin.cs:333
 msgid "Folder does not exist."
 msgstr "Složka neexistuje."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:150
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "Nelze uložit soubor „{0}“"
@@ -1391,17 +1393,17 @@ msgstr "Sešit"
 msgid "_New notebook..."
 msgstr "Nový _sešit…"
 
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
+#: ../Tomboy/Note.cs:515
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Nová poznámka {0}"
 
-#: ../Tomboy/Note.cs:1675
+#: ../Tomboy/Note.cs:1678
 #, csharp-format
 msgid "Really delete \"{0}\"?"
 msgstr "Opravdu odstranit „{0}“?"
 
-#: ../Tomboy/Note.cs:1678
+#: ../Tomboy/Note.cs:1681
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
@@ -1409,11 +1411,11 @@ msgstr[0] "Opravdu odstranit tuto poznámku?"
 msgstr[1] "Opravdu odstranit tyto {0} poznámky?"
 msgstr[2] "Opravdu odstranit těchto {0} poznámek?"
 
-#: ../Tomboy/Note.cs:1689
+#: ../Tomboy/Note.cs:1692
 msgid "If you delete a note it is permanently lost."
 msgstr "Pokud odstraníte poznámku, bude navždy ztracena."
 
-#: ../Tomboy/Note.cs:1723
+#: ../Tomboy/Note.cs:1726
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1424,13 +1426,13 @@ msgstr ""
 "volného místa a můžete zapisovat do složky {0}. Chybové hlášení naleznete v "
 "{1}."
 
-#: ../Tomboy/Note.cs:1739
+#: ../Tomboy/Note.cs:1742
 msgid "Error saving note data."
 msgstr "Nepodařilo se uložit poznámku."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:263
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:264
 msgid "New Note Template"
 msgstr "Nová šablona"
 
@@ -1483,8 +1485,8 @@ msgstr ""
 "</link:url>\n"
 "</list-item><list-item dir=\"ltr\">Doplňky instalujte do složek <link:url>{3}"
 "</link:url>\n"
-"</list-item><list-item dir=\"ltr\">Evidence najdete ve složce <link:url>{4}</"
-"link:url></list-item></list>\n"
+"</list-item><list-item dir=\"ltr\">Provozní záznamy najdete ve složce <link:"
+"url>{4}</link:url></list-item></list>\n"
 "\n"
 "Ciao!"
 
@@ -1563,9 +1565,19 @@ msgstr "Začněte zde"
 msgid "Using Links in Tomboy"
 msgstr "Používání odkazů v poznámkách Tomboy"
 
+#: ../Tomboy/NoteManager.cs:480
+#, csharp-format
+#| msgid "New Note {0}"
+msgid "Note from {0}"
+msgstr "Poznámka z {0}"
+
+#: ../Tomboy/NoteManager.cs:480
+msgid "yyyy-MM-dd HH:mm:ss.fff"
+msgstr "d.M.yyyy H:mm:ss.fff"
+
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:560 ../Tomboy/NoteManager.cs:663
+#: ../Tomboy/NoteManager.cs:559 ../Tomboy/NoteManager.cs:662
 msgid "Describe your new note here."
 msgstr "Sem napište svou novou poznámku."
 
@@ -1796,27 +1808,27 @@ msgstr "Zmenšit písmo"
 msgid "Bullets"
 msgstr "Odrážky"
 
-#: ../Tomboy/PreferencesDialog.cs:74
+#: ../Tomboy/PreferencesDialog.cs:75
 msgid "Editing"
 msgstr "Úpravy"
 
-#: ../Tomboy/PreferencesDialog.cs:77
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Hotkeys"
 msgstr "Klávesové zkratky"
 
-#: ../Tomboy/PreferencesDialog.cs:79
+#: ../Tomboy/PreferencesDialog.cs:80
 msgid "Synchronization"
 msgstr "Synchronizace"
 
-#: ../Tomboy/PreferencesDialog.cs:80
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Add-ins"
 msgstr "Doplňky"
 
-#: ../Tomboy/PreferencesDialog.cs:180
+#: ../Tomboy/PreferencesDialog.cs:181
 msgid "_Spell check while typing"
 msgstr "_Kontrola překlepů během psaní"
 
-#: ../Tomboy/PreferencesDialog.cs:189
+#: ../Tomboy/PreferencesDialog.cs:190
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1825,11 +1837,11 @@ msgstr ""
 "kontextové nabídce."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:200
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid "Highlight _WikiWords"
 msgstr "Zvýrazňovat _WikiSlova"
 
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1838,46 +1850,46 @@ msgstr ""
 "Kliknutí na slovo vytvoří poznámku s takovým názvem."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:215
+#: ../Tomboy/PreferencesDialog.cs:216
 msgid "Enable auto-_bulleted lists"
 msgstr "Po_volit automatické seznamy s odrážkami"
 
-#: ../Tomboy/PreferencesDialog.cs:224
+#: ../Tomboy/PreferencesDialog.cs:225
 msgid "Use custom _font"
 msgstr "Používat vlastní _písmo"
 
-#: ../Tomboy/PreferencesDialog.cs:242
+#: ../Tomboy/PreferencesDialog.cs:243
 msgid "When renaming a linked note: "
 msgstr "Při přejmenování odkazované poznámky:"
 
-#: ../Tomboy/PreferencesDialog.cs:245
+#: ../Tomboy/PreferencesDialog.cs:246
 msgid "Ask me what to do"
 msgstr "Dotázat se mě, co udělat"
 
-#: ../Tomboy/PreferencesDialog.cs:246
+#: ../Tomboy/PreferencesDialog.cs:247
 msgid "Never rename links"
 msgstr "Odkazy nikdy nepřejmenovat"
 
-#: ../Tomboy/PreferencesDialog.cs:247
+#: ../Tomboy/PreferencesDialog.cs:248
 msgid "Always rename links"
 msgstr "Odkazy vždy přejmenovat"
 
-#: ../Tomboy/PreferencesDialog.cs:267
+#: ../Tomboy/PreferencesDialog.cs:268
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr "Použijte šablonu k upřesnění, jaký text se má vložit do nové poznámky."
 
-#: ../Tomboy/PreferencesDialog.cs:276
+#: ../Tomboy/PreferencesDialog.cs:277
 msgid "Open New Note Template"
 msgstr "Otevřít šablonu nové poznámky"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:333
+#: ../Tomboy/PreferencesDialog.cs:334
 msgid "Listen for _Hotkeys"
 msgstr "Používat _klávesové zkratky"
 
-#: ../Tomboy/PreferencesDialog.cs:342
+#: ../Tomboy/PreferencesDialog.cs:343
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><ALT>F11</b>, <b><ALT>N</b>"
@@ -1887,82 +1899,82 @@ msgstr ""
 "Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:362
+#: ../Tomboy/PreferencesDialog.cs:363
 msgid "Show notes _menu"
 msgstr "Zobrazit nabídku pozná_mek"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:379
+#: ../Tomboy/PreferencesDialog.cs:380
 msgid "Open \"_Start Here\""
 msgstr "Otevřít „_Začněte zde“"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:396
+#: ../Tomboy/PreferencesDialog.cs:397
 msgid "Create _new note"
 msgstr "Vytvořit _novou poznámku"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:413
+#: ../Tomboy/PreferencesDialog.cs:414
 msgid "Open \"Search _All Notes\""
 msgstr "Otevřít „Hledat ve všech poznámkách“"
 
-#: ../Tomboy/PreferencesDialog.cs:440
+#: ../Tomboy/PreferencesDialog.cs:441
 msgid "Ser_vice:"
 msgstr "Služ_ba:"
 
-#: ../Tomboy/PreferencesDialog.cs:493 ../Tomboy/PreferencesDialog.cs:1112
+#: ../Tomboy/PreferencesDialog.cs:494 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "Nedostupné"
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:520
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Automatick_y synchronizovat na pozadí každých"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:525
+#: ../Tomboy/PreferencesDialog.cs:526
 msgid "Minutes"
 msgstr "minut"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:547
+#: ../Tomboy/PreferencesDialog.cs:548
 msgid "_Advanced..."
 msgstr "P_okročilé…"
 
-#: ../Tomboy/PreferencesDialog.cs:608
+#: ../Tomboy/PreferencesDialog.cs:609
 msgid "The following add-ins are installed"
 msgstr "Máte nainstalovány následující doplňky"
 
-#: ../Tomboy/PreferencesDialog.cs:629
+#: ../Tomboy/PreferencesDialog.cs:630
 msgid "Get More Add-Ins..."
 msgstr "Získat více doplňků…"
 
-#: ../Tomboy/PreferencesDialog.cs:647
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Povolit"
 
-#: ../Tomboy/PreferencesDialog.cs:653
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_Zakázat"
 
-#: ../Tomboy/PreferencesDialog.cs:784
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Neimplementováno"
 
-#: ../Tomboy/PreferencesDialog.cs:798
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Předvolby {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:937
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Zvolte písmo poznámek"
 
-#: ../Tomboy/PreferencesDialog.cs:981
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Další volby synchronizace"
 
-#: ../Tomboy/PreferencesDialog.cs:987
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1970,23 +1982,23 @@ msgstr ""
 "Když nastane konflikt mezi místní poznámkou a poznámkou na nastaveném "
 "synchronizačním serveru:"
 
-#: ../Tomboy/PreferencesDialog.cs:994
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Vždy se mě zeptat, co dělat."
 
-#: ../Tomboy/PreferencesDialog.cs:998
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Přejmenovat moji místní poznámku."
 
-#: ../Tomboy/PreferencesDialog.cs:1002
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Zaměnit moji místní poznámku s poznámkou na serveru."
 
-#: ../Tomboy/PreferencesDialog.cs:1148
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "Are you sure?"
 msgstr "Jste si jisti?"
 
-#: ../Tomboy/PreferencesDialog.cs:1150
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1994,11 +2006,11 @@ msgstr ""
 "Nedoporučuje se mazat nastavení synchronizace. Při příští synchronizaci "
 "můžete být znovu vyzváni k synchronizaci všech svých poznámek."
 
-#: ../Tomboy/PreferencesDialog.cs:1163
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Obnovuje se nastavení synchronizace"
 
-#: ../Tomboy/PreferencesDialog.cs:1165
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -2008,11 +2020,11 @@ msgstr ""
 "nyní smazáno. Může se stát, že při uložení nového nastavení budete muset "
 "synchronizovat všechny své poznámky znovu."
 
-#: ../Tomboy/PreferencesDialog.cs:1243
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Connection successful"
 msgstr "Úspěšné připojení"
 
-#: ../Tomboy/PreferencesDialog.cs:1245
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -2020,7 +2032,7 @@ msgstr ""
 "Aplikace Tomboy je připravena synchronizovat vaše poznámky. Chcete je "
 "synchronizovat právě teď?"
 
-#: ../Tomboy/PreferencesDialog.cs:1268
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
@@ -2029,23 +2041,23 @@ msgstr ""
 "Zkontrolujte zadané informace a zkuste to znovu. Můžete se také zkusit "
 "podívat do souboru {0} se záznamem."
 
-#: ../Tomboy/PreferencesDialog.cs:1280
+#: ../Tomboy/PreferencesDialog.cs:1281
 msgid "Error connecting"
 msgstr "Chyba připojování"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Version:"
 msgstr "Verze:"
 
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1384
+#: ../Tomboy/PreferencesDialog.cs:1385
 msgid "Add-in Dependencies:"
 msgstr "Závislosti doplňků:"
 
@@ -2377,7 +2389,7 @@ msgstr ""
 "FUSE.\n"
 "\n"
 "Abyste příště zamezili tomuto varování, bylo by vhodné spouštět FUSE při "
-"startu systému. Přidejte řádek „modprobe fuse“ do souboru /etc/init.d/boot."
+"spuštění systému. Přidejte řádek „modprobe fuse“ do souboru /etc/init.d/boot."
 "local nebo „fuse“ do /etc/modules."
 
 #: ../Tomboy/Tomboy.cs:253
@@ -2415,11 +2427,11 @@ msgid "A simple and easy to use desktop note-taking application."
 msgstr ""
 "Jednoduchá a snadno použitelná aplikace pro poznámky na pracovní ploše."
 
-#: ../Tomboy/Tomboy.cs:439
+#: ../Tomboy/Tomboy.cs:441
 msgid "Homepage"
 msgstr "Domovská stránka"
 
-#: ../Tomboy/Tomboy.cs:575
+#: ../Tomboy/Tomboy.cs:577
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright © 2004-2007 Alex Graveley\n"
@@ -2434,7 +2446,7 @@ msgstr ""
 "\n"
 "Copyright © 2004 – 2011 ostatní\n"
 
-#: ../Tomboy/Tomboy.cs:589
+#: ../Tomboy/Tomboy.cs:591
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -2449,7 +2461,7 @@ msgstr ""
 "  --search [text]\t\tOtevřít okno Hledat ve všech poznámkách s hledaným "
 "textem.\n"
 
-#: ../Tomboy/Tomboy.cs:599
+#: ../Tomboy/Tomboy.cs:601
 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"
@@ -2463,7 +2475,7 @@ msgstr ""
 "  --start-here\t\t\tZobrazit poznámku „Začněte Zde“.\n"
 "  --highlight-search [text]\tVyhledat a zvýraznit text v otevřené poznámce.\n"
 
-#: ../Tomboy/Tomboy.cs:609
+#: ../Tomboy/Tomboy.cs:611
 msgid ""
 "  --addin:html-export-all [path]\tExports all notes to HTML in the given "
 "location.\n"
@@ -2475,7 +2487,7 @@ msgstr ""
 "  --addin:html-export-all-quit [cesta]\tExportovat všechny poznámky do HTML "
 "v zadaném místě a skončit.\n"
 
-#: ../Tomboy/Tomboy.cs:619
+#: ../Tomboy/Tomboy.cs:621
 #, csharp-format
 msgid "Version {0}"
 msgstr "Verze {0}"
@@ -2588,7 +2600,7 @@ msgstr "MMMM d rrrr"
 msgid "(Untitled {0})"
 msgstr "(Bez názvu {0})"
 
-#: ../Tomboy/Watchers.cs:189
+#: ../Tomboy/Watchers.cs:186
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -2597,14 +2609,14 @@ msgstr ""
 "Poznámka s názvem <b>{0}</b> již existuje. Než budete pokračovat, zvolte pro "
 "tuto poznámku jiný název."
 
-#: ../Tomboy/Watchers.cs:204
+#: ../Tomboy/Watchers.cs:201
 msgid "Note title taken"
 msgstr "Název poznámky používán"
 
-#: ../Tomboy/Watchers.cs:608
+#: ../Tomboy/Watchers.cs:605
 msgid "_Copy Link Address"
 msgstr "_Kopírovat adresu odkazu"
 
-#: ../Tomboy/Watchers.cs:613
+#: ../Tomboy/Watchers.cs:610
 msgid "_Open Link"
 msgstr "_Otevřít odkaz"
diff --git a/po/de.po b/po/de.po
index f061675..e4d2189 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,20 +14,17 @@
 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: 2012-10-07 19:41+0000\n"
-"PO-Revision-Date: 2012-10-13 09:44+0200\n"
-"Last-Translator: Wolfgang Stoeggl <c72578 at yahoo.de>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 20:34+0100\n"
+"PO-Revision-Date: 2014-01-09 20:35+0100\n"
+"Last-Translator: Christian Kirbach <christian.kirbach at gmail.com>\n"
 "Language-Team: Deutsch <gnome-de at gnome.org>\n"
 "Language: de\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: Gtranslator 2.91.5\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
+"X-Generator: Poedit 1.5.4\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
@@ -35,7 +32,7 @@ msgid "Tomboy Applet Factory"
 msgstr "Tomboy Applet Factory"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:2 ../data/tomboy.desktop.in.h:1
-#: ../Tomboy/Tray.cs:579
+#: ../Tomboy/Tray.cs:581
 msgid "Tomboy Notes"
 msgstr "Tomboy Notizen"
 
@@ -217,10 +214,22 @@ msgstr ""
 "Notizen bestimmt."
 
 #: ../data/tomboy.schemas.in.h:23
+msgid "Maximum number of notes to show in menu"
+msgstr "Höchste Zahl der im Menü anzuzeigenden Notizen"
+
+#: ../data/tomboy.schemas.in.h:24
+msgid ""
+"Integer determining the maximum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"Ganzzahl, welche die Höchste Zahl der im Tomboy Notizenmenü anzuzeigenden "
+"Notizen bestimmt."
+
+#: ../data/tomboy.schemas.in.h:25
 msgid "List of pinned notes."
 msgstr "Liste der angehefteten Notizen."
 
-#: ../data/tomboy.schemas.in.h:24
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -228,13 +237,13 @@ msgstr ""
 "Durch Leerzeichen getrennte Liste von Notiz-Adressen (URIs) für solche "
 "Notizen, die immer im Tomboy Notizenmenü erscheinen sollen."
 
-#: ../data/tomboy.schemas.in.h:25
+#: ../data/tomboy.schemas.in.h:27
 msgid "Maximum note title length to show in tray menu."
 msgstr ""
 "Maximale Länge des im Menü des Benachrichtigungssymbols angezeigten "
 "Notiztitels."
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:28
 msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
@@ -242,11 +251,13 @@ msgstr ""
 "Maximale Zeichenanzahl des Notiztitels im Menü des Tomboy Panel-Applets oder "
 "Symbols im Benachrichtigungsfeld."
 
-#: ../data/tomboy.schemas.in.h:27
+#. Enable Startup Notes option
+#: ../data/tomboy.schemas.in.h:29
+#: ../Tomboy/Addins/AdvancedPreferences/EnableStartupNotesPreference.cs:27
 msgid "Enable startup notes"
 msgstr "Notizen beim Starten aktivieren"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -254,11 +265,11 @@ msgstr ""
 "Wenn aktiviert, werden alle Notizen, die beim Beenden von Tomboy geöffnet "
 "waren, beim Neustarten wieder geöffnet."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:31
 msgid "Show applet menu"
 msgstr "Applet-Menü anzeigen"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../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 "
@@ -274,11 +285,11 @@ msgstr ""
 "speziellen Zeichenkette »disabled« belegt wird, gibt es keine Tastenbelegung "
 "für diese Aktion."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:33
 msgid "Open Start Here"
 msgstr "»Hier starten« öffnen"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -294,11 +305,11 @@ msgstr ""
 "speziellen Zeichenkette »disabled« belegt wird, gibt es keine Tastenbelegung "
 "für diese Aktion."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:35
 msgid "Create a new Note"
 msgstr "Eine neue Notiz anlegen"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "The global keybinding for creating and displaying a new Note. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -314,11 +325,11 @@ msgstr ""
 "Option mit der speziellen Zeichenkette »disabled« belegt wird, gibt es keine "
 "Tastenbelegung für diese Aktion."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:37
 msgid "Open Search Dialog"
 msgstr "Suchdialog öffnen"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:38
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -334,11 +345,11 @@ msgstr ""
 "speziellen Zeichenkette »disabled« belegt wird, gibt es keine Tastenbelegung "
 "für diese Aktion."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:39
 msgid "Open Recent Changes"
 msgstr "Letzte Änderungen öffnen"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:40
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -354,11 +365,11 @@ msgstr ""
 "diese Option mit der speziellen Zeichenkette »disabled« belegt wird, gibt es "
 "keine Tastenbelegung für diese Aktion."
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:41
 msgid "Saved height of \"Search All Notes\" window"
 msgstr "Gespeicherte Höhe des Fensters »Alle Notizen durchsuchen«"
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:42
 msgid ""
 "Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -366,23 +377,23 @@ msgstr ""
 "Bestimmt die Höhe des Fensters »Alle Notizen durchsuchen« in Pixel, die beim "
 "Beenden von Tomboy gespeichert wurde."
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:43
 msgid "Saved width of \"Search All Notes\" window"
 msgstr "Gespeicherte Breite des Fensters »Alle Notizen durchsuchen«"
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:44
 msgid ""
 "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
 "Bestimmt die Breite des Fensters »Alle Notizen durchsuchen« in Pixel, die "
 "beim Beenden von Tomboy gespeichert wurde."
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:45
 msgid "Saved horizontal position of \"Search All Notes\" window"
 msgstr ""
 "Gespeicherte horizontale Position des Fensters »Alle Notizen durchsuchen«"
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:46
 msgid ""
 "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -390,12 +401,12 @@ msgstr ""
 "Bestimmt die X-Koordinate des Fensters »Alle Notizen durchsuchen«, das beim "
 "Beenden von Tomboy gespeichert wurde."
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:47
 msgid "Saved vertical position of \"Search All Notes\" window"
 msgstr ""
 "Gespeicherte vertikale Position des Fensters »Alle Notizen durchsuchen«"
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:48
 msgid ""
 "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -403,22 +414,22 @@ msgstr ""
 "Bestimmt die Y-Koordinate des Fensters »Alle Notizen durchsuchen«, das beim "
 "Beenden von Tomboy gespeichert wurde."
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:49
 msgid "Last Directory used in HTML Export"
 msgstr "Im HTML-Export zuletzt verwendeter Ordner"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:50
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
 "Der letzte Ordner, in den eine Notiz über das »In HTML exportieren«-Plugin "
 "exportiert wurde."
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:51
 msgid "HTML Export Linked Notes"
 msgstr "HTML-Export: Verknüpfte Notizen"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:52
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
@@ -426,11 +437,11 @@ msgstr ""
 "Die letzte Einstellung des Ankreuzfelds »Verknüpfte Notizen exportieren« im "
 "»In HTML exportieren«-Plugin."
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:53
 msgid "HTML Export All Linked Notes"
 msgstr "HTML-Export: Alle verknüpften Notizen"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:54
 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 "
@@ -443,11 +454,11 @@ msgstr ""
 "ob alle(rekursiv gefundenen) Notizen in den Export nach HTML einbezogen "
 "werden sollen."
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:55
 msgid "Sticky Note Importer First Run"
 msgstr "Import aus dem Klebezettel-Applet beim ersten Start"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:56
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -455,11 +466,11 @@ msgstr ""
 "Gibt an, dass der Import aus dem Klebezettel-Applet noch nicht ausgeführt "
 "wurde, sodass er automatisch beim nächsten Start von Tomboy ausgeführt wird."
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:57
 msgid "Synchronization Client ID"
 msgstr "Abgleich-Client ID"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:58
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
@@ -467,22 +478,22 @@ msgstr ""
 "Eindeutiger Schlüssel für diesen Tomboy-Client, der für die Kommunikation "
 "mit einem Abgleich-Server verwendet wird."
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Local Server Path"
 msgstr "Lokaler Pfad des Abgleich-Server"
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:60
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
 msgstr ""
 "Pfad zum Abgleich-Server bei Verwendung des Dateisystem-Abgleich-Add-Ins."
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:61
 msgid "Selected Synchronization Service Addin"
 msgstr "Ausgewähltes Abgleich-Add-In"
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:62
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
@@ -490,11 +501,11 @@ msgstr ""
 "Eindeutiger Schlüssel für das momentan konfigurierte Add-In für den Abgleich "
 "der Notizen."
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:63
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "Zeitablauf (ms) das für FUSE-Einhängen"
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:64
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
@@ -502,37 +513,37 @@ msgstr ""
 "Zeit (in Millisekunden), die Tomboy beim Einhängen mittels FUSE einer "
 "Freigabe für den Abgleich warten soll."
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:65
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "Ordner für entfernten SSHFS-Abgleich"
 
-#: ../data/tomboy.schemas.in.h:64
+#: ../data/tomboy.schemas.in.h:66
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr "Pfad auf dem SSH-Server zum Abgleichordner für Tomboy (optional)."
 
-#: ../data/tomboy.schemas.in.h:65
+#: ../data/tomboy.schemas.in.h:67
 msgid "SSHFS Synchronization Server URL"
 msgstr "Server-Adresse für entfernten SSHFS-Abgleich"
 
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:68
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "Adresse des SSH-Servers, der den Abgleichordner für Tomboy beinhaltet."
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:69
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "Benutzername für entfernten SSHFS-Abgleich"
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:70
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr ""
 "Der Benutzername, der beim Verbinden mit einem Abgleichserver über SSH "
 "verwendet wird."
 
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:71
 msgid "SSHFS Synchronization Server Port"
 msgstr "Server-Port für entfernten SSHFS-Abgleich"
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:72
 msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
@@ -541,11 +552,11 @@ msgstr ""
 "wird. Setzen Sie diesen Wert auf -1 oder weniger, falls die vorgegebenen SSH-"
 "Port-Einstellungen benutzt werden sollen."
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:73
 msgid "Accept SSL Certificates"
 msgstr "SSL-Zertifikate akzeptieren"
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:74
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
@@ -553,11 +564,11 @@ msgstr ""
 "wdfs-Option »-ac« zum Akzeptieren von SSL-Zertifikaten ohne Nachfrage beim "
 "Benutzer verwenden."
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:75
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "Gespeichertes Verhalten für Konflikte bei dem Abgleich der Notizen"
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -572,11 +583,11 @@ msgstr ""
 "gemeldet werden soll, so dass von Fall zu Fall entschieden werden kann, wie "
 "mit der Konfliktsituation umgegangen werden soll."
 
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:77
 msgid "Automatic Background Synchronization Timeout"
 msgstr "Zeitüberschreitung beim automatischen Abgleichen im Hintergrund"
 
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:78
 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 "
@@ -589,12 +600,12 @@ msgstr ""
 "niedrigste akzeptable positive Wert ist 5. Der Wert wird in Minuten "
 "angegeben."
 
-#: ../data/tomboy.schemas.in.h:77
+#: ../data/tomboy.schemas.in.h:79
 msgid "Link Updating Behavior on Note Rename"
 msgstr ""
 "Verhalten beim Aktualisieren von Verknüpfungen, wenn Notizen umbenannt werden"
 
-#: ../data/tomboy.schemas.in.h:78
+#: ../data/tomboy.schemas.in.h:80
 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 "
@@ -614,29 +625,29 @@ msgstr ""
 "aktualisiert wird, so dass die Verknüpfung zur umbenannten Notiz wieder "
 "gültig ist."
 
-#: ../data/tomboy.schemas.in.h:79
+#: ../data/tomboy.schemas.in.h:81
 msgid "Timestamp format"
 msgstr "Zeitstempel-Format"
 
-#: ../data/tomboy.schemas.in.h:80
+#: ../data/tomboy.schemas.in.h:82
 msgid "The date format that is used for the timestamp."
 msgstr "Das Datumsformat, das für den Zeitstempel verwendet wird."
 
-#: ../data/tomboy.schemas.in.h:81
+#: ../data/tomboy.schemas.in.h:83
 msgid "Enable closing notes with escape."
 msgstr "Schließen von Notizen mit Escape aktivieren."
 
-#: ../data/tomboy.schemas.in.h:82
+#: ../data/tomboy.schemas.in.h:84
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
 "Wenn aktiviert, kann eine geöffnete Notiz durch Betätigen der Escape-Taste "
 "geschlossen werden."
 
-#: ../data/tomboy.schemas.in.h:83
+#: ../data/tomboy.schemas.in.h:85
 msgid "The handler for \"note://\" URLs"
 msgstr "Die Verarbeitungsroutine für »note://«-Adressen"
 
-#: ../data/tomboy.schemas.in.h:84
+#: ../data/tomboy.schemas.in.h:86
 msgid "Set to TRUE to activate"
 msgstr "Zum Aktivieren auf TRUE setzen"
 
@@ -688,7 +699,7 @@ msgstr "Tomboy beenden"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:63
 msgid "Tomboy Preferences"
 msgstr "Tomboy Einstellungen"
 
@@ -725,14 +736,22 @@ msgid "Start synchronizing notes"
 msgstr "Abgleich der Notizen starten"
 
 #. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:24
 msgid "Advanced"
 msgstr "Erweitert"
 
-#. Menu Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
-msgid "Minimum number of notes to show in Recent list (maximum 18)"
-msgstr "Mindestanzahl der in der Notizliste anzuzeigenden Notizen (maximal 18)"
+#. Menu Min Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:35
+msgid "Minimum number of notes to show in Recent list"
+msgstr ""
+"Mindestanzahl der in der Liste zuletzt verwendeter Dateien anzuzeigenden "
+"Notizen"
+
+#. Menu Max Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:59
+msgid "Maximum number of notes to show in Recent list"
+msgstr ""
+"Höchstzahl der in der Liste zuletzt verwendeter Dateien anzuzeigenden Notizen"
 
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
@@ -819,28 +838,28 @@ msgstr "Alle anderen verknüpften Notizen einschließen"
 msgid "Export to HTML"
 msgstr "In HTML exportieren"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:116
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "Ihre Notiz wurde nach »{0}« exportiert."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:127
 msgid "Note exported successfully"
 msgstr "Notiz wurde erfolgreich exportiert"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 #: ../Tomboy/ExportAllApplicationAddin.cs:250
 #: ../Tomboy/ExportAllApplicationAddin.cs:328
 msgid "Access denied."
 msgstr "Zugriff nicht möglich."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:135
 #: ../Tomboy/ExportAllApplicationAddin.cs:255
 #: ../Tomboy/ExportAllApplicationAddin.cs:333
 msgid "Folder does not exist."
 msgstr "Ordner existiert nicht."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:150
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "Die Datei {0} konnte nicht gespeichert werden."
@@ -888,7 +907,7 @@ msgstr "Zeitstempel einfügen"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:155
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:159
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd, d. MMMM HH:mm"
 
@@ -1352,7 +1371,7 @@ msgid "Delete the selected notebook"
 msgstr "Das ausgewählte Notizbuch löschen"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:276
+#: ../Tomboy/RecentChanges.cs:277
 msgid "Notebooks"
 msgstr "Notizbücher"
 
@@ -1414,28 +1433,28 @@ msgstr "Notizbuch"
 msgid "_New notebook..."
 msgstr "Neues Notiz_buch …"
 
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
+#: ../Tomboy/Note.cs:515
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Neue Notiz {0}"
 
-#: ../Tomboy/Note.cs:1607
+#: ../Tomboy/Note.cs:1678
 #, csharp-format
 msgid "Really delete \"{0}\"?"
 msgstr "Soll »{0}« wirklich gelöscht werden?"
 
-#: ../Tomboy/Note.cs:1610
+#: ../Tomboy/Note.cs:1681
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Diese {0} Notiz wirklich löschen?"
 msgstr[1] "Diese {0} Notizen wirklich löschen?"
 
-#: ../Tomboy/Note.cs:1621
+#: ../Tomboy/Note.cs:1692
 msgid "If you delete a note it is permanently lost."
 msgstr "Ein gelöschte Notiz ist für immer verloren."
 
-#: ../Tomboy/Note.cs:1655
+#: ../Tomboy/Note.cs:1726
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1446,13 +1465,13 @@ msgstr ""
 "Ihnen ausreichend Speicherplatz und die notwendigen Zugriffsrechte auf {0} "
 "zur Verfügung stehen. Details zu dem Fehler finden sich in {1}."
 
-#: ../Tomboy/Note.cs:1671
+#: ../Tomboy/Note.cs:1742
 msgid "Error saving note data."
 msgstr "Fehler beim Speichern der Notizdaten."
 
 #. 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:264
 msgid "New Note Template"
 msgstr "Neue Notizbuchvorlage"
 
@@ -1590,9 +1609,19 @@ msgstr "Hier starten"
 msgid "Using Links in Tomboy"
 msgstr "Verknüpfungen in Tomboy nutzen"
 
+#: ../Tomboy/NoteManager.cs:480
+#, csharp-format
+msgid "Note from {0}"
+msgstr "Notiz von {0}"
+
+#: ../Tomboy/NoteManager.cs:480
+#, fuzzy
+msgid "yyyy-MM-dd HH:mm:ss.fff"
+msgstr "yyyy-MM-dd HH:mm:ss.fff"
+
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:560 ../Tomboy/NoteManager.cs:663
+#: ../Tomboy/NoteManager.cs:559 ../Tomboy/NoteManager.cs:662
 msgid "Describe your new note here."
 msgstr "Beschreiben Sie Ihre neue Notiz hier."
 
@@ -1825,27 +1854,27 @@ msgstr "Schrift verkleinern"
 msgid "Bullets"
 msgstr "Aufzählungspunkte"
 
-#: ../Tomboy/PreferencesDialog.cs:81
+#: ../Tomboy/PreferencesDialog.cs:75
 msgid "Editing"
 msgstr "Bearbeiten"
 
-#: ../Tomboy/PreferencesDialog.cs:84
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Hotkeys"
 msgstr "Tastenkombinationen"
 
-#: ../Tomboy/PreferencesDialog.cs:86
+#: ../Tomboy/PreferencesDialog.cs:80
 msgid "Synchronization"
 msgstr "Abgleichen"
 
-#: ../Tomboy/PreferencesDialog.cs:88
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Add-ins"
 msgstr "Add-Ins"
 
-#: ../Tomboy/PreferencesDialog.cs:174
+#: ../Tomboy/PreferencesDialog.cs:181
 msgid "_Spell check while typing"
 msgstr "_Rechtschreibprüfung während der Eingabe"
 
-#: ../Tomboy/PreferencesDialog.cs:183
+#: ../Tomboy/PreferencesDialog.cs:190
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1854,11 +1883,11 @@ msgstr ""
 "im Kontextmenü angezeigt."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:194
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid "Highlight _WikiWords"
 msgstr "_WikiWords hervorheben"
 
-#: ../Tomboy/PreferencesDialog.cs:202
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1868,31 +1897,31 @@ msgstr ""
 "diesem Namen erstellen."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:209
+#: ../Tomboy/PreferencesDialog.cs:216
 msgid "Enable auto-_bulleted lists"
 msgstr "_Automatische Aufzählungslisten aktivieren"
 
-#: ../Tomboy/PreferencesDialog.cs:218
+#: ../Tomboy/PreferencesDialog.cs:225
 msgid "Use custom _font"
 msgstr "Eigene _Schriftart verwenden"
 
-#: ../Tomboy/PreferencesDialog.cs:236
+#: ../Tomboy/PreferencesDialog.cs:243
 msgid "When renaming a linked note: "
 msgstr "Wenn eine verknüpfte Notiz umbenannt wird:"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:246
 msgid "Ask me what to do"
 msgstr "Immer fragen, was zu tun ist"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:247
 msgid "Never rename links"
 msgstr "Verknüpfungen nie umbenennen"
 
-#: ../Tomboy/PreferencesDialog.cs:241
+#: ../Tomboy/PreferencesDialog.cs:248
 msgid "Always rename links"
 msgstr "Verknüpfungen immer umbenennen"
 
-#: ../Tomboy/PreferencesDialog.cs:261
+#: ../Tomboy/PreferencesDialog.cs:268
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1900,102 +1929,101 @@ msgstr ""
 "Verwenden Sie die Vorlage für neue Notizen, um festzulegen, welcher Text "
 "beim Anlegen einer neuen Notiz verwendet werden soll."
 
-#: ../Tomboy/PreferencesDialog.cs:270
+#: ../Tomboy/PreferencesDialog.cs:277
 msgid "Open New Note Template"
 msgstr "Vorlage für neue Notizen öffnen"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:327
+#: ../Tomboy/PreferencesDialog.cs:334
 msgid "Listen for _Hotkeys"
 msgstr "_Tastenkürzel aktivieren"
 
-#: ../Tomboy/PreferencesDialog.cs:336
+#: ../Tomboy/PreferencesDialog.cs:343
 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>"
+"keypress. Example Hotkeys: <b><ALT>F11</b>, <b><ALT>N</b>"
 msgstr ""
-"Tastenkürzel erlauben schnellen Zugang zu Ihren Notizen über einen "
-"Tastendruck, egal welche Anwendung Sie gerade benutzen. Beispiele für "
-"Tastenkürzel: <b><Strg><Umschalt>F11</b>, <b><Alt>N</b>"
+"Tastenkürzel erlauben jederzeit schnellen Zugang zu Ihren Notizen über einen "
+"Tastendruck. Beispiele für Tastenkürzel: <b><Alt>F11</b>, <b><"
+"Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:356
+#: ../Tomboy/PreferencesDialog.cs:363
 msgid "Show notes _menu"
 msgstr "Notiz_menü anzeigen"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:373
+#: ../Tomboy/PreferencesDialog.cs:380
 msgid "Open \"_Start Here\""
 msgstr "»Hier _starten« öffnen"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:390
+#: ../Tomboy/PreferencesDialog.cs:397
 msgid "Create _new note"
 msgstr "_Neue Notiz anlegen"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:407
+#: ../Tomboy/PreferencesDialog.cs:414
 msgid "Open \"Search _All Notes\""
 msgstr "»_Alle Notizen durchsuchen« öffnen"
 
-#: ../Tomboy/PreferencesDialog.cs:434
+#: ../Tomboy/PreferencesDialog.cs:441
 msgid "Ser_vice:"
 msgstr "_Dienst:"
 
-#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
+#: ../Tomboy/PreferencesDialog.cs:494 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "Nicht konfigurierbar"
 
-#: ../Tomboy/PreferencesDialog.cs:513
+#: ../Tomboy/PreferencesDialog.cs:520
 msgid "Automaticall_y Sync in Background Every"
 msgstr "Auto_matisch im Hintergrund abgleichen alle"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:526
 msgid "Minutes"
 msgstr "Minuten"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:541
+#: ../Tomboy/PreferencesDialog.cs:548
 msgid "_Advanced..."
 msgstr "_Erweitert …"
 
-#: ../Tomboy/PreferencesDialog.cs:602
+#: ../Tomboy/PreferencesDialog.cs:609
 msgid "The following add-ins are installed"
 msgstr "Die folgenden Add-Ins sind installiert"
 
-#: ../Tomboy/PreferencesDialog.cs:623
+#: ../Tomboy/PreferencesDialog.cs:630
 msgid "Get More Add-Ins..."
 msgstr "Weitere Add-Ins …"
 
-#: ../Tomboy/PreferencesDialog.cs:641
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Aktivieren"
 
-#: ../Tomboy/PreferencesDialog.cs:647
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../Tomboy/PreferencesDialog.cs:778
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Nicht implementiert"
 
-#: ../Tomboy/PreferencesDialog.cs:792
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Einstellungen"
 
-#: ../Tomboy/PreferencesDialog.cs:931
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Schriftart der Notizen auswählen"
 
-#: ../Tomboy/PreferencesDialog.cs:975
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Andere Abgleichsoptionen"
 
-#: ../Tomboy/PreferencesDialog.cs:981
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -2003,23 +2031,23 @@ msgstr ""
 "Wenn ein Konflikt zwischen einer lokalen Notiz und einer Notiz auf einem "
 "konfigurierten Abgleich-Server erkannt wird:"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Immer fragen, was zu tun ist."
 
-#: ../Tomboy/PreferencesDialog.cs:992
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Meine lokale Notiz umbenennen."
 
-#: ../Tomboy/PreferencesDialog.cs:996
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Meine lokale Notiz mit der Aktualisierung des Servers ersetzen."
 
-#: ../Tomboy/PreferencesDialog.cs:1142
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: ../Tomboy/PreferencesDialog.cs:1144
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -2028,11 +2056,11 @@ msgstr ""
 "möglicherweise gezwungen, alle Ihre Notizen neu abzugleichen, wenn Sie Ihre "
 "neuen Einstellungen speichern."
 
-#: ../Tomboy/PreferencesDialog.cs:1157
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Abgleichseinstellungen zurücksetzen"
 
-#: ../Tomboy/PreferencesDialog.cs:1159
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -2043,11 +2071,11 @@ msgstr ""
 "gezwungen, alle Ihre Notizen neu abzugleichen, wenn Sie Ihre Einstellungen "
 "neu speichern."
 
-#: ../Tomboy/PreferencesDialog.cs:1237
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Connection successful"
 msgstr "Verbindungsaufbau erfolgreich"
 
-#: ../Tomboy/PreferencesDialog.cs:1239
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -2055,7 +2083,7 @@ msgstr ""
 "Tomboy ist bereit, Ihre Notizen abzugleichen. Möchten Sie diese nun "
 "abgleichen?"
 
-#: ../Tomboy/PreferencesDialog.cs:1262
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
@@ -2064,23 +2092,23 @@ msgstr ""
 "Bitte überprüfen Sie Ihre Informationen und versuchen Sie es erneut. Die "
 "Protokolldatei {0} könnte weitere Informationen zu diesem Fehler enthalten."
 
-#: ../Tomboy/PreferencesDialog.cs:1274
+#: ../Tomboy/PreferencesDialog.cs:1281
 msgid "Error connecting"
 msgstr "Verbindungsfehler"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Version:"
 msgstr "Version:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1377
+#: ../Tomboy/PreferencesDialog.cs:1385
 msgid "Add-in Dependencies:"
 msgstr "Add-In Abhängigkeiten:"
 
@@ -2416,15 +2444,15 @@ msgstr ""
 msgid "Cannot create new note"
 msgstr "Neue Notiz konnte nicht angelegt werden"
 
-#: ../Tomboy/Tomboy.cs:319
+#: ../Tomboy/Tomboy.cs:316
 msgid "Primary Development:"
 msgstr "Hauptentwickler:"
 
-#: ../Tomboy/Tomboy.cs:332
+#: ../Tomboy/Tomboy.cs:329
 msgid "Contributors:"
 msgstr "Mitwirkende:"
 
-#: ../Tomboy/Tomboy.cs:420
+#: ../Tomboy/Tomboy.cs:418
 msgid "translator-credits"
 msgstr ""
 "Philipp Meier <meier at fnogol.de>\n"
@@ -2436,7 +2464,7 @@ msgstr ""
 "Christian Kirbach <Christian.Kirbach at googlemail.com>\n"
 "Daniel Winzen <d at winzen4.de>"
 
-#: ../Tomboy/Tomboy.cs:429
+#: ../Tomboy/Tomboy.cs:427
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2011 Others\n"
@@ -2444,7 +2472,7 @@ msgstr ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2011 Andere\n"
 
-#: ../Tomboy/Tomboy.cs:431
+#: ../Tomboy/Tomboy.cs:429
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "Eine einfache und leicht bedienbare Anwendung für Notizen."
 
@@ -2617,7 +2645,7 @@ msgstr "d. MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(Unbenannt {0})"
 
-#: ../Tomboy/Watchers.cs:189
+#: ../Tomboy/Watchers.cs:186
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -2626,14 +2654,14 @@ msgstr ""
 "Es gibt bereits eine Notiz mit dem Titel <b>{0}</b>. Bitte wählen Sie einen "
 "anderen Namen für diese Notiz."
 
-#: ../Tomboy/Watchers.cs:204
+#: ../Tomboy/Watchers.cs:201
 msgid "Note title taken"
 msgstr "Titel der Notiz übernommen"
 
-#: ../Tomboy/Watchers.cs:601
+#: ../Tomboy/Watchers.cs:605
 msgid "_Copy Link Address"
 msgstr "Link-Adresse _kopieren"
 
-#: ../Tomboy/Watchers.cs:606
+#: ../Tomboy/Watchers.cs:610
 msgid "_Open Link"
 msgstr "Link ö_ffnen"
diff --git a/po/es.po b/po/es.po
index cf6d821..25b5d01 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,8 +12,8 @@ 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: 2013-01-20 01:02+0000\n"
-"PO-Revision-Date: 2013-01-24 16:35+0100\n"
+"POT-Creation-Date: 2013-11-22 17:25+0000\n"
+"PO-Revision-Date: 2013-11-25 16:50+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
 "Language-Team: Español <gnome-es-list at gnome.org>\n"
 "Language: \n"
@@ -206,14 +206,10 @@ msgstr ""
 "notas de Tomboy."
 
 #: ../data/tomboy.schemas.in.h:23
-#| msgid "Minimum number of notes to show in menu"
 msgid "Maximum number of notes to show in menu"
 msgstr "Número máximo de notas que mostrar en el menú"
 
 #: ../data/tomboy.schemas.in.h:24
-#| msgid ""
-#| "Integer determining the minimum number of notes to show in the Tomboy "
-#| "note menu."
 msgid ""
 "Integer determining the maximum number of notes to show in the Tomboy note "
 "menu."
@@ -246,7 +242,9 @@ 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."
 
+#. Enable Startup Notes option
 #: ../data/tomboy.schemas.in.h:29
+#: ../Tomboy/Addins/AdvancedPreferences/EnableStartupNotesPreference.cs:27
 msgid "Enable startup notes"
 msgstr "Activar notas al inicio"
 
@@ -727,19 +725,17 @@ msgid "Start synchronizing notes"
 msgstr "Comenzar a sincronizar las notas"
 
 #. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:26
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:24
 msgid "Advanced"
 msgstr "Avanzadas"
 
 #. Menu Min Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:34
-#| msgid "Minimum number of notes to show in Recent list (maximum 18)"
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:35
 msgid "Minimum number of notes to show in Recent list"
 msgstr "Número mínimo de notas que mostrar en la lista de recientes"
 
 #. Menu Max Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:58
-#| msgid "Minimum number of notes to show in Recent list (maximum 18)"
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:59
 msgid "Maximum number of notes to show in Recent list"
 msgstr "Número máximo de notas que mostrar en la lista de recientes"
 
@@ -826,28 +822,28 @@ msgstr "Incluir todas las notas enlazadas"
 msgid "Export to HTML"
 msgstr "Exportar a HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:116
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "Su nota se exportó a «{0}»."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:127
 msgid "Note exported successfully"
 msgstr "Nota exportada con éxito"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 #: ../Tomboy/ExportAllApplicationAddin.cs:250
 #: ../Tomboy/ExportAllApplicationAddin.cs:328
 msgid "Access denied."
 msgstr "Acceso denegado."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:135
 #: ../Tomboy/ExportAllApplicationAddin.cs:255
 #: ../Tomboy/ExportAllApplicationAddin.cs:333
 msgid "Folder does not exist."
 msgstr "La carpeta no existe."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:150
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "No se pudo guardar el archivo «{0}»"
@@ -1411,28 +1407,28 @@ msgstr "Cuaderno de notas"
 msgid "_New notebook..."
 msgstr "Cuaderno de _notas nuevo…"
 
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
+#: ../Tomboy/Note.cs:515
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Nota nueva {0}"
 
-#: ../Tomboy/Note.cs:1675
+#: ../Tomboy/Note.cs:1678
 #, csharp-format
 msgid "Really delete \"{0}\"?"
 msgstr "¿Quiere eliminar «{0}»?"
 
-#: ../Tomboy/Note.cs:1678
+#: ../Tomboy/Note.cs:1681
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "¿Realmente quiere eliminar esta nota?"
 msgstr[1] "¿Realmente quiere eliminar estas {0} notas?"
 
-#: ../Tomboy/Note.cs:1689
+#: ../Tomboy/Note.cs:1692
 msgid "If you delete a note it is permanently lost."
 msgstr "Si borra esta nota se perderá permanentemente."
 
-#: ../Tomboy/Note.cs:1723
+#: ../Tomboy/Note.cs:1726
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1443,13 +1439,13 @@ msgstr ""
 "espacio en disco y que tiene los permisos apropiados en {0}. Puede encontrar "
 "detalles sobre el error en {1}."
 
-#: ../Tomboy/Note.cs:1739
+#: ../Tomboy/Note.cs:1742
 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:263
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:264
 msgid "New Note Template"
 msgstr "Plantilla de Nota nueva"
 
@@ -1583,9 +1579,19 @@ msgstr "Comenzar aquí"
 msgid "Using Links in Tomboy"
 msgstr "Usando los enlaces en Tomboy"
 
+#: ../Tomboy/NoteManager.cs:480
+#, csharp-format
+#| msgid "New Note {0}"
+msgid "Note from {0}"
+msgstr "Nota desde {0}"
+
+#: ../Tomboy/NoteManager.cs:480
+msgid "yyyy-MM-dd HH:mm:ss.fff"
+msgstr "yyyy-MM-dd HH:mm:ss.fff"
+
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:560 ../Tomboy/NoteManager.cs:663
+#: ../Tomboy/NoteManager.cs:559 ../Tomboy/NoteManager.cs:662
 msgid "Describe your new note here."
 msgstr "Describa aquí su nota nueva."
 
@@ -1817,27 +1823,27 @@ msgstr "Reducir el tamaño de la tipografía"
 msgid "Bullets"
 msgstr "Topos"
 
-#: ../Tomboy/PreferencesDialog.cs:74
+#: ../Tomboy/PreferencesDialog.cs:75
 msgid "Editing"
 msgstr "Edición"
 
-#: ../Tomboy/PreferencesDialog.cs:77
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Hotkeys"
 msgstr "Teclas rápidas"
 
-#: ../Tomboy/PreferencesDialog.cs:79
+#: ../Tomboy/PreferencesDialog.cs:80
 msgid "Synchronization"
 msgstr "Sincronización"
 
-#: ../Tomboy/PreferencesDialog.cs:80
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Add-ins"
 msgstr "Complementos"
 
-#: ../Tomboy/PreferencesDialog.cs:180
+#: ../Tomboy/PreferencesDialog.cs:181
 msgid "_Spell check while typing"
 msgstr "Corrección _ortográfica al escribir"
 
-#: ../Tomboy/PreferencesDialog.cs:189
+#: ../Tomboy/PreferencesDialog.cs:190
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1846,11 +1852,11 @@ msgstr ""
 "las sugerencias de corrección en el menú contextual."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:200
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid "Highlight _WikiWords"
 msgstr "Resaltar _wikipalabras"
 
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1859,31 +1865,31 @@ msgstr ""
 "la palabra se creará una nota con ese nombre."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:215
+#: ../Tomboy/PreferencesDialog.cs:216
 msgid "Enable auto-_bulleted lists"
 msgstr "Activar listas de _topos automáticos"
 
-#: ../Tomboy/PreferencesDialog.cs:224
+#: ../Tomboy/PreferencesDialog.cs:225
 msgid "Use custom _font"
 msgstr "Usar tipogra_fía personalizada"
 
-#: ../Tomboy/PreferencesDialog.cs:242
+#: ../Tomboy/PreferencesDialog.cs:243
 msgid "When renaming a linked note: "
 msgstr "Al renombrar una nota enlazada: "
 
-#: ../Tomboy/PreferencesDialog.cs:245
+#: ../Tomboy/PreferencesDialog.cs:246
 msgid "Ask me what to do"
 msgstr "Preguntarme qué hacer"
 
-#: ../Tomboy/PreferencesDialog.cs:246
+#: ../Tomboy/PreferencesDialog.cs:247
 msgid "Never rename links"
 msgstr "No renombrar nunca los enlaces"
 
-#: ../Tomboy/PreferencesDialog.cs:247
+#: ../Tomboy/PreferencesDialog.cs:248
 msgid "Always rename links"
 msgstr "Siempre renombrar los enlaces"
 
-#: ../Tomboy/PreferencesDialog.cs:267
+#: ../Tomboy/PreferencesDialog.cs:268
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1891,16 +1897,16 @@ msgstr ""
 "Use la plantilla de la nota nueva para especificar el texto que se debe usar "
 "al crear una nota nueva."
 
-#: ../Tomboy/PreferencesDialog.cs:276
+#: ../Tomboy/PreferencesDialog.cs:277
 msgid "Open New Note Template"
 msgstr "Abrir la plantilla Nota nueva"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:333
+#: ../Tomboy/PreferencesDialog.cs:334
 msgid "Listen for _Hotkeys"
 msgstr "_Escuchar las teclas rápidas"
 
-#: ../Tomboy/PreferencesDialog.cs:342
+#: ../Tomboy/PreferencesDialog.cs:343
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><ALT>F11</b>, <b><ALT>N</b>"
@@ -1910,82 +1916,82 @@ msgstr ""
 "<b><Alt>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:362
+#: ../Tomboy/PreferencesDialog.cs:363
 msgid "Show notes _menu"
 msgstr "Mostrar el _menú de notas"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:379
+#: ../Tomboy/PreferencesDialog.cs:380
 msgid "Open \"_Start Here\""
 msgstr "Abrir «Comen_zar aquí»"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:396
+#: ../Tomboy/PreferencesDialog.cs:397
 msgid "Create _new note"
 msgstr "Crear una nota _nueva"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:413
+#: ../Tomboy/PreferencesDialog.cs:414
 msgid "Open \"Search _All Notes\""
 msgstr "Abrir «Buscar en _todas las notas»"
 
-#: ../Tomboy/PreferencesDialog.cs:440
+#: ../Tomboy/PreferencesDialog.cs:441
 msgid "Ser_vice:"
 msgstr "_Servicio:"
 
-#: ../Tomboy/PreferencesDialog.cs:493 ../Tomboy/PreferencesDialog.cs:1112
+#: ../Tomboy/PreferencesDialog.cs:494 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "No configurable"
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:520
 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:525
+#: ../Tomboy/PreferencesDialog.cs:526
 msgid "Minutes"
 msgstr "Minutos"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:547
+#: ../Tomboy/PreferencesDialog.cs:548
 msgid "_Advanced..."
 msgstr "_Avanzado…"
 
-#: ../Tomboy/PreferencesDialog.cs:608
+#: ../Tomboy/PreferencesDialog.cs:609
 msgid "The following add-ins are installed"
 msgstr "Los siguientes complementos están instalados actualmente"
 
-#: ../Tomboy/PreferencesDialog.cs:629
+#: ../Tomboy/PreferencesDialog.cs:630
 msgid "Get More Add-Ins..."
 msgstr "Obtener más complementos…"
 
-#: ../Tomboy/PreferencesDialog.cs:647
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../Tomboy/PreferencesDialog.cs:653
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../Tomboy/PreferencesDialog.cs:784
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "No implementado"
 
-#: ../Tomboy/PreferencesDialog.cs:798
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Preferencias"
 
-#: ../Tomboy/PreferencesDialog.cs:937
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Elegir la tipografía de la nota"
 
-#: ../Tomboy/PreferencesDialog.cs:981
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Otras opciones de sincronización"
 
-#: ../Tomboy/PreferencesDialog.cs:987
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1993,23 +1999,23 @@ msgstr ""
 "Cuando se detecta un conflicto entre una nota local y una nota en el "
 "servidor de sincronización configurado:"
 
-#: ../Tomboy/PreferencesDialog.cs:994
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Preguntarme siempre qué hacer."
 
-#: ../Tomboy/PreferencesDialog.cs:998
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Renombrar mi nota local."
 
-#: ../Tomboy/PreferencesDialog.cs:1002
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Reemplazar mi nota local con la actualización del servidor."
 
-#: ../Tomboy/PreferencesDialog.cs:1148
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: ../Tomboy/PreferencesDialog.cs:1150
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -2017,11 +2023,11 @@ 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:1163
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Reiniciando los ajustes de sincronización"
 
-#: ../Tomboy/PreferencesDialog.cs:1165
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -2031,11 +2037,11 @@ msgstr ""
 "sincronización se limpiarán. Quizá se vea forzado a sincronizar todas sus "
 "notas de nuevo cuando guarde los ajustes nuevos."
 
-#: ../Tomboy/PreferencesDialog.cs:1243
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Connection successful"
 msgstr "Conectado correctamente"
 
-#: ../Tomboy/PreferencesDialog.cs:1245
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -2043,7 +2049,7 @@ msgstr ""
 "Tomboy está preparado para sincronizar sus notas. ¿Quiere sincronizarlas "
 "ahora?"
 
-#: ../Tomboy/PreferencesDialog.cs:1268
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
@@ -2052,23 +2058,23 @@ msgstr ""
 "Compruebe su información e inténtelo de nuevo. El archivo {0} puede contener "
 "información útil sobre el error."
 
-#: ../Tomboy/PreferencesDialog.cs:1280
+#: ../Tomboy/PreferencesDialog.cs:1281
 msgid "Error connecting"
 msgstr "Error al conectar"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1384
+#: ../Tomboy/PreferencesDialog.cs:1385
 msgid "Add-in Dependencies:"
 msgstr "Dependencias de los complementos:"
 
@@ -2430,11 +2436,11 @@ 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:439
+#: ../Tomboy/Tomboy.cs:441
 msgid "Homepage"
 msgstr "Página web"
 
-#: ../Tomboy/Tomboy.cs:575
+#: ../Tomboy/Tomboy.cs:577
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright © 2004-2007 Alex Graveley\n"
@@ -2449,7 +2455,7 @@ msgstr ""
 "\n"
 "Copyright © 2004-2011 Otros\n"
 
-#: ../Tomboy/Tomboy.cs:589
+#: ../Tomboy/Tomboy.cs:591
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -2465,7 +2471,7 @@ msgstr ""
 "  --search [texto]\t\tAbre la ventana de búsqueda de todas las notas con el "
 "texto buscado.\n"
 
-#: ../Tomboy/Tomboy.cs:599
+#: ../Tomboy/Tomboy.cs:601
 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"
@@ -2481,7 +2487,7 @@ msgstr ""
 "  --highlight-search [texto]\tBuscar y resaltar texto coincidente en la nota "
 "abierta\n"
 
-#: ../Tomboy/Tomboy.cs:609
+#: ../Tomboy/Tomboy.cs:611
 msgid ""
 "  --addin:html-export-all [path]\tExports all notes to HTML in the given "
 "location.\n"
@@ -2493,7 +2499,7 @@ msgstr ""
 "  --addin:html-export-all-quit [ruta]\tExporta a HTML todas la notas de una "
 "ubicación dada y sale del programa.\n"
 
-#: ../Tomboy/Tomboy.cs:619
+#: ../Tomboy/Tomboy.cs:621
 #, csharp-format
 msgid "Version {0}"
 msgstr "Versión {0}"
@@ -2602,7 +2608,7 @@ msgstr "d MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(Sin título {0})"
 
-#: ../Tomboy/Watchers.cs:189
+#: ../Tomboy/Watchers.cs:186
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -2611,15 +2617,15 @@ 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
+#: ../Tomboy/Watchers.cs:201
 msgid "Note title taken"
 msgstr "El título de la nota ya existe"
 
-#: ../Tomboy/Watchers.cs:608
+#: ../Tomboy/Watchers.cs:605
 msgid "_Copy Link Address"
 msgstr "_Copiar la dirección del enlace"
 
-#: ../Tomboy/Watchers.cs:613
+#: ../Tomboy/Watchers.cs:610
 msgid "_Open Link"
 msgstr "_Abrir enlace"
 
diff --git a/po/gl.po b/po/gl.po
index 24a8753..794729f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,13 +7,13 @@
 # Antón Méixome <meixome at mancomun.org>, 2009.
 # Francisco Diéguez <frandieguez at ubuntu.com>, 2010.
 # Fran Diéguez <frandieguez at gnome.org>, 2010, 2011.
-# Fran Dieguez <frandieguez at gnome.org>, 2009, 2011, 2012.
+# Fran Dieguez <frandieguez at gnome.org>, 2009, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy-master-po-gl-54142\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-11 18:55+0100\n"
-"PO-Revision-Date: 2012-11-11 18:56+0200\n"
+"POT-Creation-Date: 2013-08-02 16:08+0200\n"
+"PO-Revision-Date: 2013-08-02 16:09+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez at gnome.org>\n"
 "Language-Team: gnome-l10n-gl at gnome.org\n"
 "Language: gl\n"
@@ -28,7 +28,7 @@ msgid "Tomboy Applet Factory"
 msgstr "Factoría de miniaplicativos Tomboy"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:2 ../data/tomboy.desktop.in.h:1
-#: ../Tomboy/Tray.cs:579
+#: ../Tomboy/Tray.cs:581
 msgid "Tomboy Notes"
 msgstr "Notas do Tomboy"
 
@@ -206,10 +206,22 @@ msgstr ""
 "Tomboy."
 
 #: ../data/tomboy.schemas.in.h:23
+msgid "Maximum number of notes to show in menu"
+msgstr "Número máximo de notas a mostrar no menú"
+
+#: ../data/tomboy.schemas.in.h:24
+msgid ""
+"Integer determining the maximum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"Enteiro determinando o número máximo de notas a mostrar no menú de notas de "
+"Tomboy."
+
+#: ../data/tomboy.schemas.in.h:25
 msgid "List of pinned notes."
 msgstr "Lista de notas pinchadas."
 
-#: ../data/tomboy.schemas.in.h:24
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -217,11 +229,11 @@ msgstr ""
 "Lista separada por espazos en branco de URIs de notas para as notas que "
 "deberían aparecer no menú de notas de Tomboy."
 
-#: ../data/tomboy.schemas.in.h:25
+#: ../data/tomboy.schemas.in.h:27
 msgid "Maximum note title length to show in tray menu."
 msgstr "Número mínimo de notas a mostrar no menú da bandexa"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:28
 msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
@@ -229,11 +241,13 @@ msgstr ""
 "Número de caracteres máximo a mostrar no título da nota na bandexa do Tomboy "
 "ou no menú de nota do miniaplicativo do panel."
 
-#: ../data/tomboy.schemas.in.h:27
+#. Enable Startup Notes option
+#: ../data/tomboy.schemas.in.h:29
+#: ../Tomboy/Addins/AdvancedPreferences/EnableStartupNotesPreference.cs:27
 msgid "Enable startup notes"
 msgstr "Activar notas ao inicio"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -241,11 +255,11 @@ msgstr ""
 "Se escolle esta opción, todas as notas que estaban abertas cando se pechou "
 "Tomboy, abriranse automaticamente ao inicio."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:31
 msgid "Show applet menu"
 msgstr "Mostrar o menú de miniaplicativos"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../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 "
@@ -261,11 +275,11 @@ msgstr ""
 "opción de cadea especial \"desactivada\", entón non haberá combinación de "
 "teclas para esta acción."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:33
 msgid "Open Start Here"
 msgstr "Abrir comezar aquí"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -280,11 +294,11 @@ msgstr ""
 "«<Ctl>» e «<Ctrl>». Se activa a opción de cadea especial "
 "\"desactivada\", entón non haberá combinación de teclas para esta acción."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:35
 msgid "Create a new Note"
 msgstr "Crear unha nota nova"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "The global keybinding for creating and displaying a new Note. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -300,11 +314,11 @@ msgstr ""
 "cadea especial \"desactivada\", entón non haberá combinación de teclas para "
 "esta acción."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:37
 msgid "Open Search Dialog"
 msgstr "Abrir a caixa de diálogo de busca"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:38
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -320,11 +334,11 @@ msgstr ""
 "cadea especial \"desactivada\", entón non haberá combinación de teclas para "
 "esta acción."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:39
 msgid "Open Recent Changes"
 msgstr "Abrir os cambios recentes"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:40
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -340,11 +354,11 @@ msgstr ""
 "cadea especial \"desactivada\", entón non haberá combinación de teclas para "
 "esta acción."
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:41
 msgid "Saved height of \"Search All Notes\" window"
 msgstr "Altura gardada da xanela «Buscar en tódalas notas»"
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:42
 msgid ""
 "Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -352,22 +366,22 @@ msgstr ""
 "Determina a altura en píxeles da xanela «Buscar en tódalas notas», Tomboy "
 "almacénaa ao saír."
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:43
 msgid "Saved width of \"Search All Notes\" window"
 msgstr "Anchura gardada da xanela «Buscar en tódalas notas»"
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:44
 msgid ""
 "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
 "Determina a anchura en píxeles da xanela «Buscar en tódalas notas», Tomboy "
 "almacénaa ao saír."
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:45
 msgid "Saved horizontal position of \"Search All Notes\" window"
 msgstr "Posición horizontal gardada da xanela «Buscar en tódalas notas»"
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:46
 msgid ""
 "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -375,11 +389,11 @@ msgstr ""
 "Determina a coordenada X da xanela «Buscar en tódalas notas», Tomboy "
 "almacénaa ao saír."
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:47
 msgid "Saved vertical position of \"Search All Notes\" window"
 msgstr "Posición vertical gardada da xanela «Buscar en tódalas notas»"
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:48
 msgid ""
 "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -387,22 +401,22 @@ msgstr ""
 "Determina a coordenada Y da xanela «Buscar en tódalas notas», Tomboy "
 "almacénaa ao saír."
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:49
 msgid "Last Directory used in HTML Export"
 msgstr "Último cartafol usado no Exportado HTML"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:50
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
 "O último directorio onde se exportou unha nota usando o engadido Exportar a "
 "HTML."
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:51
 msgid "HTML Export Linked Notes"
 msgstr "Exportar as notas ligadas en HTML"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:52
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
@@ -410,11 +424,11 @@ msgstr ""
 "A última configuración da caixa de verificación para 'Exportar as notas "
 "ligadas' no engadido Exportar a HTML."
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:53
 msgid "HTML Export All Linked Notes"
 msgstr "Exportar todas as notas ligadas en HTML"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:54
 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 "
@@ -426,11 +440,11 @@ msgstr ""
 "notas ligadas a HTML' e úsase para especificar se todas as notas (atopadas "
 "recursivamente) deberían ser incluídas durante a exportación a HTML."
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:55
 msgid "Sticky Note Importer First Run"
 msgstr "Primeira execución do importador de notas persistentes"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:56
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -439,11 +453,11 @@ msgstr ""
 "así que debería executarse automaticamente a próxima vez que o Tomboy se "
 "inicie."
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:57
 msgid "Synchronization Client ID"
 msgstr "ID do cliente de sincronización"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:58
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
@@ -451,11 +465,11 @@ msgstr ""
 "Identificador único para este cliente Tomboy, usado ao comunicar cun servizo "
 "de sincronización."
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Local Server Path"
 msgstr "Ruta ao servidor local de sincronización"
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:60
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
@@ -463,11 +477,11 @@ msgstr ""
 "Ruta ao servidor de sincronización cando se use o engadido do servizo de "
 "sincronización de sistema de ficheiros."
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:61
 msgid "Selected Synchronization Service Addin"
 msgstr "Seleccione o engadido do servizo de sincronización"
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:62
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
@@ -475,11 +489,11 @@ msgstr ""
 "Identificador único para o engadido configurado do servizo de sincronización "
 "de notas."
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:63
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "Tempo límite de montaxe FUSE (en ms)"
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:64
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
@@ -487,39 +501,39 @@ msgstr ""
 "O tempo (en milisegundos) que Tomboy debe agardar pola mensaxe ao empregar "
 "FUSE para montar o cartafol compartido de sincronización."
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:65
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "Cartafol para a sincronización remota mediante SSHFS"
 
-#: ../data/tomboy.schemas.in.h:64
+#: ../data/tomboy.schemas.in.h:66
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr ""
 "Ruta no servidor SSH do cartafol de sincronización de Tomboy (opcional)."
 
-#: ../data/tomboy.schemas.in.h:65
+#: ../data/tomboy.schemas.in.h:67
 msgid "SSHFS Synchronization Server URL"
 msgstr "O URL do servidor para a sincronización mediante SSHFS"
 
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:68
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr ""
 "O URL do servidor SSH que contén o cartafol de sincronización de Tomboy."
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:69
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "Nome de usuario para a sincronización remota mediante SSHFS"
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:70
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr ""
 "O nome de usuario a empregar ao conectar co servidor de sincronización "
 "mediante SSH."
 
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:71
 msgid "SSHFS Synchronization Server Port"
 msgstr "Porto do servidor para a sincronización mediante SSHFS"
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:72
 msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
@@ -528,11 +542,11 @@ msgstr ""
 "Establézao a -1 ou menos se quere que se empreguen as configuracións de "
 "porto SSH predeterminadas."
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:73
 msgid "Accept SSL Certificates"
 msgstr "Aceptar certificados SSL"
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:74
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
@@ -540,11 +554,11 @@ msgstr ""
 "Emprega a opción wdfs «-ac» para aceptar os certificados SSL sen preguntar "
 "ao usuario."
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:75
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "Comportamento predeterminado para conflitos de sincronización de notas"
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -558,11 +572,11 @@ msgstr ""
 "usuario desexa ser preguntado cando suceda un conflito, de tal maneira que o "
 "usuario manexará cada situación de conflito caso por caso."
 
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:77
 msgid "Automatic Background Synchronization Timeout"
 msgstr "Tempo de espera de sincronización automática en segundo plano"
 
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:78
 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 "
@@ -575,11 +589,11 @@ msgstr ""
 "desactivada. O valor positivo aceptábel máis pequeno é 5. O valor está en "
 "minutos."
 
-#: ../data/tomboy.schemas.in.h:77
+#: ../data/tomboy.schemas.in.h:79
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Comportamento da actualización de ligazóns no renomeado de notas"
 
-#: ../data/tomboy.schemas.in.h:78
+#: ../data/tomboy.schemas.in.h:80
 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 "
@@ -595,29 +609,29 @@ msgstr ""
 "usuario desexa ser preguntado cando suceda un conflito, de tal maneira que o "
 "usuario manexará cada situación de conflito caso por caso."
 
-#: ../data/tomboy.schemas.in.h:79
+#: ../data/tomboy.schemas.in.h:81
 msgid "Timestamp format"
 msgstr "Formato da marca de tempo"
 
-#: ../data/tomboy.schemas.in.h:80
+#: ../data/tomboy.schemas.in.h:82
 msgid "The date format that is used for the timestamp."
 msgstr "O formato da data que se usa para marca de tempo"
 
-#: ../data/tomboy.schemas.in.h:81
+#: ../data/tomboy.schemas.in.h:83
 msgid "Enable closing notes with escape."
 msgstr "Activar pechar notas con escape."
 
-#: ../data/tomboy.schemas.in.h:82
+#: ../data/tomboy.schemas.in.h:84
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
 "Se escolle esta opción, unha nota aberta pódese pechar premendo a tecla "
 "escape."
 
-#: ../data/tomboy.schemas.in.h:83
+#: ../data/tomboy.schemas.in.h:85
 msgid "The handler for \"note://\" URLs"
 msgstr "O manipulador para os URL «note://»"
 
-#: ../data/tomboy.schemas.in.h:84
+#: ../data/tomboy.schemas.in.h:86
 msgid "Set to TRUE to activate"
 msgstr "Estabelecer a TRUE para activar"
 
@@ -706,14 +720,19 @@ msgid "Start synchronizing notes"
 msgstr "Comezar a sincronizar notas"
 
 #. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:24
 msgid "Advanced"
 msgstr "Avanzado"
 
-#. 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 para mostrar na lista de recentes (máximo 18)"
+#. Menu Min Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:35
+msgid "Minimum number of notes to show in Recent list"
+msgstr "Número mínimo de notas para mostrar na lista de recentes"
+
+#. Menu Max Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:59
+msgid "Maximum number of notes to show in Recent list"
+msgstr "Número máximo de notas para mostrar na lista de recentes"
 
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
@@ -797,28 +816,28 @@ msgstr "Incluír todas as notas ligadas"
 msgid "Export to HTML"
 msgstr "Exportar a HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:116
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "A túa nota foi exportada a «{0}»."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:127
 msgid "Note exported successfully"
 msgstr "Nota exportada satisfactoriamente"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 #: ../Tomboy/ExportAllApplicationAddin.cs:250
 #: ../Tomboy/ExportAllApplicationAddin.cs:328
 msgid "Access denied."
 msgstr "Acceso denegado."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:135
 #: ../Tomboy/ExportAllApplicationAddin.cs:255
 #: ../Tomboy/ExportAllApplicationAddin.cs:333
 msgid "Folder does not exist."
 msgstr "O cartafol non existe."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:150
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "Non foi posíbel gardar o ficheiro «{0}»"
@@ -864,7 +883,7 @@ msgstr "Inserir marca de tempo"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:155
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:159
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd, d MMMM, HH:mm"
 
@@ -1321,7 +1340,7 @@ msgid "Delete the selected notebook"
 msgstr "Eliminar o carderno seleccionado"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:276
+#: ../Tomboy/RecentChanges.cs:277
 msgid "Notebooks"
 msgstr "Cadernos"
 
@@ -1388,23 +1407,23 @@ msgstr "_Novo caderno…"
 msgid "New Note {0}"
 msgstr "Nota nova {0}"
 
-#: ../Tomboy/Note.cs:1607
+#: ../Tomboy/Note.cs:1678
 #, csharp-format
 msgid "Really delete \"{0}\"?"
 msgstr "Ten certeza que quere eliminar esta «{0}»?"
 
-#: ../Tomboy/Note.cs:1610
+#: ../Tomboy/Note.cs:1681
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Está seguro de que quere eliminar esta {0} nota?"
 msgstr[1] "Está seguro de que quere eliminar estas {0} notas?"
 
-#: ../Tomboy/Note.cs:1621
+#: ../Tomboy/Note.cs:1692
 msgid "If you delete a note it is permanently lost."
 msgstr "Se elimina unha nota perderase permanentemente."
 
-#: ../Tomboy/Note.cs:1655
+#: ../Tomboy/Note.cs:1726
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1415,13 +1434,13 @@ msgstr ""
 "espazo no disco e que ten os permisos axeitados en {0}. Os detalles do erro "
 "pódeos atopar en {1}."
 
-#: ../Tomboy/Note.cs:1671
+#: ../Tomboy/Note.cs:1742
 msgid "Error saving note data."
 msgstr "Produciuse un erro ao gardar os datos da nota."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:263
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:264
 msgid "New Note Template"
 msgstr "Modelo de nota nova"
 
@@ -1787,27 +1806,27 @@ msgstr "Diminuír o tamaño do tipo de letra"
 msgid "Bullets"
 msgstr "Viñetas"
 
-#: ../Tomboy/PreferencesDialog.cs:74
+#: ../Tomboy/PreferencesDialog.cs:75
 msgid "Editing"
 msgstr "Editando"
 
-#: ../Tomboy/PreferencesDialog.cs:77
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Hotkeys"
 msgstr "Teclas rápidas"
 
-#: ../Tomboy/PreferencesDialog.cs:79
+#: ../Tomboy/PreferencesDialog.cs:80
 msgid "Synchronization"
 msgstr "Sincronización"
 
-#: ../Tomboy/PreferencesDialog.cs:80
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Add-ins"
 msgstr "Engadidos"
 
-#: ../Tomboy/PreferencesDialog.cs:180
+#: ../Tomboy/PreferencesDialog.cs:181
 msgid "_Spell check while typing"
 msgstr "_Verificar a ortografía mentres se escribe"
 
-#: ../Tomboy/PreferencesDialog.cs:189
+#: ../Tomboy/PreferencesDialog.cs:190
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1816,11 +1835,11 @@ msgstr ""
 "menú contextual."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:200
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid "Highlight _WikiWords"
 msgstr "_Realzar as palabras _wiki"
 
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1829,31 +1848,31 @@ msgstr ""
 "rato na palabra crearase outra nota con ese nome."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:215
+#: ../Tomboy/PreferencesDialog.cs:216
 msgid "Enable auto-_bulleted lists"
 msgstr "Activar listas de _topos automáticos"
 
-#: ../Tomboy/PreferencesDialog.cs:224
+#: ../Tomboy/PreferencesDialog.cs:225
 msgid "Use custom _font"
 msgstr "Usar tipo de letra _personalizado"
 
-#: ../Tomboy/PreferencesDialog.cs:242
+#: ../Tomboy/PreferencesDialog.cs:243
 msgid "When renaming a linked note: "
 msgstr "Ao renomear unha nota ligada: "
 
-#: ../Tomboy/PreferencesDialog.cs:245
+#: ../Tomboy/PreferencesDialog.cs:246
 msgid "Ask me what to do"
 msgstr "Preguntarme sempre que facer"
 
-#: ../Tomboy/PreferencesDialog.cs:246
+#: ../Tomboy/PreferencesDialog.cs:247
 msgid "Never rename links"
 msgstr "Non renomear as ligazóns nunca"
 
-#: ../Tomboy/PreferencesDialog.cs:247
+#: ../Tomboy/PreferencesDialog.cs:248
 msgid "Always rename links"
 msgstr "Renomear as ligazóns sempre"
 
-#: ../Tomboy/PreferencesDialog.cs:267
+#: ../Tomboy/PreferencesDialog.cs:268
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1861,101 +1880,101 @@ msgstr ""
 "Usar o modelo da nota nova para especificar o texto que se debe usar ao "
 "crear unha nova nota."
 
-#: ../Tomboy/PreferencesDialog.cs:276
+#: ../Tomboy/PreferencesDialog.cs:277
 msgid "Open New Note Template"
 msgstr "Abrir o modelo de nota nova"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:333
+#: ../Tomboy/PreferencesDialog.cs:334
 msgid "Listen for _Hotkeys"
 msgstr "Escoitar as _teclas rápidas"
 
-#: ../Tomboy/PreferencesDialog.cs:342
+#: ../Tomboy/PreferencesDialog.cs:343
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><ALT>F11</b>, <b><ALT>N</b>"
 msgstr ""
 "As teclas rápidas permítenlle acceder rapidamente as súas notas desde "
-"calquer parte cunha pulsación de tecla. Exemplo de teclas rápidas: "
-"<b><Alt>F11</b>, <b><Alt>N</b>"
+"calquer parte cunha pulsación de tecla. Exemplo de teclas rápidas: <b><"
+"Alt>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:362
+#: ../Tomboy/PreferencesDialog.cs:363
 msgid "Show notes _menu"
 msgstr "Mostrar o _menú de notas"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:379
+#: ../Tomboy/PreferencesDialog.cs:380
 msgid "Open \"_Start Here\""
 msgstr "Abrir \"_Comezar aquí\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:396
+#: ../Tomboy/PreferencesDialog.cs:397
 msgid "Create _new note"
 msgstr "Crear unha _nova nota"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:413
+#: ../Tomboy/PreferencesDialog.cs:414
 msgid "Open \"Search _All Notes\""
 msgstr "Abrir \"Buscar _todas as notas\""
 
-#: ../Tomboy/PreferencesDialog.cs:440
+#: ../Tomboy/PreferencesDialog.cs:441
 msgid "Ser_vice:"
 msgstr "Ser_vizo:"
 
-#: ../Tomboy/PreferencesDialog.cs:493 ../Tomboy/PreferencesDialog.cs:1112
+#: ../Tomboy/PreferencesDialog.cs:494 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "Non configurábel"
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:520
 msgid "Automaticall_y Sync in Background Every"
 msgstr "_Sincronizar automaticamente en segundo plano cada"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:525
+#: ../Tomboy/PreferencesDialog.cs:526
 msgid "Minutes"
 msgstr "Minutos"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:547
+#: ../Tomboy/PreferencesDialog.cs:548
 msgid "_Advanced..."
 msgstr "_Avanzado…"
 
-#: ../Tomboy/PreferencesDialog.cs:608
+#: ../Tomboy/PreferencesDialog.cs:609
 msgid "The following add-ins are installed"
 msgstr "Actualmente están instalados os seguintes engadidos"
 
-#: ../Tomboy/PreferencesDialog.cs:629
+#: ../Tomboy/PreferencesDialog.cs:630
 msgid "Get More Add-Ins..."
 msgstr "Obter máis engadidos…"
 
-#: ../Tomboy/PreferencesDialog.cs:647
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../Tomboy/PreferencesDialog.cs:653
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../Tomboy/PreferencesDialog.cs:784
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Sen implementar"
 
-#: ../Tomboy/PreferencesDialog.cs:798
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Preferencias"
 
-#: ../Tomboy/PreferencesDialog.cs:937
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Escoller o tipo de letra das notas"
 
-#: ../Tomboy/PreferencesDialog.cs:981
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Outras opcións de sincronización"
 
-#: ../Tomboy/PreferencesDialog.cs:987
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1963,23 +1982,23 @@ msgstr ""
 "Cando se detecta un conflito entre unha nota local e unha nota no servidor "
 "de sincronización configurado:"
 
-#: ../Tomboy/PreferencesDialog.cs:994
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Preguntarme sempre que facer."
 
-#: ../Tomboy/PreferencesDialog.cs:998
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Renomear a miña nota local."
 
-#: ../Tomboy/PreferencesDialog.cs:1002
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Substituír a miña nota local coa actualización do servidor."
 
-#: ../Tomboy/PreferencesDialog.cs:1148
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "Are you sure?"
 msgstr "Está seguro?"
 
-#: ../Tomboy/PreferencesDialog.cs:1150
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1988,11 +2007,11 @@ msgstr ""
 "forzado a sincronizar todas as súas notas de novo cando garde a nova "
 "configuración."
 
-#: ../Tomboy/PreferencesDialog.cs:1163
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Reiniciando os axustes de sincronización"
 
-#: ../Tomboy/PreferencesDialog.cs:1165
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -2002,11 +2021,11 @@ msgstr ""
 "de sincronización limparase. Quizais véxase forzado a sincronizar todas as "
 "súas notas de novo cando garde a nova configuración"
 
-#: ../Tomboy/PreferencesDialog.cs:1243
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Connection successful"
 msgstr "Conexión estabelecida con éxito"
 
-#: ../Tomboy/PreferencesDialog.cs:1245
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -2014,7 +2033,7 @@ msgstr ""
 "Tomboy está preparado para sincronizar as súas notas. Quere sincronizalas "
 "agora?"
 
-#: ../Tomboy/PreferencesDialog.cs:1268
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
@@ -2023,23 +2042,23 @@ msgstr ""
 "Comprobe a súa información e ténteo de novo.  O ficheiro de rexistro {0} "
 "debe conter máis información sobre o erro."
 
-#: ../Tomboy/PreferencesDialog.cs:1280
+#: ../Tomboy/PreferencesDialog.cs:1281
 msgid "Error connecting"
 msgstr "Produciuse un erro ao conectar"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Copyright:"
 msgstr "Dereitos de autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1384
+#: ../Tomboy/PreferencesDialog.cs:1385
 msgid "Add-in Dependencies:"
 msgstr "Dependencias dos engadidos:"
 
@@ -2401,11 +2420,11 @@ msgstr ""
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "Un aplicativo sinxelo e fácil de usar para tomar notas no escritorio."
 
-#: ../Tomboy/Tomboy.cs:439
+#: ../Tomboy/Tomboy.cs:441
 msgid "Homepage"
 msgstr "Páxina de inicio"
 
-#: ../Tomboy/Tomboy.cs:575
+#: ../Tomboy/Tomboy.cs:577
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright © 2004-2007 Alex Graveley\n"
@@ -2421,7 +2440,7 @@ msgstr ""
 "\n"
 "Copyright © 2004-2011 Otros\n"
 
-#: ../Tomboy/Tomboy.cs:589
+#: ../Tomboy/Tomboy.cs:591
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -2436,7 +2455,7 @@ msgstr ""
 "  --search [texto]\t\tAbre a xanela buscar en todas as notas co texto a "
 "buscar.\n"
 
-#: ../Tomboy/Tomboy.cs:599
+#: ../Tomboy/Tomboy.cs:601
 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"
@@ -2451,7 +2470,7 @@ msgstr ""
 "  --highlight-search [texto]\tBuscar e realzar o texto coincidente na nota "
 "aberta.\n"
 
-#: ../Tomboy/Tomboy.cs:609
+#: ../Tomboy/Tomboy.cs:611
 msgid ""
 "  --addin:html-export-all [path]\tExports all notes to HTML in the given "
 "location.\n"
@@ -2463,7 +2482,7 @@ msgstr ""
 "  --addin:html-export-all-quit [path]\tExporta todas as notas a HTML na "
 "localización fornecida e logo sae.\n"
 
-#: ../Tomboy/Tomboy.cs:619
+#: ../Tomboy/Tomboy.cs:621
 #, csharp-format
 msgid "Version {0}"
 msgstr "Versión {0}"
@@ -2572,7 +2591,7 @@ msgstr "d MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(Sen título {0})"
 
-#: ../Tomboy/Watchers.cs:189
+#: ../Tomboy/Watchers.cs:186
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -2581,15 +2600,15 @@ msgstr ""
 "Xa existe unha nota co título <b>{0}</b>. Escolla outro nome para esta nota "
 "antes de continuar."
 
-#: ../Tomboy/Watchers.cs:204
+#: ../Tomboy/Watchers.cs:201
 msgid "Note title taken"
 msgstr "O título da nota xa existe"
 
-#: ../Tomboy/Watchers.cs:601
+#: ../Tomboy/Watchers.cs:605
 msgid "_Copy Link Address"
 msgstr "_Copiar a ligazón do enderezo"
 
-#: ../Tomboy/Watchers.cs:606
+#: ../Tomboy/Watchers.cs:610
 msgid "_Open Link"
 msgstr "_Abrir a ligazón"
 
diff --git a/po/id.po b/po/id.po
index 77c9e58..a6f6e95 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,29 +2,29 @@
 # 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, 2010, 2011, 2012.
+# Andika Triwidada <andika at gmail.com>, 2009-2013.
 # 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: 2012-09-08 16:10+0000\n"
-"PO-Revision-Date: 2012-09-08 23:15+0700\n"
+"POT-Creation-Date: 2013-10-08 14:36+0000\n"
+"PO-Revision-Date: 2013-10-13 16:42+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Tomboy Applet Factory"
 msgstr "Pabrik Aplet Tomboy"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:2 ../data/tomboy.desktop.in.h:1
-#: ../Tomboy/Tray.cs:579
+#: ../Tomboy/Tray.cs:581
 msgid "Tomboy Notes"
 msgstr "Tomboy Catatan"
 
@@ -201,10 +201,22 @@ msgstr ""
 "menu catatan Tomboy."
 
 #: ../data/tomboy.schemas.in.h:23
+msgid "Maximum number of notes to show in menu"
+msgstr "Cacah maksimum catatan yang ditampilkan di menu"
+
+#: ../data/tomboy.schemas.in.h:24
+msgid ""
+"Integer determining the maximum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"Bilangan bulat yang menentukan cacah maksimum catatan yang ditampilkan di "
+"menu catatan Tomboy."
+
+#: ../data/tomboy.schemas.in.h:25
 msgid "List of pinned notes."
 msgstr "Daftar catatan yang dipatok."
 
-#: ../data/tomboy.schemas.in.h:24
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -212,11 +224,11 @@ msgstr ""
 "Daftar yang dipisah dengan whitespace dari URI catatan bagi catatan yang "
 "mesti selalu tampil di menu catatan Tomboy."
 
-#: ../data/tomboy.schemas.in.h:25
+#: ../data/tomboy.schemas.in.h:27
 msgid "Maximum note title length to show in tray menu."
 msgstr "Panjang judul catatan maksimum untuk ditampilkan di menu baki."
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:28
 msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
@@ -224,11 +236,13 @@ msgstr ""
 "Cacah karakter maksimum dari judul catatan yang ditampilkan pada menu "
 "catatan aplet panel atau baki Tomboy."
 
-#: ../data/tomboy.schemas.in.h:27
+#. Enable Startup Notes option
+#: ../data/tomboy.schemas.in.h:29
+#: ../Tomboy/Addins/AdvancedPreferences/EnableStartupNotesPreference.cs:27
 msgid "Enable startup notes"
 msgstr "Aktifkan catatan awal"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -236,11 +250,11 @@ msgstr ""
 "Bila difungsikan, semua catatan yang terbuka ketika Tomboy keluar akan "
 "otomatis dibuka ulang saat mulai."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:31
 msgid "Show applet menu"
 msgstr "Tampilkan menu aplet"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../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 "
@@ -255,11 +269,11 @@ msgstr ""
 "\"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata "
 "khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:33
 msgid "Open Start Here"
 msgstr "Buka Mulai Disini"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -274,11 +288,11 @@ msgstr ""
 "\"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata "
 "khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:35
 msgid "Create a new Note"
 msgstr "Membuat catatan baru"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "The global keybinding for creating and displaying a new Note. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -294,11 +308,11 @@ msgstr ""
 "pilihan ke kata khusus \"disabled\", maka tidak akan ada keybinding untuk "
 "aksi ini."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:37
 msgid "Open Search Dialog"
 msgstr "Buka Dialog Pencarian"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:38
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -313,11 +327,11 @@ msgstr ""
 "\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata khusus \"disabled"
 "\", maka tidak akan ada keybinding untuk aksi ini."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:39
 msgid "Open Recent Changes"
 msgstr "Buka Perubahan Terkini"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:40
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -332,11 +346,11 @@ msgstr ""
 "\"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata "
 "khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:41
 msgid "Saved height of \"Search All Notes\" window"
 msgstr "Tinggi tersimpan jendela \"Cari Semua Catatan\""
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:42
 msgid ""
 "Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -344,22 +358,22 @@ msgstr ""
 "Menentukan tinggi dalam piksel dari jendela \"Cari Semua Catatan\"; disimpan "
 "ketika Tomboy keluar."
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:43
 msgid "Saved width of \"Search All Notes\" window"
 msgstr "Lebar tersimpan jendela \"Cari Semua Catatan\""
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:44
 msgid ""
 "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
 "Menentukan lebar dalam piksel dari jendela \"Cari Semua Catatan\"; disimpan "
 "ketika Tomboy keluar."
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:45
 msgid "Saved horizontal position of \"Search All Notes\" window"
 msgstr "Posisi mendatar tersimpan jendela \"Cari Semua Catatan\""
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:46
 msgid ""
 "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -367,11 +381,11 @@ msgstr ""
 "Menentukan koordinat X dari jendela \"Cari Semua Catatan\"; disimpan ketika "
 "Tomboy keluar."
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:47
 msgid "Saved vertical position of \"Search All Notes\" window"
 msgstr "Posisi tegak tersimpan jendela \"Cari Semua Catatan\""
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:48
 msgid ""
 "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -379,21 +393,21 @@ msgstr ""
 "Menentukan koordinat Y dari jendela \"Cari Semua Catatan\"; disimpan ketika "
 "Tomboy keluar."
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:49
 msgid "Last Directory used in HTML Export"
 msgstr "Direktori yang terakhir dipakai dalam Ekspor HTML"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:50
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
 "Direktori terakhir tempat ekspor catatan yang memakai plugin Ekspor Ke HTML."
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:51
 msgid "HTML Export Linked Notes"
 msgstr "Ekspor Ke HTML Catatan Tertaut"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:52
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
@@ -401,11 +415,11 @@ msgstr ""
 "Tatanan terakhir bagi checkbox 'Ekspor catatan tertaut' di plugin Ekspor ke "
 "HTML."
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:53
 msgid "HTML Export All Linked Notes"
 msgstr "Ekspor Ke HTML Semua Catatan Tertaut"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:54
 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 "
@@ -417,11 +431,11 @@ msgstr ""
 "Catatan Tertaut ke HTML' dan dipakai untuk menyatakan apakah semua catatan "
 "(ditemukan secara rekursif) mesti disertakan selama ekspor ke HTML."
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:55
 msgid "Sticky Note Importer First Run"
 msgstr "Run Pertama Pengimpor Catatan Lengket"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:56
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -429,11 +443,11 @@ msgstr ""
 "Menandakan bahwa plugin Pengimpor Catatan Lengket belum dijalankan, sehingga "
 "mesti otomatis jalan kala berikutnya Tomboy mulai."
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:57
 msgid "Synchronization Client ID"
 msgstr "Penyelarasan ID Klien"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:58
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
@@ -441,11 +455,11 @@ msgstr ""
 "Identifier unik bagi klien Tomboy ini, dipakai ketika berkomunikasi dengan "
 "suatu server penyelarasan."
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Local Server Path"
 msgstr "Lokasi Penyelarasan Server Lokal"
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:60
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
@@ -453,22 +467,22 @@ msgstr ""
 "Lokasi ke server penyelarasan ketika memakai addin layanan penyelarasan "
 "sistem berkas."
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:61
 msgid "Selected Synchronization Service Addin"
 msgstr "Addin Layanan Penyelarasan Terpilih"
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:62
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr ""
 "Identifier unik bagi addin layanan penyelarasan catatan yang kini ditata."
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:63
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "Tenggang Waktu Pengaitan FUSE (ms)"
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:64
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
@@ -476,37 +490,37 @@ msgstr ""
 "Waktu (dalam milidetik) Tomboy mesti menunggu jawaban ketika memakai FUSE "
 "untuk mengkait suatu share selaras."
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:65
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "Folder Penyelarasan Jauh SSHFS"
 
-#: ../data/tomboy.schemas.in.h:64
+#: ../data/tomboy.schemas.in.h:66
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr "Lokasi pada server SSH ke direktori penyelarasan Tomboy (tak wajib)."
 
-#: ../data/tomboy.schemas.in.h:65
+#: ../data/tomboy.schemas.in.h:67
 msgid "SSHFS Synchronization Server URL"
 msgstr "URL Server Penyelarasan Jauh SSHFS"
 
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:68
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "URL dari server SSH yang memuat direktori penyelarasan Tomboy."
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:69
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "Nama Pengguna Penyelarasan Jauh SSHFS"
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:70
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr ""
 "Nama pengguna yang dipakai ketika menyambung ke server penyelarasan melalui "
 "SSH."
 
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:71
 msgid "SSHFS Synchronization Server Port"
 msgstr "Port Server Penyelarasan Jauh SSHFS"
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:72
 msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
@@ -514,11 +528,11 @@ msgstr ""
 "Nomor port yang dipakai ketika menyambung ke server penyelarasan melalui "
 "SSH. Atur ke -1 atau kurang bila tatanan port SSH baku yang akan dipakai."
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:73
 msgid "Accept SSL Certificates"
 msgstr "Terima Sertifikat SSL"
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:74
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
@@ -526,11 +540,11 @@ msgstr ""
 "Gunakan opsi wdfs \"-ac\" untuk menerima sertifikat SSL tanpa bertanya ke "
 "pengguna."
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:75
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "Perilaku Tersimpan Pertentangan Penyelarasan Catatan"
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -544,11 +558,11 @@ msgstr ""
 "pengguna ingin ditanyai ketika pertentangan terjadi, sehingga mereka mungkin "
 "bisa menangani setiap keadaan pertentangan secara kasus per kasus."
 
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:77
 msgid "Automatic Background Synchronization Timeout"
 msgstr "Tenggang Waktu Penyelarasan Latar Belakang Otomatis"
 
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:78
 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 "
@@ -561,11 +575,11 @@ msgstr ""
 "dimatikan. Nilai positif terkecil yang dapat diterima adalah 5. Nilai dalam "
 "satuan menit."
 
-#: ../data/tomboy.schemas.in.h:77
+#: ../data/tomboy.schemas.in.h:79
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Perilaku Pembaruan Tautan Saat Mengubah Nama Catatan"
 
-#: ../data/tomboy.schemas.in.h:78
+#: ../data/tomboy.schemas.in.h:80
 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 "
@@ -584,29 +598,29 @@ msgstr ""
 "tautan mesti diperbarui ke nama catatan baru sehingga itu akan tetap merujuk "
 "ke catatan yang diubah namanya."
 
-#: ../data/tomboy.schemas.in.h:79
+#: ../data/tomboy.schemas.in.h:81
 msgid "Timestamp format"
 msgstr "Format penanda waktu"
 
-#: ../data/tomboy.schemas.in.h:80
+#: ../data/tomboy.schemas.in.h:82
 msgid "The date format that is used for the timestamp."
 msgstr "Bentuk tanggal yang dipakai untuk penanda waktu."
 
-#: ../data/tomboy.schemas.in.h:81
+#: ../data/tomboy.schemas.in.h:83
 msgid "Enable closing notes with escape."
 msgstr "Aktifkan penutupan catatan dengan tombol escape."
 
-#: ../data/tomboy.schemas.in.h:82
+#: ../data/tomboy.schemas.in.h:84
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr ""
 "Bila diaktifkan, sebuah catatan terbuka dapat ditutup dengan menekan tombol "
 "escape."
 
-#: ../data/tomboy.schemas.in.h:83
+#: ../data/tomboy.schemas.in.h:85
 msgid "The handler for \"note://\" URLs"
 msgstr "Pemroses bagi URL \"note://\""
 
-#: ../data/tomboy.schemas.in.h:84
+#: ../data/tomboy.schemas.in.h:86
 msgid "Set to TRUE to activate"
 msgstr "Tata ke TRUE untuk mengaktifkan"
 
@@ -658,7 +672,7 @@ msgstr "Keluar dari Tomboy"
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:63
 msgid "Tomboy Preferences"
 msgstr "Preferensi Tomboy"
 
@@ -695,15 +709,19 @@ msgid "Start synchronizing notes"
 msgstr "Memulai penyelarasan catatan"
 
 #. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:24
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
-#. Menu Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
-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)"
+#. Menu Min Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:35
+msgid "Minimum number of notes to show in Recent list"
+msgstr "Cacah minimum catatan yang ditampilkan di daftar Baru-baru ini"
+
+#. Menu Max Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:59
+msgid "Maximum number of notes to show in Recent list"
+msgstr "Cacah maksimum catatan yang ditampilkan di daftar Baru-baru ini"
 
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
@@ -788,28 +806,28 @@ msgstr "Sertakan semua catatan terkait lain"
 msgid "Export to HTML"
 msgstr "Ekspor ke HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:116
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "Catatan Anda diekspor ke \"{0}\"."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:127
 msgid "Note exported successfully"
 msgstr "Catatan sukses diekspor"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 #: ../Tomboy/ExportAllApplicationAddin.cs:250
 #: ../Tomboy/ExportAllApplicationAddin.cs:328
 msgid "Access denied."
 msgstr "Akses ditolak."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:135
 #: ../Tomboy/ExportAllApplicationAddin.cs:255
 #: ../Tomboy/ExportAllApplicationAddin.cs:333
 msgid "Folder does not exist."
 msgstr "Folder tidak ada."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:150
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "Tidak dapat menyimpan berkas \"{0}\""
@@ -855,7 +873,7 @@ msgstr "Sisipkan Tanda Waktu"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:155
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:159
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd, MMMM d, h:mm tt"
 
@@ -1309,7 +1327,7 @@ msgid "Delete the selected notebook"
 msgstr "Menghapus buku catatan yang dipilih"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:276
+#: ../Tomboy/RecentChanges.cs:277
 msgid "Notebooks"
 msgstr "Notebook"
 
@@ -1376,22 +1394,22 @@ msgstr "_Notebook Baru..."
 msgid "New Note {0}"
 msgstr "Catatan Baru {0}"
 
-#: ../Tomboy/Note.cs:1607
+#: ../Tomboy/Note.cs:1678
 #, csharp-format
 msgid "Really delete \"{0}\"?"
 msgstr "Yakin hapus {0}?"
 
-#: ../Tomboy/Note.cs:1610
+#: ../Tomboy/Note.cs:1681
 #, 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:1621
+#: ../Tomboy/Note.cs:1692
 msgid "If you delete a note it is permanently lost."
 msgstr "Jika Anda menghapus catatan, isinya akan hilang."
 
-#: ../Tomboy/Note.cs:1655
+#: ../Tomboy/Note.cs:1726
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1402,13 +1420,13 @@ msgstr ""
 "memiliki ruang cakram yang cukup, dan Anda memiliki hak yang sesuai pada "
 "{0}. Rincian galat dapat ditemukan di {1}."
 
-#: ../Tomboy/Note.cs:1671
+#: ../Tomboy/Note.cs:1742
 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:264
 msgid "New Note Template"
 msgstr "Templat Catatan Baru"
 
@@ -1773,27 +1791,27 @@ msgstr "Kecilkan Ukuran Fonta"
 msgid "Bullets"
 msgstr "Bulet"
 
-#: ../Tomboy/PreferencesDialog.cs:81
+#: ../Tomboy/PreferencesDialog.cs:75
 msgid "Editing"
 msgstr "Penyuntingan"
 
-#: ../Tomboy/PreferencesDialog.cs:84
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Hotkeys"
 msgstr "Tombol singkat"
 
-#: ../Tomboy/PreferencesDialog.cs:86
+#: ../Tomboy/PreferencesDialog.cs:80
 msgid "Synchronization"
 msgstr "Penyelarasan"
 
-#: ../Tomboy/PreferencesDialog.cs:88
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Add-ins"
 msgstr "Add-in"
 
-#: ../Tomboy/PreferencesDialog.cs:174
+#: ../Tomboy/PreferencesDialog.cs:181
 msgid "_Spell check while typing"
 msgstr "Periksa ejaan _saat mengetik"
 
-#: ../Tomboy/PreferencesDialog.cs:183
+#: ../Tomboy/PreferencesDialog.cs:190
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1802,11 +1820,11 @@ msgstr ""
 "ditampilkan di menu konteks."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:194
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid "Highlight _WikiWords"
 msgstr "Tandai Kata_Wiki"
 
-#: ../Tomboy/PreferencesDialog.cs:202
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1815,31 +1833,31 @@ msgstr ""
 "Mengklik kata tersebut akan membuat satu catatan dengan nama tersebut."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:209
+#: ../Tomboy/PreferencesDialog.cs:216
 msgid "Enable auto-_bulleted lists"
 msgstr "Aktifkan daftar di_bulet otomatis"
 
-#: ../Tomboy/PreferencesDialog.cs:218
+#: ../Tomboy/PreferencesDialog.cs:225
 msgid "Use custom _font"
 msgstr "Gunakan _fonta pilihan sendiri"
 
-#: ../Tomboy/PreferencesDialog.cs:236
+#: ../Tomboy/PreferencesDialog.cs:243
 msgid "When renaming a linked note: "
 msgstr "Ketika mengubah nama catatan tertaut:"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:246
 msgid "Ask me what to do"
 msgstr "Tanyakan padaku apa yang akan dilakukan"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:247
 msgid "Never rename links"
 msgstr "Tak pernah mengubah nama tautan"
 
-#: ../Tomboy/PreferencesDialog.cs:241
+#: ../Tomboy/PreferencesDialog.cs:248
 msgid "Always rename links"
 msgstr "Selalu ubah nama tautan"
 
-#: ../Tomboy/PreferencesDialog.cs:261
+#: ../Tomboy/PreferencesDialog.cs:268
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1847,102 +1865,101 @@ msgstr ""
 "Gunakan templat catatan baru untuk menyatakan teks yang mesti dipakai ketika "
 "membuat suatu catatan baru."
 
-#: ../Tomboy/PreferencesDialog.cs:270
+#: ../Tomboy/PreferencesDialog.cs:277
 msgid "Open New Note Template"
 msgstr "Buka Templat Catatan Baru"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:327
+#: ../Tomboy/PreferencesDialog.cs:334
 msgid "Listen for _Hotkeys"
 msgstr "Mendengar _Tombol Singkat"
 
-#: ../Tomboy/PreferencesDialog.cs:336
+#: ../Tomboy/PreferencesDialog.cs:343
 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>"
+"keypress. Example Hotkeys: <b><ALT>F11</b>, <b><ALT>N</b>"
 msgstr ""
 "Kunci pintas memungkinkan Anda mengakses secara cepat catatan Anda dari "
-"manapun dengan menekan tombol. Contoh Kunci Pintas: <b><Control><"
-"Shift>F11</b>, <b><Alt>N</b>"
+"manapun dengan menekan tombol. Contoh Kunci Pintas: <b><ALT>F11</b>, "
+"<b><ALT>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:356
+#: ../Tomboy/PreferencesDialog.cs:363
 msgid "Show notes _menu"
 msgstr "Tampilkan _menu catatan"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:373
+#: ../Tomboy/PreferencesDialog.cs:380
 msgid "Open \"_Start Here\""
 msgstr "Buka \"Mulai Di_sini\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:390
+#: ../Tomboy/PreferencesDialog.cs:397
 msgid "Create _new note"
 msgstr "Membuat catata_n baru"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:407
+#: ../Tomboy/PreferencesDialog.cs:414
 msgid "Open \"Search _All Notes\""
 msgstr "Membuka \"C_ari Semua Catatan\""
 
-#: ../Tomboy/PreferencesDialog.cs:434
+#: ../Tomboy/PreferencesDialog.cs:441
 msgid "Ser_vice:"
 msgstr "_Pelayan:"
 
-#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
+#: ../Tomboy/PreferencesDialog.cs:494 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "Tidak dapat dikonfigurasi"
 
-#: ../Tomboy/PreferencesDialog.cs:513
+#: ../Tomboy/PreferencesDialog.cs:520
 msgid "Automaticall_y Sync in Background Every"
 msgstr "_Otomatis Selaraskan di Latar Belakang Setiap"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:526
 msgid "Minutes"
 msgstr "Menit"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:541
+#: ../Tomboy/PreferencesDialog.cs:548
 msgid "_Advanced..."
 msgstr "Tingk_at lanjut..."
 
-#: ../Tomboy/PreferencesDialog.cs:602
+#: ../Tomboy/PreferencesDialog.cs:609
 msgid "The following add-ins are installed"
 msgstr "Add-in berikut terpasang"
 
-#: ../Tomboy/PreferencesDialog.cs:623
+#: ../Tomboy/PreferencesDialog.cs:630
 msgid "Get More Add-Ins..."
 msgstr "Dapatkan Add-In Lagi..."
 
-#: ../Tomboy/PreferencesDialog.cs:641
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Aktifkan"
 
-#: ../Tomboy/PreferencesDialog.cs:647
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_Nonaktif"
 
-#: ../Tomboy/PreferencesDialog.cs:778
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Tak diimplementasikan"
 
-#: ../Tomboy/PreferencesDialog.cs:792
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Preferensi {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:931
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Pilih Fonta Catatan"
 
-#: ../Tomboy/PreferencesDialog.cs:975
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Opsi Penyelarasan Lainnya"
 
-#: ../Tomboy/PreferencesDialog.cs:981
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1950,23 +1967,23 @@ msgstr ""
 "Ketika pertentangan terdeteksi antara catatan lokal dan catatan pada server "
 "penyelarasan yang dikonfigurasi:"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Selalu tanyakan padaku apa yang akan dilakukan."
 
-#: ../Tomboy/PreferencesDialog.cs:992
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Ubah nama catatan lokal saya."
 
-#: ../Tomboy/PreferencesDialog.cs:996
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Gantikan catatan lokalku dengan pembaruan dari server."
 
-#: ../Tomboy/PreferencesDialog.cs:1142
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "Are you sure?"
 msgstr "Anda yakin?"
 
-#: ../Tomboy/PreferencesDialog.cs:1144
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1975,11 +1992,11 @@ msgstr ""
 "dipaksa untuk menyelaraskan semua catatan Anda lagi ketika Anda menyimpan "
 "tatanan baru."
 
-#: ../Tomboy/PreferencesDialog.cs:1157
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Menata Ulang Pengaturan Penyelarasan"
 
-#: ../Tomboy/PreferencesDialog.cs:1159
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1989,18 +2006,18 @@ msgstr ""
 "penyelarasan Anda kini akan dibersihkan. Anda mungkin dipaksa untuk "
 "menyelaraskan semua catatan Anda lagi ketika Anda menyimpan tatanan baru."
 
-#: ../Tomboy/PreferencesDialog.cs:1237
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Connection successful"
 msgstr "Koneksi sukses"
 
-#: ../Tomboy/PreferencesDialog.cs:1239
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr ""
 "Tomboy siap menyelaraskan catatan Anda. Anda ingin menyelaraskan sekarang?"
 
-#: ../Tomboy/PreferencesDialog.cs:1262
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
@@ -2009,23 +2026,23 @@ msgstr ""
 "Silakan periksa informasi Anda dan coba lagi. Berkas log {0} mungkin memuat "
 "informasi lebih banyak tentang galat."
 
-#: ../Tomboy/PreferencesDialog.cs:1274
+#: ../Tomboy/PreferencesDialog.cs:1281
 msgid "Error connecting"
 msgstr "Galat menyambung"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Version:"
 msgstr "Versi:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Author:"
 msgstr "Pembuat:"
 
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Copyright:"
 msgstr "Hak Cipta:"
 
-#: ../Tomboy/PreferencesDialog.cs:1377
+#: ../Tomboy/PreferencesDialog.cs:1385
 msgid "Add-in Dependencies:"
 msgstr "Ketergantungan Add-in"
 
@@ -2353,21 +2370,21 @@ msgstr ""
 msgid "Cannot create new note"
 msgstr "Tidak dapat membuat catatan baru"
 
-#: ../Tomboy/Tomboy.cs:319
+#: ../Tomboy/Tomboy.cs:316
 msgid "Primary Development:"
 msgstr "Pengembangan Primer:"
 
-#: ../Tomboy/Tomboy.cs:332
+#: ../Tomboy/Tomboy.cs:329
 msgid "Contributors:"
 msgstr "Penyumbang:"
 
-#: ../Tomboy/Tomboy.cs:420
+#: ../Tomboy/Tomboy.cs:418
 msgid "translator-credits"
 msgstr ""
-"Andika Triwidada <andika at gmail.com>, 2009, 2010, 2011, 2012.\n"
+"Andika Triwidada <andika at gmail.com>, 2009-2013.\n"
 "Dirgita <dirgitadevina at yahoo.co.id>, 2010."
 
-#: ../Tomboy/Tomboy.cs:429
+#: ../Tomboy/Tomboy.cs:427
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2011 Others\n"
@@ -2375,7 +2392,7 @@ msgstr ""
 "Hak Cipta © 2004-2007 Alex Graveley\n"
 "Hak Cipta © 2004-2011 Lainnya\n"
 
-#: ../Tomboy/Tomboy.cs:431
+#: ../Tomboy/Tomboy.cs:429
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "Aplikasi penyimpan catatan desktop yang sederhana dan mudah dipakai."
 
@@ -2546,7 +2563,7 @@ msgstr "d MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(Nirjudul {0})"
 
-#: ../Tomboy/Watchers.cs:189
+#: ../Tomboy/Watchers.cs:186
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -2555,14 +2572,14 @@ msgstr ""
 "Catatan dengan judul <b>{0}</b> telah ada. Silakan pilih nama lain bagi "
 "catatan ini sebelum melanjutkan."
 
-#: ../Tomboy/Watchers.cs:204
+#: ../Tomboy/Watchers.cs:201
 msgid "Note title taken"
 msgstr "Judul catatan telah terpakai"
 
-#: ../Tomboy/Watchers.cs:601
+#: ../Tomboy/Watchers.cs:605
 msgid "_Copy Link Address"
 msgstr "_Salin Alamat Taut"
 
-#: ../Tomboy/Watchers.cs:606
+#: ../Tomboy/Watchers.cs:610
 msgid "_Open Link"
 msgstr "_Buka Taut"
diff --git a/po/lv.po b/po/lv.po
index 2df35ef..1c40c30 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2,20 +2,21 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
+#
 # Raivis Dejus <orvils at gmail.com>, 2006, 2007, 2009.
 # Peteris Krisjanis <pecisk at gmail.com>, 2010.
 # Rudolfs <rudolfs.mazurs at gmail.com>, 2011.
 # Rūdofls Mazurs <rudolfs.mazurs at gmail.com>, 2011, 2012.
-# Rūdolfs Mazurs <rudolfs.mazurs at gmail.com>, 2009, 2012.
-#
+# Rūdolfs Mazurs <rudolfs.mazurs at gmail.com>, 2009, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy.gnome-2-26.lv\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-20 20:47+0300\n"
-"PO-Revision-Date: 2012-06-20 20:51+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-07-21 23:20+0000\n"
+"PO-Revision-Date: 2013-09-21 23:38+0300\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs at gmail.com>\n"
-"Language-Team: Latviešu <lata-l10n at googlegroups.com>\n"
+"Language-Team: Latvian <lata-l10n at googlegroups.com>\n"
 "Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,14 +24,14 @@ 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.2\n"
+"X-Generator: Lokalize 1.5\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Tomboy Applet Factory"
 msgstr "Tomboy sīklietotņu ražotne"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:2 ../data/tomboy.desktop.in.h:1
-#: ../Tomboy/Tray.cs:579
+#: ../Tomboy/Tray.cs:581
 msgid "Tomboy Notes"
 msgstr "Tomboy piezīmes"
 
@@ -205,10 +206,25 @@ msgid ""
 msgstr "Skaitlis, kas nosaka minimālo piezīmju skaitu Tomboy piezīmju izvēlnē."
 
 #: ../data/tomboy.schemas.in.h:23
+#| msgid "Minimum number of notes to show in menu"
+msgid "Maximum number of notes to show in menu"
+msgstr "Maksimālais izvēlnē rādāmo piezīmju skaits"
+
+#: ../data/tomboy.schemas.in.h:24
+#| msgid ""
+#| "Integer determining the minimum number of notes to show in the Tomboy "
+#| "note menu."
+msgid ""
+"Integer determining the maximum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"Skaitlis, kas nosaka maksimālo piezīmju skaitu Tomboy piezīmju izvēlnē."
+
+#: ../data/tomboy.schemas.in.h:25
 msgid "List of pinned notes."
 msgstr "Saraksts ar piespraustajām piezīmēm."
 
-#: ../data/tomboy.schemas.in.h:24
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -216,11 +232,11 @@ msgstr ""
 "Atdalītājsimbolu atdalīts saraksts ar to piezīmju URI, kurām vienmēr būtu "
 "jāparādās Tomboy piezīmju izvēlnē."
 
-#: ../data/tomboy.schemas.in.h:25
+#: ../data/tomboy.schemas.in.h:27
 msgid "Maximum note title length to show in tray menu."
 msgstr "Maksimālais piezīmes virsraksta garums, kuru rādīt ikonu joslā."
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:28
 msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
@@ -228,11 +244,13 @@ msgstr ""
 "Maksimālais rakstzīmju skaits piezīmes virsrakstā, kuru rādīt Tomboy ikonu "
 "joslā vai paneļa sīklietotnes piezīmju izvēlnē."
 
-#: ../data/tomboy.schemas.in.h:27
+#. Enable Startup Notes option
+#: ../data/tomboy.schemas.in.h:29
+#: ../Tomboy/Addins/AdvancedPreferences/EnableStartupNotesPreference.cs:27
 msgid "Enable startup notes"
 msgstr "Aktivēt sākuma piezīmes"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -240,11 +258,11 @@ msgstr ""
 "Ja patiess, visas piezīmes, kas atvērtas pie Tomboy aizvēršanas, tiks "
 "automātiski pāratvērtas pie startēšanas."
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:31
 msgid "Show applet menu"
 msgstr "Rādīt sīklitotnes izvēlni"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../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 "
@@ -259,11 +277,11 @@ msgstr ""
 "izmantojot saīsinājumus piem. \"<Ctl>\" un \"<Ctrl>\". Ja kā "
 "taustiņsaite ir norādīts \"disabled\", tad tā netiks izmantota."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:33
 msgid "Open Start Here"
 msgstr "Atvērt startu šeit"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -278,11 +296,11 @@ msgstr ""
 "\"<Ctl>\" un \"<Ctrl>\". Ja kā taustiņsaite ir norādīts "
 "\"disabled\", tad tā netiks izmantota."
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:35
 msgid "Create a new Note"
 msgstr "Izveidot jaunu piezīmi"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "The global keybinding for creating and displaying a new Note. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -297,11 +315,11 @@ msgstr ""
 "izmantojot saīsinājumus piem. \"<Ctl>\" un \"<Ctrl>\". Ja kā "
 "taustiņsaite ir norādīts \"disabled\", tad tā netiks izmantota."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:37
 msgid "Open Search Dialog"
 msgstr "Atvērt meklēšanas dialogu"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:38
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -316,11 +334,11 @@ msgstr ""
 "izmantojot saīsinājumus piem. \"<Ctl>\" un \"<Ctrl>\". Ja kā "
 "taustiņsaite ir norādīts \"disabled\", tad tā netiks izmantota."
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:39
 msgid "Open Recent Changes"
 msgstr "Atvērt nesenās izmaiņas"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:40
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -335,11 +353,11 @@ msgstr ""
 "piem. \"<Ctl>\" un \"<Ctrl>\". Ja kā taustiņsaite ir norādīts "
 "\"disabled\", tad tā netiks izmantota."
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:41
 msgid "Saved height of \"Search All Notes\" window"
 msgstr "Visu piezīmju meklēšanas loga saglabātais augstums"
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:42
 msgid ""
 "Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
 "exit."
@@ -347,55 +365,55 @@ msgstr ""
 "Nosaka visu piezīmju meklēšanas loga augstumu pikseļos; saglabā, aizverot "
 "Tomboy."
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:43
 msgid "Saved width of \"Search All Notes\" window"
 msgstr "Visu piezīmju meklēšanas loga saglabātais platums"
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:44
 msgid ""
 "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
 msgstr ""
 "Nosaka visu piezīmju meklēšanas loga platumu pikseļos; saglabā aizverot "
 "Tomboy."
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:45
 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:44
+#: ../data/tomboy.schemas.in.h:46
 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."
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:47
 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:46
+#: ../data/tomboy.schemas.in.h:48
 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."
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:49
 msgid "Last Directory used in HTML Export"
 msgstr "Pēdējā mape, kas izmantota HTML eksportēšanai"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:50
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
 "Pēdējā mape, kurā tika eksportēta piezīme izmantojot 'Eksportēt kā HTML' "
 "spraudni."
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:51
 msgid "HTML Export Linked Notes"
 msgstr "Saistīto piezīmju HTML eksportēšana"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:52
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
@@ -403,11 +421,11 @@ msgstr ""
 "Pēdējais iestatījums izvēles rūtiņai \"Eksportēt savienotās piezīmes\" "
 "'Eksportēt kā HTML' spraudnī."
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:53
 msgid "HTML Export All Linked Notes"
 msgstr "Saistīto piezīmju HTML eksportēšana"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:54
 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 "
@@ -419,11 +437,11 @@ msgstr ""
 "piezīmju HTML eksportēšanas' vērtību un nosaka, vai eksportējot HTML būtu "
 "jāeksportē visas piezīmes."
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:55
 msgid "Sticky Note Importer First Run"
 msgstr "Sticky Notes importēšanas pirmā palaišana"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:56
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -431,11 +449,11 @@ msgstr ""
 "Norāda, ka Sticky Notes importēšanas spraudnis nav darbināts, tāpēc tam būtu "
 "jābūt palaistam automātiski, nākošo reizi Tomboy startējoties."
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:57
 msgid "Synchronization Client ID"
 msgstr "Sinhronizācijas klienta ID"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:58
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
@@ -443,11 +461,11 @@ msgstr ""
 "Unikāls Tomboy klienta identifikators, tiek izmantots sazinoties ar "
 "sinhronizācijas serveri."
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Local Server Path"
 msgstr "Sinhronizācijas lokālā servera ceļš"
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:60
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
@@ -455,22 +473,22 @@ msgstr ""
 "Ceļš uz sinhronizācijas serveri, izmantojot failu sistēmas sinhronizācijas "
 "servisa ievietojumu."
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:61
 msgid "Selected Synchronization Service Addin"
 msgstr "Izvēlētais sinhronizācijas servisa ievietojums"
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:62
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr ""
 "Unikāls nokonfigurētā piezīmju sinhronizācijas spraudņa identifikators."
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:63
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "FUSE montēšanas noildze (ms)"
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:64
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
@@ -478,37 +496,37 @@ msgstr ""
 "Laiks (milisekundēs) ko Tomboy gaidīs lai saņemtu atbildi izmantojot FUSE "
 "sinhronizācijas kopvietu montēšanā."
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:65
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "SSHFS attālinātās sinhronizācijas mape"
 
-#: ../data/tomboy.schemas.in.h:64
+#: ../data/tomboy.schemas.in.h:66
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr ""
 "Ceļš SSH serverī līdz Tomboy sinhronizācijas direktorijai (neobligāts)."
 
-#: ../data/tomboy.schemas.in.h:65
+#: ../data/tomboy.schemas.in.h:67
 msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS attālinātās sinhronizācijas servera URL"
 
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:68
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "SSH servera URL, kas satur Tomboy sinhronizācijas mapi."
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:69
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "SSHFS attālinātās sinhronizācijas lietotājvārds"
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:70
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr ""
 "Lietotājvārds, ko izmantot pieslēdzoties sinhronizācijas servisam caur SSH."
 
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:71
 msgid "SSHFS Synchronization Server Port"
 msgstr "SSHFS attālinātās sinhronizācijas servera ports"
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:72
 msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
@@ -516,11 +534,11 @@ msgstr ""
 "Ports, ko izmantot pieslēdzoties sinhronizācijas servisam caur SSH. "
 "Iestatiet kā -1 vai mazāk, ja ir jāizmanto noklusētais SSH ports."
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:73
 msgid "Accept SSL Certificates"
 msgstr "Pieņemt SSL sertifikātus"
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:74
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
@@ -528,11 +546,11 @@ msgstr ""
 "Izmantot wdfs opciju \"-ac\", lai pieņemtu SSL sertifikātus bez lietotāja "
 "iesaistes."
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:75
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "Piezīmju sinhronizācijas konflikta saglabāšanas veids"
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -546,11 +564,11 @@ msgstr ""
 "tiktu brīdināts, kad ir konstatēts konflikts; tādējādi lai viņi varētu "
 "noskaidrot konfliktējošo situāciju katru reizi."
 
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:77
 msgid "Automatic Background Synchronization Timeout"
 msgstr "Automātiskās fona sinhronizācijas laika noildze"
 
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:78
 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 "
@@ -562,11 +580,11 @@ msgstr ""
 "norāda, ka automātiskā sinhronizācija ir deaktivēta. Zemākā pieņemamā "
 "vērtība ir 5 (norādītā vienība ir minūtes)."
 
-#: ../data/tomboy.schemas.in.h:77
+#: ../data/tomboy.schemas.in.h:79
 msgid "Link Updating Behavior on Note Rename"
 msgstr "Saišu atjaunināšanas princips pārsaucot piezīmi"
 
-#: ../data/tomboy.schemas.in.h:78
+#: ../data/tomboy.schemas.in.h:80
 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 "
@@ -584,27 +602,27 @@ msgstr ""
 "tekstu automātiski vajadzētu atjaunināt ar jauno piezīmes nosaukumu, "
 "tādējādi tās turpinās norādīt uz pārsaukto piezīmi."
 
-#: ../data/tomboy.schemas.in.h:79
+#: ../data/tomboy.schemas.in.h:81
 msgid "Timestamp format"
 msgstr "Laika spiedogu formāts"
 
-#: ../data/tomboy.schemas.in.h:80
+#: ../data/tomboy.schemas.in.h:82
 msgid "The date format that is used for the timestamp."
 msgstr "Laika spiedogiem izmantotais datuma formāts."
 
-#: ../data/tomboy.schemas.in.h:81
+#: ../data/tomboy.schemas.in.h:83
 msgid "Enable closing notes with escape."
 msgstr "Aktivēt piezīmju aizvēršanu ar Escape taustiņu."
 
-#: ../data/tomboy.schemas.in.h:82
+#: ../data/tomboy.schemas.in.h:84
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "Ja aktivēts, atvērtās piezīmes var aizvērt, nospiežot ESC taustiņu."
 
-#: ../data/tomboy.schemas.in.h:83
+#: ../data/tomboy.schemas.in.h:85
 msgid "The handler for \"note://\" URLs"
 msgstr "\"note://\" URL apstrādātājs"
 
-#: ../data/tomboy.schemas.in.h:84
+#: ../data/tomboy.schemas.in.h:86
 msgid "Set to TRUE to activate"
 msgstr "Uzstādiet kā PATIESS, lai aktivizētu"
 
@@ -656,7 +674,7 @@ msgstr "Aizvērt Tomboy"
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:63
 msgid "Tomboy Preferences"
 msgstr "Tomboy iestatījumi"
 
@@ -693,14 +711,21 @@ msgid "Start synchronizing notes"
 msgstr "Sākt piezīmju sinhronizāciju"
 
 #. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:24
 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)"
+#. Menu Min Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:35
+#| msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgid "Minimum number of notes to show in Recent list"
+msgstr "Minimālais neseno sarakstā rādāmo piezīmju skaits"
+
+#. Menu Max Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:59
+#| msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgid "Maximum number of notes to show in Recent list"
+msgstr "Maksimālais neseno sarakstā rādāmo piezīmju skaits"
 
 #: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
 msgid "What links here?"
@@ -784,28 +809,28 @@ msgstr "Iekļaut visas citas savienotās piezīmes"
 msgid "Export to HTML"
 msgstr "Eksportēt uz HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:116
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "Jūsu piezīme tika eksportēta uz \"{0}\"."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:127
 msgid "Note exported successfully"
 msgstr "Piezīme eksportēta veiksmīgi"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 #: ../Tomboy/ExportAllApplicationAddin.cs:250
 #: ../Tomboy/ExportAllApplicationAddin.cs:328
 msgid "Access denied."
 msgstr "Pieeja liegta."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:135
 #: ../Tomboy/ExportAllApplicationAddin.cs:255
 #: ../Tomboy/ExportAllApplicationAddin.cs:333
 msgid "Folder does not exist."
 msgstr "Mape neeksistē."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:150
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "Nevar saglabāt failu \"{0}\""
@@ -851,7 +876,7 @@ msgstr "Ievietot laika spiedogu"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:155
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:159
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd, d. MMMM, h:mm tt"
 
@@ -1310,7 +1335,7 @@ msgid "Delete the selected notebook"
 msgstr "Izdzēst izvēlēto piezīmju bloku"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:276
+#: ../Tomboy/RecentChanges.cs:277
 msgid "Notebooks"
 msgstr "Piezīmju bloki"
 
@@ -1376,12 +1401,12 @@ msgstr "Jau_ns piezīmju bloks..."
 msgid "New Note {0}"
 msgstr "Jauna piezīme {0}"
 
-#: ../Tomboy/Note.cs:1607
+#: ../Tomboy/Note.cs:1678
 #, csharp-format
 msgid "Really delete \"{0}\"?"
 msgstr "Tiešām dzēst \"{0}\"?"
 
-#: ../Tomboy/Note.cs:1610
+#: ../Tomboy/Note.cs:1681
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
@@ -1389,11 +1414,11 @@ 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:1621
+#: ../Tomboy/Note.cs:1692
 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:1655
+#: ../Tomboy/Note.cs:1726
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1404,13 +1429,13 @@ 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:1671
+#: ../Tomboy/Note.cs:1742
 msgid "Error saving note data."
 msgstr "Kļūda saglabājot datus."
 
 #. 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:264
 msgid "New Note Template"
 msgstr "Jauna piezīmes sagatave"
 
@@ -1710,87 +1735,94 @@ msgstr "Meklēt ie_priekšējo"
 msgid "Cannot create note"
 msgstr "Nevar izveidot piezīmi"
 
-#: ../Tomboy/NoteWindow.cs:832
+#: ../Tomboy/NoteWindow.cs:833
 msgid "_Find:"
 msgstr "_Meklēt:"
 
-#: ../Tomboy/NoteWindow.cs:843
+#: ../Tomboy/NoteWindow.cs:847
 msgid "_Previous"
 msgstr "Ie_priekšējais"
 
-#: ../Tomboy/NoteWindow.cs:852
+#: ../Tomboy/NoteWindow.cs:856
 msgid "_Next"
 msgstr "_Nākamais"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#. x of x - specifically Number of Matches and what location is the cursor in the list of matches
+#: ../Tomboy/NoteWindow.cs:885
+#, csharp-format
+#| msgid "Page {0} of {1}"
+msgid "{0} of {1}"
+msgstr "{0} no {1}"
+
+#: ../Tomboy/NoteWindow.cs:1368
 msgid "_Bold"
 msgstr "_Treknraksts"
 
-#: ../Tomboy/NoteWindow.cs:1347
+#: ../Tomboy/NoteWindow.cs:1380
 msgid "_Italic"
 msgstr "_Slīpraksts"
 
-#: ../Tomboy/NoteWindow.cs:1359
+#: ../Tomboy/NoteWindow.cs:1392
 msgid "_Strikeout"
 msgstr "_Pārsvītrots"
 
-#: ../Tomboy/NoteWindow.cs:1371
+#: ../Tomboy/NoteWindow.cs:1404
 msgid "_Highlight"
 msgstr "_Izcelts"
 
-#: ../Tomboy/NoteWindow.cs:1384
+#: ../Tomboy/NoteWindow.cs:1417
 msgid "Font Size"
 msgstr "Fonta izmērs"
 
-#: ../Tomboy/NoteWindow.cs:1387
+#: ../Tomboy/NoteWindow.cs:1420
 msgid "_Normal"
 msgstr "_Normāls"
 
-#: ../Tomboy/NoteWindow.cs:1404
+#: ../Tomboy/NoteWindow.cs:1437
 msgid "Hu_ge"
 msgstr "Milzī_gs"
 
-#: ../Tomboy/NoteWindow.cs:1412
+#: ../Tomboy/NoteWindow.cs:1445
 msgid "_Large"
 msgstr "_Liels"
 
-#: ../Tomboy/NoteWindow.cs:1420
+#: ../Tomboy/NoteWindow.cs:1453
 msgid "S_mall"
 msgstr "Maz_s"
 
-#: ../Tomboy/NoteWindow.cs:1429
+#: ../Tomboy/NoteWindow.cs:1462
 msgid "Increase Font Size"
 msgstr "Palielināt fonta izmēru"
 
-#: ../Tomboy/NoteWindow.cs:1447
+#: ../Tomboy/NoteWindow.cs:1480
 msgid "Decrease Font Size"
 msgstr "Samazināt fonta izmēru"
 
-#: ../Tomboy/NoteWindow.cs:1467
+#: ../Tomboy/NoteWindow.cs:1500
 msgid "Bullets"
 msgstr "Aizzīmes"
 
-#: ../Tomboy/PreferencesDialog.cs:81
+#: ../Tomboy/PreferencesDialog.cs:75
 msgid "Editing"
 msgstr "Rediģēšana"
 
-#: ../Tomboy/PreferencesDialog.cs:84
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Hotkeys"
 msgstr "Karstie taustiņi"
 
-#: ../Tomboy/PreferencesDialog.cs:86
+#: ../Tomboy/PreferencesDialog.cs:80
 msgid "Synchronization"
 msgstr "Sinhronizācija"
 
-#: ../Tomboy/PreferencesDialog.cs:88
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Add-ins"
 msgstr "Pielikumi"
 
-#: ../Tomboy/PreferencesDialog.cs:174
+#: ../Tomboy/PreferencesDialog.cs:181
 msgid "_Spell check while typing"
 msgstr "Pareizrakstība_s pārbaude rakstīšanas laikā"
 
-#: ../Tomboy/PreferencesDialog.cs:183
+#: ../Tomboy/PreferencesDialog.cs:190
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1799,11 +1831,11 @@ msgstr ""
 "parādīts klikšķinot labo peles pogu."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:194
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid "Highlight _WikiWords"
 msgstr "Izcelt _WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:202
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1812,31 +1844,31 @@ msgstr ""
 "vārda, tiks izveidota piezīme ar šo vārdu."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:209
+#: ../Tomboy/PreferencesDialog.cs:216
 msgid "Enable auto-_bulleted lists"
 msgstr "Aktivēt automātisko aizzīmju sarakstu"
 
-#: ../Tomboy/PreferencesDialog.cs:218
+#: ../Tomboy/PreferencesDialog.cs:225
 msgid "Use custom _font"
 msgstr "Lietot pielāgotu _fontu"
 
-#: ../Tomboy/PreferencesDialog.cs:236
+#: ../Tomboy/PreferencesDialog.cs:243
 msgid "When renaming a linked note: "
 msgstr "Pārsaucot saistīto piezīmi: "
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:246
 msgid "Ask me what to do"
 msgstr "Vienmēr jautāt man, kā rīkoties."
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:247
 msgid "Never rename links"
 msgstr "Nekad nepārsaukt saites"
 
-#: ../Tomboy/PreferencesDialog.cs:241
+#: ../Tomboy/PreferencesDialog.cs:248
 msgid "Always rename links"
 msgstr "Vienmēr pārsaukt saites"
 
-#: ../Tomboy/PreferencesDialog.cs:261
+#: ../Tomboy/PreferencesDialog.cs:268
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1844,101 +1876,104 @@ msgstr ""
 "Lietojiet, jauna piezīmes sagatave, lai norādītu tekstu kas tiks izmantots "
 "jaunu piezīmju veidošanai."
 
-#: ../Tomboy/PreferencesDialog.cs:270
+#: ../Tomboy/PreferencesDialog.cs:277
 msgid "Open New Note Template"
 msgstr "Atvērt jaunu piezīmes sagatavi"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:327
+#: ../Tomboy/PreferencesDialog.cs:334
 msgid "Listen for _Hotkeys"
 msgstr "Aktivizēt karstos ta_ustiņus"
 
-#: ../Tomboy/PreferencesDialog.cs:336
+#: ../Tomboy/PreferencesDialog.cs:343
+#| 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>"
 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>"
+"keypress. Example Hotkeys: <b><ALT>F11</b>, <b><ALT>N</b>"
 msgstr ""
 "Karstie taustiņi ļauj piekļūt piezīmēm jebkurā brīdī, izmantojot tastatūru. "
-"Piemēram:<b><Control><Shift>F11</b>, <b><Alt>N</b>"
+"Piemēram:<b><ALT>F11</b>, <b><ALT>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:356
+#: ../Tomboy/PreferencesDialog.cs:363
 msgid "Show notes _menu"
 msgstr "Parādīt piezī_mju izvēlni"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:373
+#: ../Tomboy/PreferencesDialog.cs:380
 msgid "Open \"_Start Here\""
 msgstr "Atvērt \"_Sākt šeit\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:390
+#: ../Tomboy/PreferencesDialog.cs:397
 msgid "Create _new note"
 msgstr "Izveidot jau_nu piezīmi"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:407
+#: ../Tomboy/PreferencesDialog.cs:414
 msgid "Open \"Search _All Notes\""
 msgstr "Atvērt \"M_eklēt visās piezīmēs\""
 
-#: ../Tomboy/PreferencesDialog.cs:434
+#: ../Tomboy/PreferencesDialog.cs:441
 msgid "Ser_vice:"
 msgstr "Ser_viss:"
 
-#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
+#: ../Tomboy/PreferencesDialog.cs:494 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "Nav konfigurējams"
 
-#: ../Tomboy/PreferencesDialog.cs:513
+#: ../Tomboy/PreferencesDialog.cs:520
 msgid "Automaticall_y Sync in Background Every"
 msgstr "_Automātiski sinhronizēt fonā katras"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:526
 msgid "Minutes"
 msgstr "minūtes"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:541
+#: ../Tomboy/PreferencesDialog.cs:548
 msgid "_Advanced..."
 msgstr "_Paplašināti..."
 
-#: ../Tomboy/PreferencesDialog.cs:602
+#: ../Tomboy/PreferencesDialog.cs:609
 msgid "The following add-ins are installed"
 msgstr "Sekojoši pielikumi tika uzstādīti"
 
-#: ../Tomboy/PreferencesDialog.cs:623
+#: ../Tomboy/PreferencesDialog.cs:630
 msgid "Get More Add-Ins..."
 msgstr "Iegūt vēl pielikumus..."
 
-#: ../Tomboy/PreferencesDialog.cs:641
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Aktivēt"
 
-#: ../Tomboy/PreferencesDialog.cs:647
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_Deaktivēt"
 
-#: ../Tomboy/PreferencesDialog.cs:778
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Nav ieviests"
 
-#: ../Tomboy/PreferencesDialog.cs:792
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} iestatījumi"
 
-#: ../Tomboy/PreferencesDialog.cs:931
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Izvēlieties piezīmju fontu"
 
-#: ../Tomboy/PreferencesDialog.cs:975
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Citas sinhronizācijas opcijas"
 
-#: ../Tomboy/PreferencesDialog.cs:981
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1946,23 +1981,23 @@ msgstr ""
 "Kad atklāts konflikts starp lokālo piezīmi un piezīmi, kas atrodas uz "
 "konfigurēta sinhronizācijas servera:"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Vienmēr jautāt man kā rīkoties."
 
-#: ../Tomboy/PreferencesDialog.cs:992
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Pārsaukt manu lokālo piezīmi."
 
-#: ../Tomboy/PreferencesDialog.cs:996
+#: ../Tomboy/PreferencesDialog.cs:1003
 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
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "Are you sure?"
 msgstr "Esat pārliecināts?"
 
-#: ../Tomboy/PreferencesDialog.cs:1144
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1971,11 +2006,11 @@ msgstr ""
 "nākties sinhronizēt vēlreiz visas piezīmes pēc jauno iestatījumu "
 "saglabāšanas."
 
-#: ../Tomboy/PreferencesDialog.cs:1157
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Atiestatu sinhronizācijas iestatījumus"
 
-#: ../Tomboy/PreferencesDialog.cs:1159
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1985,11 +2020,11 @@ msgstr ""
 "iestatījumi tiks attīrīti. Piespiedu kārtā var nākties sinhronizēt vēlreiz "
 "visas piezīmes pēc jauno iestatījumu saglabāšanas."
 
-#: ../Tomboy/PreferencesDialog.cs:1237
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Connection successful"
 msgstr "Savienojums veiksmīgs"
 
-#: ../Tomboy/PreferencesDialog.cs:1239
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1997,7 +2032,7 @@ msgstr ""
 "Tomboy ir gatavs sinhronizēt jūsu piezīmes. Vai vēlaties tās sinhronizēt "
 "tagad?"
 
-#: ../Tomboy/PreferencesDialog.cs:1262
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
@@ -2006,23 +2041,23 @@ msgstr ""
 "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
+#: ../Tomboy/PreferencesDialog.cs:1281
 msgid "Error connecting"
 msgstr "Kļūda savienojoties"
 
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Version:"
 msgstr "Versija:"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Author:"
 msgstr "Autors:"
 
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Copyright:"
 msgstr "Autortiesības:"
 
-#: ../Tomboy/PreferencesDialog.cs:1377
+#: ../Tomboy/PreferencesDialog.cs:1385
 msgid "Add-in Dependencies:"
 msgstr "Pielikumu atkarības:"
 
@@ -2358,11 +2393,11 @@ msgstr ""
 msgid "Cannot create new note"
 msgstr "Nevar izveidot jaunu piezīmi"
 
-#: ../Tomboy/Tomboy.cs:319
+#: ../Tomboy/Tomboy.cs:316
 msgid "Primary Development:"
 msgstr "Galvenā izstrāde:"
 
-#: ../Tomboy/Tomboy.cs:332
+#: ../Tomboy/Tomboy.cs:329
 msgid "Contributors:"
 msgstr "Atbalstītāji:"
 
@@ -2392,11 +2427,11 @@ msgstr ""
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "Vienkārša un viegli lietojama piezīmju programma."
 
-#: ../Tomboy/Tomboy.cs:439
+#: ../Tomboy/Tomboy.cs:441
 msgid "Homepage"
 msgstr "Mājas lapa"
 
-#: ../Tomboy/Tomboy.cs:575
+#: ../Tomboy/Tomboy.cs:577
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright © 2004-2007 Alex Graveley\n"
@@ -2410,7 +2445,7 @@ msgstr ""
 "\n"
 "Autortiesības (C) 2004-2011 Citi\n"
 
-#: ../Tomboy/Tomboy.cs:589
+#: ../Tomboy/Tomboy.cs:591
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -2425,7 +2460,7 @@ msgstr ""
 "  --search [teksts]\t\tAtvērt meklēt visās piezīmēs logu ar norādīto "
 "tekstu.\n"
 
-#: ../Tomboy/Tomboy.cs:599
+#: ../Tomboy/Tomboy.cs:601
 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"
@@ -2440,7 +2475,7 @@ msgstr ""
 "  --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:609
+#: ../Tomboy/Tomboy.cs:611
 msgid ""
 "  --addin:html-export-all [path]\tExports all notes to HTML in the given "
 "location.\n"
@@ -2452,7 +2487,7 @@ msgstr ""
 "  --addin:html-export-all-quit [ceļš]\tEksportē visas piezīmes uz HTML "
 "dotajā vietā un tad iziet.\n"
 
-#: ../Tomboy/Tomboy.cs:619
+#: ../Tomboy/Tomboy.cs:621
 #, csharp-format
 msgid "Version {0}"
 msgstr "Versija {0}"
@@ -2565,7 +2600,7 @@ msgstr "d MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(Nenosaukts {0})"
 
-#: ../Tomboy/Watchers.cs:189
+#: ../Tomboy/Watchers.cs:186
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -2574,15 +2609,15 @@ msgstr ""
 "Piezīme ar virsrakstu <b>{0}</b> jau eksistē. Lūdzu, izvēlieties citu "
 "virsrakstu."
 
-#: ../Tomboy/Watchers.cs:204
+#: ../Tomboy/Watchers.cs:201
 msgid "Note title taken"
 msgstr "Piezīmes virsraksts jau eksistē"
 
-#: ../Tomboy/Watchers.cs:601
+#: ../Tomboy/Watchers.cs:605
 msgid "_Copy Link Address"
 msgstr "_Kopēt saites adresi"
 
-#: ../Tomboy/Watchers.cs:606
+#: ../Tomboy/Watchers.cs:610
 msgid "_Open Link"
 msgstr "_Atvērt saiti"
 
diff --git a/po/pl.po b/po/pl.po
index 567f5f6..2912a80 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,14 +9,14 @@
 # Stanisław Małolepszy <smalolepszy at aviary.pl>, 2007.
 # Wadim Dziedzic <wdziedzic at aviary.pl>, 2007-2008.
 # Tomasz Dominikowski <dominikowski at gmail.com>, 2007-2009.
-# Piotr Drąg <piotrdrag at gmail.com>, 2009-2013.
-# Aviary.pl <gnomepl at aviary.pl>, 2007-2013.
+# Piotr Drąg <piotrdrag at gmail.com>, 2009-2014.
+# Aviary.pl <gnomepl at aviary.pl>, 2007-2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-17 21:04+0100\n"
-"PO-Revision-Date: 2013-02-17 21:05+0100\n"
+"POT-Creation-Date: 2014-01-03 16:50+0100\n"
+"PO-Revision-Date: 2014-01-03 16:52+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <gnomepl at aviary.pl>\n"
 "Language: pl\n"
@@ -249,7 +249,9 @@ msgstr ""
 "Maksymalna liczba znaków tytułu notatki do wyświetlenia w ikonie obszaru "
 "powiadamiania programu Tomboy lub menu notatek apletu panelu."
 
+#. Enable Startup Notes option
 #: ../data/tomboy.schemas.in.h:29
+#: ../Tomboy/Addins/AdvancedPreferences/EnableStartupNotesPreference.cs:27
 msgid "Enable startup notes"
 msgstr "Włączenie notatek startowych"
 
@@ -727,17 +729,17 @@ msgid "Start synchronizing notes"
 msgstr "Uruchamia synchronizację notatek"
 
 #. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:26
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:24
 msgid "Advanced"
 msgstr "Zaawansowane"
 
 #. Menu Min Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:34
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:35
 msgid "Minimum number of notes to show in Recent list"
 msgstr "Minimalna liczba notatek wyświetlana na liście ostatnich"
 
 #. Menu Max Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:58
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:59
 msgid "Maximum number of notes to show in Recent list"
 msgstr "Maksymalna liczba notatek wyświetlana na liście ostatnich"
 
@@ -824,28 +826,28 @@ msgstr "Dołącz wszystkie inne powiązane notatki"
 msgid "Export to HTML"
 msgstr "Wyeksportuj do HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:116
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "Notatka została wyeksportowana do \"{0}\"."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:127
 msgid "Note exported successfully"
 msgstr "Notatka została pomyślnie wyeksportowana"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 #: ../Tomboy/ExportAllApplicationAddin.cs:250
 #: ../Tomboy/ExportAllApplicationAddin.cs:328
 msgid "Access denied."
 msgstr "Brak dostępu."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:135
 #: ../Tomboy/ExportAllApplicationAddin.cs:255
 #: ../Tomboy/ExportAllApplicationAddin.cs:333
 msgid "Folder does not exist."
 msgstr "Katalog nie istnieje."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:150
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "Nie można zapisać pliku \"{0}\""
@@ -1413,17 +1415,17 @@ msgstr "Notatnik"
 msgid "_New notebook..."
 msgstr "Nowy _notatnik..."
 
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
+#: ../Tomboy/Note.cs:515
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Nowa notatka {0}"
 
-#: ../Tomboy/Note.cs:1675
+#: ../Tomboy/Note.cs:1678
 #, csharp-format
 msgid "Really delete \"{0}\"?"
 msgstr "Ne pewno usunąć \"{0}\"?"
 
-#: ../Tomboy/Note.cs:1678
+#: ../Tomboy/Note.cs:1681
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
@@ -1431,11 +1433,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:1689
+#: ../Tomboy/Note.cs:1692
 msgid "If you delete a note it is permanently lost."
 msgstr "Usunięcie spowoduję bezpowrotną utratę notatki."
 
-#: ../Tomboy/Note.cs:1723
+#: ../Tomboy/Note.cs:1726
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1446,13 +1448,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:1739
+#: ../Tomboy/Note.cs:1742
 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:263
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:264
 msgid "New Note Template"
 msgstr "Wzór nowej notatki"
 
@@ -1493,9 +1495,9 @@ msgstr ""
 "przechowywania notatek, i jeśli dalej się tym nie przejmujesz, po prostu "
 "<bold>usuń tę notatkę</bold>. :-)\n"
 "\n"
-"Stary katalog notatek jest cały czas bezpieczny i znajduje się w <link:url>"
-"{0}</link:url>. Jeśli zainstalowana zostanie starsza wersja programu Tomboy, "
-"tutaj będzie szukała notatek.\n"
+"Stary katalog notatek jest cały czas bezpieczny i znajduje się w <link:"
+"url>{0}</link:url>. Jeśli zainstalowana zostanie starsza wersja programu "
+"Tomboy, tutaj będzie szukała notatek.\n"
 "\n"
 "Notatki i konfiguracja została skopiowana do nowych katalogów, które od "
 "teraz będą używane:\n"
@@ -1506,8 +1508,8 @@ msgstr ""
 "</link:url>\n"
 "</list-item><list-item dir=\"ltr\">Dodatki można instalować w <link:url>{3}</"
 "link:url>\n"
-"</list-item><list-item dir=\"ltr\">Pliki dziennika można znaleźć w <link:url>"
-"{4}</link:url></list-item></list>\n"
+"</list-item><list-item dir=\"ltr\">Pliki dziennika można znaleźć w <link:"
+"url>{4}</link:url></list-item></list>\n"
 "\n"
 "Ciao!"
 
@@ -1588,9 +1590,18 @@ msgstr "Start"
 msgid "Using Links in Tomboy"
 msgstr "Używanie odnośników"
 
+#: ../Tomboy/NoteManager.cs:480
+#, csharp-format
+msgid "Note from {0}"
+msgstr "Notatka z dnia {0}"
+
+#: ../Tomboy/NoteManager.cs:480
+msgid "yyyy-MM-dd HH:mm:ss.fff"
+msgstr "yyyy-MM-dd HH:mm:ss.fff"
+
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:560 ../Tomboy/NoteManager.cs:663
+#: ../Tomboy/NoteManager.cs:559 ../Tomboy/NoteManager.cs:662
 msgid "Describe your new note here."
 msgstr "Treść nowej notatki..."
 
@@ -1822,27 +1833,27 @@ msgid "Bullets"
 msgstr "Wypunktowanie"
 
 # window title for exit dialog
-#: ../Tomboy/PreferencesDialog.cs:74
+#: ../Tomboy/PreferencesDialog.cs:75
 msgid "Editing"
 msgstr "Modyfikowanie"
 
-#: ../Tomboy/PreferencesDialog.cs:77
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Hotkeys"
 msgstr "Klawisze skrótów"
 
-#: ../Tomboy/PreferencesDialog.cs:79
+#: ../Tomboy/PreferencesDialog.cs:80
 msgid "Synchronization"
 msgstr "Synchronizacja"
 
-#: ../Tomboy/PreferencesDialog.cs:80
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Add-ins"
 msgstr "Dodatki"
 
-#: ../Tomboy/PreferencesDialog.cs:180
+#: ../Tomboy/PreferencesDialog.cs:181
 msgid "_Spell check while typing"
 msgstr "_Sprawdzanie pisowni podczas pisania"
 
-#: ../Tomboy/PreferencesDialog.cs:189
+#: ../Tomboy/PreferencesDialog.cs:190
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1851,11 +1862,11 @@ msgstr ""
 "prawidłowej pisowni będą dostępne w menu pod prawym przyciskiem myszy."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:200
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid "Highlight _WikiWords"
 msgstr "_Wyróżnianie WikiSłów"
 
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1864,31 +1875,31 @@ msgstr ""
 "b>. Kliknięcie takiego słowa utworzy notatkę o takiej właśnie nazwie."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:215
+#: ../Tomboy/PreferencesDialog.cs:216
 msgid "Enable auto-_bulleted lists"
 msgstr "A_utomatyczne wypunktowanie list"
 
-#: ../Tomboy/PreferencesDialog.cs:224
+#: ../Tomboy/PreferencesDialog.cs:225
 msgid "Use custom _font"
 msgstr "Własna _czcionka"
 
-#: ../Tomboy/PreferencesDialog.cs:242
+#: ../Tomboy/PreferencesDialog.cs:243
 msgid "When renaming a linked note: "
 msgstr "Podczas zmieniania nazwy notatki, do której prowadzą odnośniki: "
 
-#: ../Tomboy/PreferencesDialog.cs:245
+#: ../Tomboy/PreferencesDialog.cs:246
 msgid "Ask me what to do"
 msgstr "Pytanie co robić"
 
-#: ../Tomboy/PreferencesDialog.cs:246
+#: ../Tomboy/PreferencesDialog.cs:247
 msgid "Never rename links"
 msgstr "Bez zmieniania odnośników"
 
-#: ../Tomboy/PreferencesDialog.cs:247
+#: ../Tomboy/PreferencesDialog.cs:248
 msgid "Always rename links"
 msgstr "Stałe zmienianie odnośników"
 
-#: ../Tomboy/PreferencesDialog.cs:267
+#: ../Tomboy/PreferencesDialog.cs:268
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1896,16 +1907,16 @@ msgstr ""
 "Wzór nowej notatki pozwala określić domyślną treść dla nowo utworzonych "
 "notatek."
 
-#: ../Tomboy/PreferencesDialog.cs:276
+#: ../Tomboy/PreferencesDialog.cs:277
 msgid "Open New Note Template"
 msgstr "Otwórz wzór nowej notatki"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:333
+#: ../Tomboy/PreferencesDialog.cs:334
 msgid "Listen for _Hotkeys"
 msgstr "_Klawisze skrótów"
 
-#: ../Tomboy/PreferencesDialog.cs:342
+#: ../Tomboy/PreferencesDialog.cs:343
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><ALT>F11</b>, <b><ALT>N</b>"
@@ -1914,82 +1925,82 @@ msgstr ""
 "Przykładowe klawisze skrótów: <b><Alt>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:362
+#: ../Tomboy/PreferencesDialog.cs:363
 msgid "Show notes _menu"
 msgstr "Wyświetlanie _menu notatek"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:379
+#: ../Tomboy/PreferencesDialog.cs:380
 msgid "Open \"_Start Here\""
 msgstr "Otwarcie notatki \"_Start\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:396
+#: ../Tomboy/PreferencesDialog.cs:397
 msgid "Create _new note"
 msgstr "Utworzenie _nowej notatki"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:413
+#: ../Tomboy/PreferencesDialog.cs:414
 msgid "Open \"Search _All Notes\""
 msgstr "Otwarcie okna \"_Przeszukiwanie notatek\""
 
-#: ../Tomboy/PreferencesDialog.cs:440
+#: ../Tomboy/PreferencesDialog.cs:441
 msgid "Ser_vice:"
 msgstr "_Usługa:"
 
-#: ../Tomboy/PreferencesDialog.cs:493 ../Tomboy/PreferencesDialog.cs:1112
+#: ../Tomboy/PreferencesDialog.cs:494 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "Nie do konfiguracji"
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:520
 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:525
+#: ../Tomboy/PreferencesDialog.cs:526
 msgid "Minutes"
 msgstr "minut"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:547
+#: ../Tomboy/PreferencesDialog.cs:548
 msgid "_Advanced..."
 msgstr "Zaa_wansowane..."
 
-#: ../Tomboy/PreferencesDialog.cs:608
+#: ../Tomboy/PreferencesDialog.cs:609
 msgid "The following add-ins are installed"
 msgstr "Zainstalowano poniższe dodatki"
 
-#: ../Tomboy/PreferencesDialog.cs:629
+#: ../Tomboy/PreferencesDialog.cs:630
 msgid "Get More Add-Ins..."
 msgstr "Więcej dodatków..."
 
-#: ../Tomboy/PreferencesDialog.cs:647
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Włącz"
 
-#: ../Tomboy/PreferencesDialog.cs:653
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "Wyłą_cz"
 
-#: ../Tomboy/PreferencesDialog.cs:784
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Niezaimplementowane"
 
-#: ../Tomboy/PreferencesDialog.cs:798
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Preferencje programu {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:937
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Wybór czcionki notatki"
 
-#: ../Tomboy/PreferencesDialog.cs:981
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Inne opcje synchronizacji"
 
-#: ../Tomboy/PreferencesDialog.cs:987
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1997,23 +2008,23 @@ msgstr ""
 "Kiedy zostanie wykryty konflikt pomiędzy notatką lokalną a notatką na "
 "skonfigurowanym serwerze synchronizacji:"
 
-#: ../Tomboy/PreferencesDialog.cs:994
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Zawsze pytaj co robić."
 
-#: ../Tomboy/PreferencesDialog.cs:998
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Zmień nazwę notatki lokalnej."
 
-#: ../Tomboy/PreferencesDialog.cs:1002
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Zastąp kopię lokalną aktualizacją z serwera."
 
-#: ../Tomboy/PreferencesDialog.cs:1148
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "Are you sure?"
 msgstr "Na pewno?"
 
-#: ../Tomboy/PreferencesDialog.cs:1150
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -2021,11 +2032,11 @@ msgstr ""
 "Usunięcie ustawień synchronizacji nie jest zalecane. Może być konieczna "
 "ponowna synchronizacja wszystkich notatek po zapisaniu nowych ustawień."
 
-#: ../Tomboy/PreferencesDialog.cs:1163
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Usuwanie ustawień synchronizacji"
 
-#: ../Tomboy/PreferencesDialog.cs:1165
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -2035,11 +2046,11 @@ msgstr ""
 "synchronizacji zostaną usunięte. Może być konieczna ponowna synchronizacja "
 "wszystkich notatek po zapisaniu nowych ustawień."
 
-#: ../Tomboy/PreferencesDialog.cs:1243
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Connection successful"
 msgstr "Pomyślnie połączono"
 
-#: ../Tomboy/PreferencesDialog.cs:1245
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -2047,7 +2058,7 @@ msgstr ""
 "Program Tomboy jest gotowy do synchronizacji notatek. Zsynchronizować je "
 "teraz?"
 
-#: ../Tomboy/PreferencesDialog.cs:1268
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
@@ -2056,23 +2067,23 @@ msgstr ""
 "Proszę sprawdzić informacje i spróbować ponownie. Plik dziennika {0} może "
 "zawierać więcej informacji o błędzie."
 
-#: ../Tomboy/PreferencesDialog.cs:1280
+#: ../Tomboy/PreferencesDialog.cs:1281
 msgid "Error connecting"
 msgstr "Błąd podczas łączenia"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Version:"
 msgstr "Wersja:"
 
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1384
+#: ../Tomboy/PreferencesDialog.cs:1385
 msgid "Add-in Dependencies:"
 msgstr "Zależności dodatku:"
 
@@ -2426,8 +2437,8 @@ msgstr ""
 "Stanisław Małolepszy <smalolepszy at aviary.pl>, 2007\n"
 "Wadim Dziedzic <wdziedzic at aviary.pl>, 2007-2008\n"
 "Tomasz Dominikowski <dominikowski at gmail.com>, 2007-2009\n"
-"Piotr Drąg <piotrdrag at gmail.com>, 2009-2013\n"
-"Aviary.pl <gnomepl at aviary.pl>, 2007-2013"
+"Piotr Drąg <piotrdrag at gmail.com>, 2009-2014\n"
+"Aviary.pl <gnomepl at aviary.pl>, 2007-2014"
 
 #: ../Tomboy/Tomboy.cs:427
 msgid ""
@@ -2441,11 +2452,11 @@ msgstr ""
 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:439
+#: ../Tomboy/Tomboy.cs:441
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: ../Tomboy/Tomboy.cs:575
+#: ../Tomboy/Tomboy.cs:577
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright © 2004-2007 Alex Graveley\n"
@@ -2458,7 +2469,7 @@ msgstr ""
 "\n"
 "Copyright © 2004-2011 Inni\n"
 
-#: ../Tomboy/Tomboy.cs:589
+#: ../Tomboy/Tomboy.cs:591
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -2474,7 +2485,7 @@ msgstr ""
 "  --search [tekst]\t\tOtwiera okno wyszukiwania we wszystkich notatkach z "
 "podaną frazą.\n"
 
-#: ../Tomboy/Tomboy.cs:599
+#: ../Tomboy/Tomboy.cs:601
 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"
@@ -2489,7 +2500,7 @@ msgstr ""
 "  --highlight-search [tekst]\tWyszukuje i wyróżnia podany tekst w otwartej "
 "notatce.\n"
 
-#: ../Tomboy/Tomboy.cs:609
+#: ../Tomboy/Tomboy.cs:611
 msgid ""
 "  --addin:html-export-all [path]\tExports all notes to HTML in the given "
 "location.\n"
@@ -2501,7 +2512,7 @@ msgstr ""
 "  --addin:html-export-all-quit [ścieżka]\tEksportuje wszystkie notatki do "
 "pliku HTML w podanym położeniu, a następnie kończy działanie.\n"
 
-#: ../Tomboy/Tomboy.cs:619
+#: ../Tomboy/Tomboy.cs:621
 #, csharp-format
 msgid "Version {0}"
 msgstr "Wersja {0}"
@@ -2614,21 +2625,21 @@ msgstr "d MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(Bez tytułu {0})"
 
-#: ../Tomboy/Watchers.cs:189
+#: ../Tomboy/Watchers.cs:186
 #, 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
+#: ../Tomboy/Watchers.cs:201
 msgid "Note title taken"
 msgstr "Zapisano tytuł notatki"
 
-#: ../Tomboy/Watchers.cs:608
+#: ../Tomboy/Watchers.cs:605
 msgid "_Copy Link Address"
 msgstr "Skopiuj _adres odnośnika"
 
-#: ../Tomboy/Watchers.cs:613
+#: ../Tomboy/Watchers.cs:610
 msgid "_Open Link"
 msgstr "_Otwórz odnośnik"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c18128a..4f44f42 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,6 +13,7 @@
 # Gilfran Ribeiro <contato at gilfran.net>, 2010.
 # Antonio Fernandes C. Neto <fernandesn at gnome.org>, 2011.
 # Enrico Nicoletto <liverig at gmail.com>, 2013.
+# Rafael Ferreira <rafael.f.f1 at gmail.com>, 2013.
 #
 # Nota sobre a autoria:
 # Reconheço que a tradução inicial desse pacote não foi feita por mim,
@@ -24,16 +25,16 @@ 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: 2013-02-04 16:33+0000\n"
-"PO-Revision-Date: 2013-02-09 17:48-0300\n"
-"Last-Translator: Enrico Nicoletto <liverig at gmail.com>\n"
+"POT-Creation-Date: 2013-11-22 17:25+0000\n"
+"PO-Revision-Date: 2013-11-25 08:49-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1 at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
 "Language: pt_BR\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: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Tomboy Applet Factory"
@@ -253,7 +254,9 @@ msgstr ""
 "Máximo de caracteres do título da nota para mostrar na bandeja do Tomboy ou "
 "menu do miniaplicativo de notas no painel."
 
+#. Enable Startup Notes option
 #: ../data/tomboy.schemas.in.h:29
+#: ../Tomboy/Addins/AdvancedPreferences/EnableStartupNotesPreference.cs:27
 msgid "Enable startup notes"
 msgstr "Habilitar notas de inicialização"
 
@@ -730,17 +733,17 @@ msgid "Start synchronizing notes"
 msgstr "Iniciar a sincronização de notas"
 
 #. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:26
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:24
 msgid "Advanced"
 msgstr "Avançado"
 
 #. Menu Min Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:34
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:35
 msgid "Minimum number of notes to show in Recent list"
 msgstr "Número mínimo de notas para mostrar na lista Recentes"
 
 #. Menu Max Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:58
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:59
 msgid "Maximum number of notes to show in Recent list"
 msgstr "Número máximo de notas a serem mostradas na lista Recentes"
 
@@ -827,28 +830,28 @@ msgstr "Incluir todas as notas vinculadas"
 msgid "Export to HTML"
 msgstr "Exportar para HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:116
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "Sua nota foi exportada para \"{0}\"."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:127
 msgid "Note exported successfully"
 msgstr "Nota exportada com sucesso"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 #: ../Tomboy/ExportAllApplicationAddin.cs:250
 #: ../Tomboy/ExportAllApplicationAddin.cs:328
 msgid "Access denied."
 msgstr "Acesso negado."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:135
 #: ../Tomboy/ExportAllApplicationAddin.cs:255
 #: ../Tomboy/ExportAllApplicationAddin.cs:333
 msgid "Folder does not exist."
 msgstr "Pasta inexistente."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:150
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "Não foi possível salvar o arquivo \"{0}\""
@@ -1413,28 +1416,28 @@ msgstr "Catálogo"
 msgid "_New notebook..."
 msgstr "_Novo catálogo..."
 
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
+#: ../Tomboy/Note.cs:515
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Nova nota \"{0}\""
 
-#: ../Tomboy/Note.cs:1675
+#: ../Tomboy/Note.cs:1678
 #, csharp-format
 msgid "Really delete \"{0}\"?"
 msgstr "Você realmente deseja excluir \"{0}\"?"
 
-#: ../Tomboy/Note.cs:1678
+#: ../Tomboy/Note.cs:1681
 #, 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:1689
+#: ../Tomboy/Note.cs:1692
 msgid "If you delete a note it is permanently lost."
 msgstr "Se você excluir uma nota ela estará permanentemente perdida."
 
-#: ../Tomboy/Note.cs:1723
+#: ../Tomboy/Note.cs:1726
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1445,13 +1448,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:1739
+#: ../Tomboy/Note.cs:1742
 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:263
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:264
 msgid "New Note Template"
 msgstr "Modelo de nova nota"
 
@@ -1502,8 +1505,8 @@ msgstr ""
 "url>{1}</link:url>\n"
 "</list-item><list-item dir=\"ltr\">A configuração está em <link:url>{2}</"
 "link:url>\n"
-"</list-item><list-item dir=\"ltr\">Você pode instalar plug-ins em <link:url>"
-"{3}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">Você pode instalar plug-ins em <link:"
+"url>{3}</link:url>\n"
 "</list-item><list-item dir=\"ltr\">Arquivos de registro podem ser "
 "encontrados em <link:url>{4}</link:url></list-item></list>\n"
 "\n"
@@ -1585,9 +1588,18 @@ msgstr "Comece aqui"
 msgid "Using Links in Tomboy"
 msgstr "Utilizando links no Tomboy"
 
+#: ../Tomboy/NoteManager.cs:480
+#, csharp-format
+msgid "Note from {0}"
+msgstr "Nota de {0}"
+
+#: ../Tomboy/NoteManager.cs:480
+msgid "yyyy-MM-dd HH:mm:ss.fff"
+msgstr "dd-MM-yyyy HH:mm:ss.fff"
+
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:560 ../Tomboy/NoteManager.cs:663
+#: ../Tomboy/NoteManager.cs:559 ../Tomboy/NoteManager.cs:662
 msgid "Describe your new note here."
 msgstr "Descreva sua nova nota aqui."
 
@@ -1818,27 +1830,27 @@ msgstr "Diminuir tamanho da fonte"
 msgid "Bullets"
 msgstr "Marcadores"
 
-#: ../Tomboy/PreferencesDialog.cs:74
+#: ../Tomboy/PreferencesDialog.cs:75
 msgid "Editing"
 msgstr "Edição"
 
-#: ../Tomboy/PreferencesDialog.cs:77
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Hotkeys"
 msgstr "Teclas de atalho"
 
-#: ../Tomboy/PreferencesDialog.cs:79
+#: ../Tomboy/PreferencesDialog.cs:80
 msgid "Synchronization"
 msgstr "Sincronização"
 
-#: ../Tomboy/PreferencesDialog.cs:80
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Add-ins"
 msgstr "Plug-ins"
 
-#: ../Tomboy/PreferencesDialog.cs:180
+#: ../Tomboy/PreferencesDialog.cs:181
 msgid "_Spell check while typing"
 msgstr "_Verificação ortográfica ao digitar"
 
-#: ../Tomboy/PreferencesDialog.cs:189
+#: ../Tomboy/PreferencesDialog.cs:190
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1847,11 +1859,11 @@ msgstr ""
 "ortografia mostradas no menu de contexto."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:200
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid "Highlight _WikiWords"
 msgstr "Destacar _WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1860,31 +1872,31 @@ msgstr ""
 "Clicar na palavra criará uma nota com aquele nome."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:215
+#: ../Tomboy/PreferencesDialog.cs:216
 msgid "Enable auto-_bulleted lists"
 msgstr "Habilitar listas _marcadas automaticamente"
 
-#: ../Tomboy/PreferencesDialog.cs:224
+#: ../Tomboy/PreferencesDialog.cs:225
 msgid "Use custom _font"
 msgstr "Usar _fonte personalizada"
 
-#: ../Tomboy/PreferencesDialog.cs:242
+#: ../Tomboy/PreferencesDialog.cs:243
 msgid "When renaming a linked note: "
 msgstr "Quando renomear uma nota vinculada: "
 
-#: ../Tomboy/PreferencesDialog.cs:245
+#: ../Tomboy/PreferencesDialog.cs:246
 msgid "Ask me what to do"
 msgstr "Perguntar o que fazer"
 
-#: ../Tomboy/PreferencesDialog.cs:246
+#: ../Tomboy/PreferencesDialog.cs:247
 msgid "Never rename links"
 msgstr "Nunca renomear os links"
 
-#: ../Tomboy/PreferencesDialog.cs:247
+#: ../Tomboy/PreferencesDialog.cs:248
 msgid "Always rename links"
 msgstr "Sempre renomear os links"
 
-#: ../Tomboy/PreferencesDialog.cs:267
+#: ../Tomboy/PreferencesDialog.cs:268
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1892,16 +1904,16 @@ msgstr ""
 "Usar o novo modelo de nota para especificar o texto que deve ser usado ao "
 "criar uma nova nota."
 
-#: ../Tomboy/PreferencesDialog.cs:276
+#: ../Tomboy/PreferencesDialog.cs:277
 msgid "Open New Note Template"
 msgstr "Abrir modelo de nova nota"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:333
+#: ../Tomboy/PreferencesDialog.cs:334
 msgid "Listen for _Hotkeys"
 msgstr "Capturar t_eclas de atalho"
 
-#: ../Tomboy/PreferencesDialog.cs:342
+#: ../Tomboy/PreferencesDialog.cs:343
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><ALT>F11</b>, <b><ALT>N</b>"
@@ -1911,82 +1923,82 @@ msgstr ""
 "F11</b>, <b><ALT>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:362
+#: ../Tomboy/PreferencesDialog.cs:363
 msgid "Show notes _menu"
 msgstr "Mostrar _menu de notas"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:379
+#: ../Tomboy/PreferencesDialog.cs:380
 msgid "Open \"_Start Here\""
 msgstr "Abrir \"_Comece aqui\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:396
+#: ../Tomboy/PreferencesDialog.cs:397
 msgid "Create _new note"
 msgstr "_Criar nova nota"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:413
+#: ../Tomboy/PreferencesDialog.cs:414
 msgid "Open \"Search _All Notes\""
 msgstr "Abrir \"Pesquisar em _todas as notas\""
 
-#: ../Tomboy/PreferencesDialog.cs:440
+#: ../Tomboy/PreferencesDialog.cs:441
 msgid "Ser_vice:"
 msgstr "Ser_viço:"
 
-#: ../Tomboy/PreferencesDialog.cs:493 ../Tomboy/PreferencesDialog.cs:1112
+#: ../Tomboy/PreferencesDialog.cs:494 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "Não configurável"
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:520
 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:525
+#: ../Tomboy/PreferencesDialog.cs:526
 msgid "Minutes"
 msgstr "Minutos"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:547
+#: ../Tomboy/PreferencesDialog.cs:548
 msgid "_Advanced..."
 msgstr "_Avançado..."
 
-#: ../Tomboy/PreferencesDialog.cs:608
+#: ../Tomboy/PreferencesDialog.cs:609
 msgid "The following add-ins are installed"
 msgstr "Os seguintes plug-ins estão instalados"
 
-#: ../Tomboy/PreferencesDialog.cs:629
+#: ../Tomboy/PreferencesDialog.cs:630
 msgid "Get More Add-Ins..."
 msgstr "Obter mais complementos..."
 
-#: ../Tomboy/PreferencesDialog.cs:647
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: ../Tomboy/PreferencesDialog.cs:653
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_Desabilitar"
 
-#: ../Tomboy/PreferencesDialog.cs:784
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Não implementado"
 
-#: ../Tomboy/PreferencesDialog.cs:798
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "Preferências de {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:937
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Escolha a fonte das notas"
 
-#: ../Tomboy/PreferencesDialog.cs:981
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Outras opções de sincronização"
 
-#: ../Tomboy/PreferencesDialog.cs:987
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1994,23 +2006,23 @@ msgstr ""
 "Quando um conflito for detectado entre uma nota local e uma nota no servidor "
 "de sincronização configurado:"
 
-#: ../Tomboy/PreferencesDialog.cs:994
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Sempre me perguntar o que fazer."
 
-#: ../Tomboy/PreferencesDialog.cs:998
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Renomear minha nota local."
 
-#: ../Tomboy/PreferencesDialog.cs:1002
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Substituir minha nota local com a atualização do servidor."
 
-#: ../Tomboy/PreferencesDialog.cs:1148
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "Are you sure?"
 msgstr "Você tem certeza?"
 
-#: ../Tomboy/PreferencesDialog.cs:1150
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -2019,11 +2031,11 @@ msgstr ""
 "forçado a sincronizar todas as suas notas novamente quando salvar "
 "configurações novas."
 
-#: ../Tomboy/PreferencesDialog.cs:1163
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Restaurando configurações de sincronização"
 
-#: ../Tomboy/PreferencesDialog.cs:1165
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -2033,11 +2045,11 @@ msgstr ""
 "de sincronização serão apagadas agora. Você pode ser forçado a sincronizar "
 "todas as suas notas novamente quando salvar novas configurações."
 
-#: ../Tomboy/PreferencesDialog.cs:1243
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Connection successful"
 msgstr "Conectado com sucesso"
 
-#: ../Tomboy/PreferencesDialog.cs:1245
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -2045,7 +2057,7 @@ msgstr ""
 "O Tomboy está pronto para sincronizar suas notas. Você gostaria de "
 "sincronizá-las agora?"
 
-#: ../Tomboy/PreferencesDialog.cs:1268
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
@@ -2054,23 +2066,23 @@ msgstr ""
 "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:1280
+#: ../Tomboy/PreferencesDialog.cs:1281
 msgid "Error connecting"
 msgstr "Erro ao conectar"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Version:"
 msgstr "Versão:"
 
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1384
+#: ../Tomboy/PreferencesDialog.cs:1385
 msgid "Add-in Dependencies:"
 msgstr "Dependências do plug-in:"
 
@@ -2440,11 +2452,11 @@ msgstr ""
 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:439
+#: ../Tomboy/Tomboy.cs:441
 msgid "Homepage"
 msgstr "Página inicial"
 
-#: ../Tomboy/Tomboy.cs:575
+#: ../Tomboy/Tomboy.cs:577
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright © 2004-2007 Alex Graveley\n"
@@ -2458,7 +2470,7 @@ msgstr ""
 "\n"
 "Copyright © 2004-2011 Outros\n"
 
-#: ../Tomboy/Tomboy.cs:589
+#: ../Tomboy/Tomboy.cs:591
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -2473,7 +2485,7 @@ msgstr ""
 "  --search [texto]\t\tAbre a janela de pesquisar em todas as notas com o "
 "texto como busca.\n"
 
-#: ../Tomboy/Tomboy.cs:599
+#: ../Tomboy/Tomboy.cs:601
 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"
@@ -2488,7 +2500,7 @@ msgstr ""
 "  --highlight-search [texto]\tPesquisa e destaca um texto na nota aberta.\n"
 
 # Reorganizei para ficar alinhado com os outros itens do "tomboy --help" -- Rafael Ferreira
-#: ../Tomboy/Tomboy.cs:609
+#: ../Tomboy/Tomboy.cs:611
 msgid ""
 "  --addin:html-export-all [path]\tExports all notes to HTML in the given "
 "location.\n"
@@ -2500,7 +2512,7 @@ msgstr ""
 "  --addin:html-export-all-quit [caminho]\n"
 "\t\t\t\tExporta todas as notas para HTML na localização dada e sai.\n"
 
-#: ../Tomboy/Tomboy.cs:619
+#: ../Tomboy/Tomboy.cs:621
 #, csharp-format
 msgid "Version {0}"
 msgstr "Versão {0}"
@@ -2609,7 +2621,7 @@ msgstr "d MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(Sem título {0})"
 
-#: ../Tomboy/Watchers.cs:189
+#: ../Tomboy/Watchers.cs:186
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -2618,15 +2630,15 @@ 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
+#: ../Tomboy/Watchers.cs:201
 msgid "Note title taken"
 msgstr "Título de nota já existente"
 
-#: ../Tomboy/Watchers.cs:608
+#: ../Tomboy/Watchers.cs:605
 msgid "_Copy Link Address"
 msgstr "_Copiar endereço do link"
 
-#: ../Tomboy/Watchers.cs:613
+#: ../Tomboy/Watchers.cs:610
 msgid "_Open Link"
 msgstr "_Abrir link"
 
diff --git a/po/sl.po b/po/sl.po
index a4dadb5..a6c5915 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@
 #
 # Matjaž Horvat <m at owca.info>, 2006.
 # Andrej Žnidaršič <andrej.znidarsic at gmail.com>, 2010.
-# Matej Urbančič <mateju at svn.gnome.org>, 2007 - 2011.
+# Matej Urbančič <mateju at svn.gnome.org>, 2007 - 2013.
 #
 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: 2013-01-24 15:43+0000\n"
-"PO-Revision-Date: 2013-01-26 20:25+0100\n"
+"POT-Creation-Date: 2013-12-20 16:51+0000\n"
+"PO-Revision-Date: 2013-12-21 22:47+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"
@@ -239,7 +239,9 @@ msgstr ""
 "Največje število znakov naslova sporočilca prikazanih v sistemski vrstici "
 "ali v meniju apleta pulta."
 
+#. Enable Startup Notes option
 #: ../data/tomboy.schemas.in.h:29
+#: ../Tomboy/Addins/AdvancedPreferences/EnableStartupNotesPreference.cs:27
 msgid "Enable startup notes"
 msgstr "Omogoči sporočilca ob zagonu"
 
@@ -707,17 +709,17 @@ msgid "Start synchronizing notes"
 msgstr "Začni usklajevanje sporočilc"
 
 #. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:26
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:24
 msgid "Advanced"
 msgstr "Napredno"
 
 #. Menu Min Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:34
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:35
 msgid "Minimum number of notes to show in Recent list"
 msgstr "Najmanjše število v seznamu prikazanih nedavnih sporočilc"
 
 #. Menu Max Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:58
+#: ../Tomboy/Addins/AdvancedPreferences/MenuMinMaxNoteCountPreference.cs:59
 msgid "Maximum number of notes to show in Recent list"
 msgstr "Največje število v seznamu prikazanih nedavnih sporočilc"
 
@@ -803,28 +805,28 @@ msgstr "Vključi vsa ostala povezana sporočilca"
 msgid "Export to HTML"
 msgstr "Izvozi v HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:116
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "Sporočilce je bilo izvoženo v \"{0}\"."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:127
 msgid "Note exported successfully"
 msgstr "Sporočilce je bilo uspešno izvoženo"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 #: ../Tomboy/ExportAllApplicationAddin.cs:250
 #: ../Tomboy/ExportAllApplicationAddin.cs:328
 msgid "Access denied."
 msgstr "Dostop je zavrnjen."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:135
 #: ../Tomboy/ExportAllApplicationAddin.cs:255
 #: ../Tomboy/ExportAllApplicationAddin.cs:333
 msgid "Folder does not exist."
 msgstr "Mapa ne obstaja."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:150
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "Ni mogoče shraniti datoteke \"{0}\""
@@ -1393,17 +1395,17 @@ msgstr "Beležka"
 msgid "_New notebook..."
 msgstr "Nova _beležka ..."
 
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
+#: ../Tomboy/Note.cs:515
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Novo sporočilce {0}"
 
-#: ../Tomboy/Note.cs:1675
+#: ../Tomboy/Note.cs:1678
 #, csharp-format
 msgid "Really delete \"{0}\"?"
 msgstr "Ali naj se \"{0}\" res izbriše?"
 
-#: ../Tomboy/Note.cs:1678
+#: ../Tomboy/Note.cs:1681
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
@@ -1412,11 +1414,11 @@ 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:1689
+#: ../Tomboy/Note.cs:1692
 msgid "If you delete a note it is permanently lost."
 msgstr "V primeru da sporočilce izbrišete, bo trajno izgubljeno."
 
-#: ../Tomboy/Note.cs:1723
+#: ../Tomboy/Note.cs:1726
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1427,13 +1429,13 @@ msgstr ""
 "prostora na disku in da imate ustrezna dovoljenja v {0}. Podrobnosti o "
 "napaki je mogoče najti v {1}."
 
-#: ../Tomboy/Note.cs:1739
+#: ../Tomboy/Note.cs:1742
 msgid "Error saving note data."
 msgstr "Napaka med shranjevanjem podatkov."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:263
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:264
 msgid "New Note Template"
 msgstr "Nova predloga sporočilca"
 
@@ -1568,9 +1570,18 @@ msgstr "Začnite tukaj"
 msgid "Using Links in Tomboy"
 msgstr "Uporaba povezav v programu Tomboy"
 
+#: ../Tomboy/NoteManager.cs:480
+#, csharp-format
+msgid "Note from {0}"
+msgstr "Sporočilce od {0}"
+
+#: ../Tomboy/NoteManager.cs:480
+msgid "yyyy-MM-dd HH:mm:ss.fff"
+msgstr "dd.MM.yyyy, hh:mm:ss.fff"
+
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:560 ../Tomboy/NoteManager.cs:663
+#: ../Tomboy/NoteManager.cs:559 ../Tomboy/NoteManager.cs:662
 msgid "Describe your new note here."
 msgstr "Tukaj opišite svoje novo sporočilce."
 
@@ -1801,27 +1812,27 @@ msgstr "Pomanjšaj velikost pisave"
 msgid "Bullets"
 msgstr "Vrstične oznake"
 
-#: ../Tomboy/PreferencesDialog.cs:74
+#: ../Tomboy/PreferencesDialog.cs:75
 msgid "Editing"
 msgstr "Urejanje"
 
-#: ../Tomboy/PreferencesDialog.cs:77
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Hotkeys"
 msgstr "Hitre tipke"
 
-#: ../Tomboy/PreferencesDialog.cs:79
+#: ../Tomboy/PreferencesDialog.cs:80
 msgid "Synchronization"
 msgstr "Usklajevanje"
 
-#: ../Tomboy/PreferencesDialog.cs:80
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Add-ins"
 msgstr "Vstavki"
 
-#: ../Tomboy/PreferencesDialog.cs:180
+#: ../Tomboy/PreferencesDialog.cs:181
 msgid "_Spell check while typing"
 msgstr "_Preverjanje črkovanje med tipkanjem"
 
-#: ../Tomboy/PreferencesDialog.cs:189
+#: ../Tomboy/PreferencesDialog.cs:190
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1830,11 +1841,11 @@ msgstr ""
 "desnega klika."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:200
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid "Highlight _WikiWords"
 msgstr "Poudari _WikiBesede"
 
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1843,31 +1854,31 @@ msgstr ""
 "besedo se ustvari sporočilce s tem imenom."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:215
+#: ../Tomboy/PreferencesDialog.cs:216
 msgid "Enable auto-_bulleted lists"
 msgstr "Omogoči samodejno _vrstično označene sezname"
 
-#: ../Tomboy/PreferencesDialog.cs:224
+#: ../Tomboy/PreferencesDialog.cs:225
 msgid "Use custom _font"
 msgstr "Uporabi _pisavo po meri"
 
-#: ../Tomboy/PreferencesDialog.cs:242
+#: ../Tomboy/PreferencesDialog.cs:243
 msgid "When renaming a linked note: "
 msgstr "Ob preimenovanju povezanega sporočilca:"
 
-#: ../Tomboy/PreferencesDialog.cs:245
+#: ../Tomboy/PreferencesDialog.cs:246
 msgid "Ask me what to do"
 msgstr "Vedno me vprašaj za potrditev"
 
-#: ../Tomboy/PreferencesDialog.cs:246
+#: ../Tomboy/PreferencesDialog.cs:247
 msgid "Never rename links"
 msgstr "Niikoli ne preimenuj povezav"
 
-#: ../Tomboy/PreferencesDialog.cs:247
+#: ../Tomboy/PreferencesDialog.cs:248
 msgid "Always rename links"
 msgstr "Vedno preimenuj povezave"
 
-#: ../Tomboy/PreferencesDialog.cs:267
+#: ../Tomboy/PreferencesDialog.cs:268
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1875,16 +1886,16 @@ msgstr ""
 "Uporabite predlogo novega sporočilca za vpis besedila, ki bo uporabljeno ob "
 "ustvarjanju novega sporočilca."
 
-#: ../Tomboy/PreferencesDialog.cs:276
+#: ../Tomboy/PreferencesDialog.cs:277
 msgid "Open New Note Template"
 msgstr "Odpri predlogo novega sporočilca"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:333
+#: ../Tomboy/PreferencesDialog.cs:334
 msgid "Listen for _Hotkeys"
 msgstr "Čakaj na _hitre tipke"
 
-#: ../Tomboy/PreferencesDialog.cs:342
+#: ../Tomboy/PreferencesDialog.cs:343
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><ALT>F11</b>, <b><ALT>N</b>"
@@ -1893,105 +1904,105 @@ msgstr ""
 "bližnjico. Primer hitrih tipk: <b><ALT>F11</b>, <b><ALT>N</b> ..."
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:362
+#: ../Tomboy/PreferencesDialog.cs:363
 msgid "Show notes _menu"
 msgstr "Pokaži _meni sporočilc"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:379
+#: ../Tomboy/PreferencesDialog.cs:380
 msgid "Open \"_Start Here\""
 msgstr "Odpri \"_Začnite tukaj\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:396
+#: ../Tomboy/PreferencesDialog.cs:397
 msgid "Create _new note"
 msgstr "Ustvari _novo sporočilce"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:413
+#: ../Tomboy/PreferencesDialog.cs:414
 msgid "Open \"Search _All Notes\""
 msgstr "Odpri \"Poišči po _vseh sporočilcih\""
 
-#: ../Tomboy/PreferencesDialog.cs:440
+#: ../Tomboy/PreferencesDialog.cs:441
 msgid "Ser_vice:"
 msgstr "_Storitev:"
 
-#: ../Tomboy/PreferencesDialog.cs:493 ../Tomboy/PreferencesDialog.cs:1112
+#: ../Tomboy/PreferencesDialog.cs:494 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "Ni nastavljivo"
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:520
 msgid "Automaticall_y Sync in Background Every"
 msgstr "_Samodejno uskladi v ozadju vsakih"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:525
+#: ../Tomboy/PreferencesDialog.cs:526
 msgid "Minutes"
 msgstr "Minute"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:547
+#: ../Tomboy/PreferencesDialog.cs:548
 msgid "_Advanced..."
 msgstr "_Napredno ..."
 
-#: ../Tomboy/PreferencesDialog.cs:608
+#: ../Tomboy/PreferencesDialog.cs:609
 msgid "The following add-ins are installed"
 msgstr "Nameščeni so naslednji vstavki"
 
-#: ../Tomboy/PreferencesDialog.cs:629
+#: ../Tomboy/PreferencesDialog.cs:630
 msgid "Get More Add-Ins..."
 msgstr "Več vstavkov ..."
 
-#: ../Tomboy/PreferencesDialog.cs:647
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Omogoči"
 
-#: ../Tomboy/PreferencesDialog.cs:653
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "O_nemogoči"
 
-#: ../Tomboy/PreferencesDialog.cs:784
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Ni podprto"
 
-#: ../Tomboy/PreferencesDialog.cs:798
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Možnosti"
 
-#: ../Tomboy/PreferencesDialog.cs:937
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Izbor pisave sporočilca"
 
-#: ../Tomboy/PreferencesDialog.cs:981
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Druge možnosti usklajevanja"
 
-#: ../Tomboy/PreferencesDialog.cs:987
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr ""
 "Ko je zaznan spor med krajevno in oddaljeno kopijo na strežniku usklajevanja:"
 
-#: ../Tomboy/PreferencesDialog.cs:994
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Vedno me vprašaj za potrditev dejanja."
 
-#: ../Tomboy/PreferencesDialog.cs:998
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Preimenuj krajevno sporočilce."
 
-#: ../Tomboy/PreferencesDialog.cs:1002
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Zamenjaj krajevno sporočilce s posodobljenim sporočilcem na strežniku."
 
-#: ../Tomboy/PreferencesDialog.cs:1148
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "Are you sure?"
 msgstr "Ali ste prepričani?"
 
-#: ../Tomboy/PreferencesDialog.cs:1150
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1999,11 +2010,11 @@ msgstr ""
 "Čiščenje nastavitev usklajevanja ni priporočeno. Lahko se zgodi, da boste "
 "morali po shranjevanju novih nastavitev ponovno uskladiti vsa sporočilca."
 
-#: ../Tomboy/PreferencesDialog.cs:1163
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Ponastavljanje nastavitev usklajevanja"
 
-#: ../Tomboy/PreferencesDialog.cs:1165
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -2013,11 +2024,11 @@ msgstr ""
 "usklajevanja bodo počiščene. Lahko se zgodi, da bo treba vsa sporočilca "
 "znova uskladiti z novimi nastavitvami."
 
-#: ../Tomboy/PreferencesDialog.cs:1243
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Connection successful"
 msgstr "Povezava je uspešno vzpostavljena"
 
-#: ../Tomboy/PreferencesDialog.cs:1245
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -2025,7 +2036,7 @@ msgstr ""
 "Program Tomboy je pripravljen na usklajevanje sporočilc. Ali želite takoj "
 "zagnati usklajevanje?"
 
-#: ../Tomboy/PreferencesDialog.cs:1268
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Please check your information and try again.  The log file {0} may contain "
@@ -2034,23 +2045,23 @@ msgstr ""
 "Preverite svoje podatke in poskusite znova. Več podrobnosti je mogoče najti "
 "tudi v dnevniški datoteki {0}."
 
-#: ../Tomboy/PreferencesDialog.cs:1280
+#: ../Tomboy/PreferencesDialog.cs:1281
 msgid "Error connecting"
 msgstr "Napaka med povezovanjem"
 
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Version:"
 msgstr "Različica:"
 
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Author:"
 msgstr "Avtor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Copyright:"
 msgstr "Avtorske pravice:"
 
-#: ../Tomboy/PreferencesDialog.cs:1384
+#: ../Tomboy/PreferencesDialog.cs:1385
 msgid "Add-in Dependencies:"
 msgstr "Odvisnosti vstavkov:"
 
@@ -2417,11 +2428,11 @@ msgstr ""
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "Preprost in enostaven program za pisanje sporočilc."
 
-#: ../Tomboy/Tomboy.cs:439
+#: ../Tomboy/Tomboy.cs:441
 msgid "Homepage"
 msgstr "Domača stran"
 
-#: ../Tomboy/Tomboy.cs:575
+#: ../Tomboy/Tomboy.cs:577
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright © 2004-2007 Alex Graveley\n"
@@ -2435,7 +2446,7 @@ msgstr ""
 "\n"
 "Avtorske pravice © 2004-2011 Drugi razvijalci\n"
 
-#: ../Tomboy/Tomboy.cs:589
+#: ../Tomboy/Tomboy.cs:591
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -2449,7 +2460,7 @@ msgstr ""
 "  --note-path [path]\t\tNaloži/shrani podatke o sporočilcu v tej mapi.\n"
 "  --search [text]\t\tOdpre okno vseh sporočil z iskanim besedilom.\n"
 
-#: ../Tomboy/Tomboy.cs:599
+#: ../Tomboy/Tomboy.cs:601
 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"
@@ -2464,7 +2475,7 @@ msgstr ""
 "  --start-here\t\t\tPrikaže sporočilce 'Začnite tukaj'.\n"
 "  --highlight-search [text]\tIšče in poudari besedilo v odprtem sporočilcu.\n"
 
-#: ../Tomboy/Tomboy.cs:609
+#: ../Tomboy/Tomboy.cs:611
 msgid ""
 "  --addin:html-export-all [path]\tExports all notes to HTML in the given "
 "location.\n"
@@ -2476,7 +2487,7 @@ msgstr ""
 "  --addin:html-export-all-quit [path]\tIzvozi vsa sporočilca v datoteke HTML "
 "na podano mesto in konča program.\n"
 
-#: ../Tomboy/Tomboy.cs:619
+#: ../Tomboy/Tomboy.cs:621
 #, csharp-format
 msgid "Version {0}"
 msgstr "Različica {0}"
@@ -2593,7 +2604,7 @@ msgstr "MMMM d yyyy"
 msgid "(Untitled {0})"
 msgstr "(Neimenovano {0})"
 
-#: ../Tomboy/Watchers.cs:189
+#: ../Tomboy/Watchers.cs:186
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -2602,15 +2613,15 @@ msgstr ""
 "Sporočilce z naslovom <b>{0}</b> že obstaja. Pred nadaljevanjem izberite "
 "drug naslov sporočilca."
 
-#: ../Tomboy/Watchers.cs:204
+#: ../Tomboy/Watchers.cs:201
 msgid "Note title taken"
 msgstr "Naslov sporočilca je v uporabi"
 
-#: ../Tomboy/Watchers.cs:608
+#: ../Tomboy/Watchers.cs:605
 msgid "_Copy Link Address"
 msgstr "_Kopiraj naslov povezave"
 
-#: ../Tomboy/Watchers.cs:613
+#: ../Tomboy/Watchers.cs:610
 msgid "_Open Link"
 msgstr "_Odpri povezavo"
 
diff --git a/test/Makefile.in b/test/Makefile.in
index f20414c..820cd9b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = test
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -60,6 +88,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -67,6 +107,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -325,11 +366,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -468,15 +507,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 $(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
diff --git a/tomboy.spec b/tomboy.spec
index 849bbe0..6d08625 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        1.15.2
+Version:        1.15.4
 Release:        1
 Epoch:          0
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/tomboy.git



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