[tomboy/autosync: 48/241] Merge branch 'master' into autosync

[Sanford Armstrong <sharm src gnome org>]

commit a306b47173b51da876b132775cdd184159ac29f8
Merge: db03d9e 3fc885f
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Mon Jul 20 08:46:03 2009 -0700

    Merge branch 'master' into autosync

 NEWS                        |   13 +
 Setup/Setup.wxs             |    2 +-
 Tomboy/Defines.WIN32.cs     |    4 +-
 Tomboy/PreferencesDialog.cs |   18 +-
 configure.in                |    2 +-
 osx/Contents/Info.plist     |    4 +-
 po/es.po                    |   62 ++--
 po/sv.po                    |  150 ++++--
 po/th.po                    |  306 ++++++++-----
 po/uk.po                    | 1076 +++++++++++++++++++++++++------------------
 po/zh_CN.po                 |  165 +++++---
 11 files changed, 1084 insertions(+), 718 deletions(-)
---