commit 1741f40299943f8f50cd916cdc5ffd17ca4af057
Author: Aaron Borden <adborden@live.com>
Date:   Mon Aug 22 12:46:23 2011 -0700

    Remove code from bad merge

 Tomboy/NoteManager.cs |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

commit e0bf39a123a64b75e860e5955d619bc54a8128db
Author: Aaron Borden <adborden@live.com>
Date:   Wed Apr 27 17:10:25 2011 -0700

    Save title option for template bar
    
    Adds a setting to the template bar to allow new notes based on the template to
    use the template note's title as the base title for the new note. e.g. a note
    based on a template named "Tomboy Bug Note" would have the name "Tomboy Bug
    Note 101"

 Tomboy/NoteManager.cs |    4 ++++
 Tomboy/NoteWindow.cs  |   11 +++++++++++
 Tomboy/TagManager.cs  |    1 +
 3 files changed, 16 insertions(+), 0 deletions(-)

commit 6dcc433d6261a6aeec20c352e33f84d6d96d74a1
Author: Aaron Borden <adborden@live.com>
Date:   Fri Apr 15 08:01:19 2011 -0700

    Save selection bound using template-bar
    
    Choosing "Save Selection" will save the selection bound in addition to the
    cursor's position.

 Tomboy/NoteManager.cs |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

commit 72699901d3559bd5fde4a92d72abe1fac0d4a42f
Author: Aaron Borden <adborden@live.com>
Date:   Fri Apr 15 07:36:47 2011 -0700

    Save selection per note
    
    New property selection-bound-position which stores the position of the text
    buffer's selection mark.

 Tomboy/Note.cs |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

commit 0a0115c4f079d64cd9b8c6e69283e214c2fc11c9
Author: Aaron Borden <adborden@live.com>
Date:   Tue Apr 12 19:08:54 2011 -0700

    Template bar functionality for size and cursor pos
    
    The template bar allows saving the note's size and text selection. When these
    options are selected, new notes based on the template will be created with the
    same size and cursor position as the template.

 Tomboy/NoteManager.cs |   21 +++++++++++++++++++++
 Tomboy/NoteWindow.cs  |    6 +++---
 Tomboy/TagManager.cs  |    2 ++
 3 files changed, 26 insertions(+), 3 deletions(-)

commit c43cc3696af9150a3225602af1be9e95fab87b19
Author: Aaron Borden <adborden@live.com>
Date:   Fri Apr 8 19:08:51 2011 -0700

    Add CreateNoteFromTemplate method
    
    CreateNoteFromTemplate method cleans up the logic of creating a new note whose
    body is based on a template. This also fixes an issue where trailing whitespace
    on the title line of a template note will appear in the new note.

 Tomboy/NoteManager.cs        |   68 +++++++++++++++++++++++++++++++++--------
 Tomboy/Notebooks/Notebook.cs |   15 +++++++++
 2 files changed, 69 insertions(+), 14 deletions(-)

commit faa29b032abb4b8ffd330dfcf76d42678812078c
Author: Aaron Borden <adborden@live.com>
Date:   Sat Apr 9 00:06:39 2011 -0700

    Allow renaming of template notes
    
    Find temlpate notes by tag instead of by name. This allows the user to modify
    the template's name without losing it.
    
    http://bugzilla.gnome.org/show_bug.cgi?id=509147

 Tomboy/Note.cs                              |    2 +-
 Tomboy/NoteManager.cs                       |   48 ++++++++++++++++++++++-----
 Tomboy/Notebooks/Notebook.cs                |   27 +++++++++-----
 Tomboy/Notebooks/NotebookManager.cs         |    4 ++-
 Tomboy/Notebooks/NotebookNewNoteMenuItem.cs |    4 ++-
 Tomboy/RecentChanges.cs                     |    4 ++-
 6 files changed, 66 insertions(+), 23 deletions(-)

commit b5c481da5e9dafd6973411c640c05b243e01dba1
Author: Sandy Armstrong <sanfordarmstrong@gmail.com>
Date:   Sun Jul 25 21:56:21 2010 -0700

    Prevent NRE exposed by previous commit
    
    Signed-off-by: Aaron Borden <adborden@live.com>

 Tomboy/Watchers.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit d07211a71bd2ae2460ba8b65d2b8ef6115ab8978
Author: Sandy Armstrong <sanfordarmstrong@gmail.com>
Date:   Sun Jul 25 21:56:06 2010 -0700

    Add non-functional UI for saving size/selection
    
    Signed-off-by: Aaron Borden <adborden@live.com>

 Tomboy/NoteWindow.cs |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

commit 14c603fc7c8ba80b362164af52c113a32b730d53
Author: Sandy Armstrong <sanfordarmstrong@gmail.com>
Date:   Sun Jul 25 09:42:35 2010 -0700

    Wrap translatable string in Catalog call
    
    Signed-off-by: Aaron Borden <adborden@live.com>

 Tomboy/NoteWindow.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit f79c0c7c9aacfa36b6e09d3cff1880d9ba0c3f75
Author: Sandy Armstrong <sanfordarmstrong@gmail.com>
Date:   Sun Jul 25 09:39:50 2010 -0700

    Make NotebookNoteAddin handle button sensitivity when untemplating
    
    Signed-off-by: Aaron Borden <adborden@live.com>

 Tomboy/Notebooks/NotebookNoteAddin.cs |   41 +++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 10 deletions(-)

