[tomboy/docs: 91/91] Merge branch 'master' into docs

[Sanford Armstrong <sharm src gnome org>]

commit 002726524e864500e2fa82dd63820a43436d37aa
Merge: 758a3b8 415d0ef
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Mon Mar 15 10:21:00 2010 -0700

    Merge branch 'master' into docs

 Makefile.am                                        |    2 +-
 NEWS                                               |   20 +
 Setup/Files.wxs                                    |    3 +
 Setup/Setup.wxs                                    |    2 +-
 Tomboy-mac.csproj                                  |    8 +-
 Tomboy.csproj                                      |    3 +
 Tomboy.mdp                                         |    3 +
 .../NoteOfTheDay/NoteOfTheDayApplicationAddin.cs   |    2 +-
 Tomboy/Addins/WebSyncService/Api/OAuth.cs          |    1 +
 Tomboy/Addins/WebSyncService/WebSyncServer.cs      |   13 +-
 Tomboy/Applet.cs                                   |    8 +-
 Tomboy/Defines.WIN32.cs                            |    4 +-
 Tomboy/JumpListManager.cs                          |   33 +-
 Tomboy/Makefile.am                                 |    2 +
 Tomboy/Note.cs                                     |  181 +++-
 Tomboy/NoteManager.cs                              |   14 +
 Tomboy/NoteRenameDialog.cs                         |  207 +++
 Tomboy/Preferences.cs                              |    9 +
 Tomboy/PreferencesDialog.cs                        |   96 ++-
 Tomboy/RecentChanges.cs                            |   37 +-
 Tomboy/RemoteControl.cs                            |   18 +
 Tomboy/Synchronization/FileSystemSyncServer.cs     |    5 +
 Tomboy/Synchronization/ISyncUI.cs                  |   43 +
 Tomboy/Synchronization/SilentUI.cs                 |   95 ++
 Tomboy/Synchronization/SyncDialog.cs               |   24 +-
 Tomboy/Synchronization/SyncManager.cs              |  324 ++++--
 Tomboy/Tray.cs                                     |    7 +-
 Tomboy/Utils.cs                                    |   28 +-
 Tomboy/Watchers.cs                                 |   26 +-
 configure.in                                       |   14 +-
 data/Makefile.am                                   |   17 +-
 data/tomboy.desktop.in                             |    2 +-
 data/tomboy.schemas.in                             |   37 +
 data/tomboy.xml                                    |    6 +
 osx/Contents/Info.plist                            |    4 +-
 po/POTFILES.in                                     |    2 +
 po/POTFILES.skip                                   |    1 +
 po/bg.po                                           |  590 +++++----
 po/ca.po                                           |  694 ++++++----
 po/cs.po                                           |  688 ++++++----
 po/de.po                                           |  964 ++++++++------
 po/el.po                                           | 1052 ++++++++++------
 po/en_GB.po                                        |  728 ++++++-----
 po/es.po                                           |  617 ++++++----
 po/et.po                                           |  153 ++-
 po/eu.po                                           |  580 +++++----
 po/fr.po                                           |  760 ++++++-----
 po/gl.po                                           |  853 +++++++-----
 po/hu.po                                           |  754 ++++++-----
 po/it.po                                           |  624 ++++++----
 po/ko.po                                           |  741 +++++++-----
 po/lv.po                                           |  752 +++++++-----
 po/nb.po                                           |  573 +++++----
 po/pa.po                                           |  758 +++++++-----
 po/pl.po                                           | 1390 +++++++++++++-------
 po/pt.po                                           |  724 ++++++-----
 po/pt_BR.po                                        |  757 +++++++-----
 po/ro.po                                           | 1271 ++++++++-----------
 po/ru.po                                           | 1139 +++++++++-------
 po/sl.po                                           |  762 ++++++-----
 po/sv.po                                           |  599 +++++----
 po/ta.po                                           |  726 ++++++-----
 po/th.po                                           |  312 +++---
 po/zh_HK.po                                        |  655 ++++++----
 po/zh_TW.po                                        |  666 ++++++----
 65 files changed, 13249 insertions(+), 8934 deletions(-)
---