[tomboy/autosync: 2/15] Merge branch 'master' into lessnoisysync

[Sanford Armstrong <sharm src gnome org>]

commit e80132425bfccf9931ae44704c63c64e50fdd171
Merge: 319360f ce7dbae
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Sun Dec 13 07:50:11 2009 -0800

    Merge branch 'master' into lessnoisysync

 Tomboy/Addins/PrintNotes/PrintNotes-mac.csproj |    2 +-
 po/LINGUAS                                     |    1 +
 po/en shaw po                                  | 1562 ++++++++++++++++++++++++
 po/es.po                                       |  248 ++--
 po/et.po                                       |   85 +-
 po/he.po                                       |  141 +--
 po/nb.po                                       |  230 ++--
 po/sl.po                                       |  205 ++--
 po/sv.po                                       |  233 ++--
 po/zh_CN.po                                    |  772 ++++++-------
 10 files changed, 2461 insertions(+), 1018 deletions(-)
---