commit ffe7e2631d8c6fc2e66b0989a03ea6a45476171b
Author: Sandy Armstrong <sanfordarmstrong@gmail.com>
Date:   Sun Jul 25 09:39:23 2010 -0700

    Add beginnings of template bar, including button to untemplate
    
    Signed-off-by: Aaron Borden <adborden@live.com>

 Tomboy/NoteWindow.cs |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)

commit 3ee9006bad2e414d201026d8296ca36f7c4639a7
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:   Sun Aug 21 21:44:15 2011 +0400

    Updated Russian translation

 po/ru.po | 1075 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 624 insertions(+), 451 deletions(-)

commit be9b9ed7acb4243d8a0acd25dad95eaed76f8619
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sun Aug 21 14:43:24 2011 +0200

    Updated Spanish translation

 po/es.po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 415b11a5beae043f5f18bcb489545e2b178e4af5
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sun Aug 21 14:35:30 2011 +0200

    Updated Spanish translation

 po/es.po |   52 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 23 deletions(-)

commit 5672126ba5211993ed14261ea1bbc874b6edac05
Author: Aaron Borden <adborden@live.com>
Date:   Thu Feb 17 18:48:13 2011 -0800

    Port fix for 625679

 Tomboy/Notebooks/NotebookManager.cs |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

commit 89f234fb08c8f95cb6b00f808a0f7e5896880fe0
Author: Aaron Borden <adborden@live.com>
Date:   Sat Aug 20 15:18:02 2011 -0700

    Tune down autosync frequency
    
    https://bugzilla.gnome.org/show_bug.cgi?id=632615

 Tomboy/Synchronization/SyncManager.cs |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

commit 6135f29b23527acfb31a6f9f066d411a4cbe4241
Author: Aaron Borden <adborden@live.com>
Date:   Sat Aug 20 15:10:15 2011 -0700

    Make Save button insensitive in Sync Preferences
    
    Save button should be insensitive until required fields are filled in.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=473332

 .../FileSystemSyncServiceAddin.cs                  |    3 +-
 .../Addins/SshSyncService/SshSyncServiceAddin.cs   |   17 ++++++++++++++-
 .../WebDavSyncService/WebDavSyncServiceAddin.cs    |   16 ++++++++++++++-
 .../WebSyncService/WebSyncPreferencesWidget.cs     |    3 +-
 .../Addins/WebSyncService/WebSyncServiceAddin.cs   |   21 +++++++++++++------
 Tomboy/PreferencesDialog.cs                        |   13 +++++++++--
 Tomboy/Synchronization/SyncServiceAddin.cs         |   15 ++++++++++++-
 7 files changed, 71 insertions(+), 17 deletions(-)

commit 77dc2ab38bedc0f3ef067dfda5431e8cc93bddaf
Author: Aaron Borden <adborden@live.com>
Date:   Fri Jun 10 14:18:29 2011 -0700

    Don't create links inside of links
    
    https://bugzilla.gnome.org/show_bug.cgi?id=627060

 Tomboy/NoteTag.cs  |    5 +++++
 Tomboy/Watchers.cs |   13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

commit 6ad6f26f1ed331a792de7741b512f7d5d0436198
Author: Aaron Borden <adborden@live.com>
Date:   Mon Jul 18 16:13:32 2011 -0700

    Fix translation string in ExportAllNotes addin
    
    https://bugzilla.gnome.org/show_bug.cgi?id=654865

 Tomboy/ExportAllApplicationAddin.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 67682e9a88576f17eceeb6d65dae6e550b7e0600
Author: Aaron Borden <adborden@live.com>
Date:   Sat Nov 20 12:03:33 2010 -0500

    Added Tag.SaveType for saving note tag changes

 Tomboy/Note.cs    |    4 +-
 Tomboy/NoteTag.cs |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)

commit 6a3bb1c863cd775e1eb01780460c27d4457ee96d
Author: Aaron Borden <adborden@live.com>
Date:   Fri Nov 19 10:21:27 2010 -0500

    Name note being deleted in confirmation

 Tomboy/Note.cs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

commit d784d5b085a14fbb28d3fe2796de953369f9930b
Author: Andika Triwidada <andika@gmail.com>
Date:   Thu Aug 18 16:22:11 2011 +0700

    Updated Indonesian translation

 po/id.po | 1011 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 582 insertions(+), 429 deletions(-)

commit 730a9d929e1d1d464a259e738174c499f6d3231e
Author: Fran Dieguez <fran@openhost.es>
Date:   Tue Aug 16 19:25:01 2011 +0200

    Updated Galician translations

 po/gl.po |  530 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 270 insertions(+), 260 deletions(-)

commit 0805689444c653f88d62563143f89bf0d4df56ca
Author: Aaron Borden <adborden@live.com>
Date:   Mon Aug 15 13:55:38 2011 -0700

    Bumping version to 1.7.4

 Tomboy/Defines.WIN32.cs |    2 +-
 configure.in            |    2 +-
 osx/Contents/Info.plist |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 6b99ab60459bc78fed72a48e607aa87632a5489e
Author: Aaron Borden <adborden@live.com>
Date:   Mon Aug 15 13:52:25 2011 -0700

    Update NEWS file for 1.7.3

 NEWS |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)