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

[Sanford Armstrong <sharm src gnome org>]

commit f6a8dc3c7e5d707b791325412f3a0306c98493a9
Merge: 6e0c878 09c2d51
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Mon Jan 25 12:27:20 2010 -0800

    Merge branch 'master' into docs

 NEWS                                               |   12 +
 Setup/Setup.wxs                                    |    2 +-
 Tomboy-mac.csproj                                  |    5 +-
 Tomboy.csproj                                      |   21 +-
 Tomboy.mdp                                         |    2 +
 Tomboy/Addins/Backlinks/Backlinks-mac.csproj       |    8 +-
 Tomboy/Addins/Bugzilla/Bugzilla-mac.csproj         |    8 +-
 Tomboy/Addins/Evolution/Evolution.addin.xml        |    2 +-
 Tomboy/Addins/ExportToHtml/ExportToHtml-mac.csproj |    4 +-
 .../FileSystemSyncService-mac.csproj               |    8 +-
 Tomboy/Addins/FixedWidth/FixedWidth-mac.csproj     |    8 +-
 .../InsertTimestamp/InsertTimestamp-mac.csproj     |    8 +-
 .../NoteDirectoryWatcher-mac.csproj                |    8 +-
 Tomboy/Addins/NoteOfTheDay/NoteOfTheDay-mac.csproj |    8 +-
 Tomboy/Addins/PrintNotes/PrintNotes-mac.csproj     |    8 +-
 Tomboy/Addins/Underline/Underline-mac.csproj       |    8 +-
 Tomboy/Addins/WebSyncService/Api/OAuth.cs          |    5 +-
 Tomboy/Addins/WebSyncService/OAuth/Base.cs         |   18 +-
 .../WebSyncService/WebSyncPreferencesWidget.cs     |   39 +-
 Tomboy/Applet.cs                                   |   43 +-
 Tomboy/Defines.WIN32.cs                            |    6 +-
 Tomboy/IRemoteControl.cs                           |    9 +-
 Tomboy/JumpListManager.cs                          |  205 ++
 Tomboy/MacApplication.cs                           |    4 +-
 Tomboy/Note.cs                                     |   16 +-
 Tomboy/NoteManager.cs                              |   65 +-
 Tomboy/PreferencesDialog.cs                        |    8 +-
 Tomboy/PrefsKeybinder.cs                           |   22 +-
 Tomboy/RecentChanges.cs                            |    3 +-
 Tomboy/RemoteControl.cs                            |   79 +
 Tomboy/RemoteControlProxy.cs                       |   22 +-
 Tomboy/RemoteControlWrapper.cs                     |   91 +-
 Tomboy/Synchronization/SyncDialog.cs               |    1 +
 Tomboy/Tomboy.cs                                   |  132 +-
 Tomboy/Tray.cs                                     |   16 +-
 Tomboy/WindowsApplication.cs                       |    4 +-
 Tomboy/WindowsInterop.cs                           |  240 +++
 Tomboy/tomboy.in                                   |    2 -
 configure.in                                       |    2 +-
 data/GNOME_TomboyApplet.xml                        |    3 +
 data/icons/new_note.ico                            |  Bin 0 -> 1150 bytes
 data/icons/note.ico                                |  Bin 0 -> 1150 bytes
 data/icons/search.ico                              |  Bin 0 -> 894 bytes
 data/tomboy.desktop.in                             |    1 -
 help/Makefile.am                                   |    2 +-
 help/pl/figures/add-notebook-search.png            |  Bin 0 -> 60485 bytes
 help/pl/figures/add-to-notebook.png                |  Bin 0 -> 33504 bytes
 help/pl/figures/delete-notebook.png                |  Bin 0 -> 34234 bytes
 help/pl/figures/move-notes-search.png              |  Bin 0 -> 64263 bytes
 help/pl/figures/new-notebook.png                   |  Bin 0 -> 64473 bytes
 help/pl/figures/note-template.png                  |  Bin 0 -> 34339 bytes
 help/pl/figures/notebook-icon.png                  |  Bin 0 -> 875 bytes
 help/pl/figures/tomboy-main-menu.png               |  Bin 0 -> 54717 bytes
 help/pl/figures/tomboy-new-note.png                |  Bin 0 -> 18644 bytes
 help/pl/figures/tomboy-panel.png                   |  Bin 0 -> 10433 bytes
 help/pl/figures/tomboy-pindown.png                 |  Bin 0 -> 486 bytes
 help/pl/figures/tomboy-pinup.png                   |  Bin 0 -> 408 bytes
 help/pl/figures/tomboy-preferences-add-ins.png     |  Bin 0 -> 49262 bytes
 help/pl/figures/tomboy-preferences-editing.png     |  Bin 0 -> 46985 bytes
 help/pl/figures/tomboy-preferences-hotkeys.png     |  Bin 0 -> 38027 bytes
 .../figures/tomboy-preferences-synchronization.png |  Bin 0 -> 33497 bytes
 help/pl/figures/tomboy-tools.png                   |  Bin 0 -> 2450 bytes
 help/pl/pl.po                                      | 1972 +++++++-------------
 help/zh_CN/zh_CN.po                                | 1682 +++++++++++++++++
 osx/Contents/Info.plist                            |    4 +-
 po/LINGUAS                                         |    2 +
 po/ast.po                                          | 1922 +++++++++++++++++++
 po/bg.po                                           |  240 ++--
 po/bn.po                                           |  183 +-
 po/en shaw po                                      | 1562 ++++++++++++++++
 po/es.po                                           |  248 ++--
 po/et.po                                           |   85 +-
 po/eu.po                                           |  237 ++--
 po/he.po                                           |  141 +-
 po/it.po                                           |  247 ++--
 po/lv.po                                           |  860 +++++----
 po/nb.po                                           |  244 ++--
 po/ro.po                                           |   70 +-
 po/sl.po                                           |  287 ++--
 po/sv.po                                           |  233 ++--
 po/uk.po                                           |  263 ++--
 po/zh_CN.po                                        |  772 ++++-----
 82 files changed, 8797 insertions(+), 3615 deletions(-)
---