[anjuta/git-shell: 44/63] Merge branch 'master' into git-shell

[James Liggett <jrliggett src gnome org>]

commit 0047a03c8f2923e4fff6bbb1973b208406869356
Merge: 5572119 145970d
Author: James Liggett <jrliggett cox net>
Date:   Mon Aug 30 14:48:05 2010 -0700

    Merge branch 'master' into git-shell

 NEWS                                               |   21 +
 anjuta.desktop.in.in                               |    2 +-
 configure.in                                       |    7 +-
 libanjuta/Makefile.am                              |   17 +-
 libanjuta/anjuta-error.c                           |   40 -
 libanjuta/anjuta-error.h                           |   37 -
 libanjuta/anjuta-launcher.c                        |    3 +-
 libanjuta/anjuta-save-prompt.c                     |   14 +-
 libanjuta/anjuta-utils.c                           |   47 +-
 libanjuta/interfaces/libanjuta.idl                 |    5 +-
 plugins/build-basic-autotools/plugin.c             |    2 +-
 plugins/gdb/preferences.c                          |    9 +-
 plugins/gtodo/export.c                             |    5 +-
 .../cxxparser/engine-parser.cpp                    |    2 +-
 .../anjuta-language-javascript.ui                  |    6 +-
 plugins/language-support-python/plugin.c           |   17 +-
 plugins/language-support-python/plugin.h           |    3 +
 .../python-plugin-properties.ui                    |   42 +-
 plugins/language-support-vala/plugin.vala          |   14 +-
 plugins/project-wizard/druid.c                     |    3 +-
 plugins/project-wizard/plugin.c                    |    2 +-
 plugins/snippets-manager/snippets-editor.ui        |   18 +-
 .../snippets-manager-preferences.ui                |    6 +-
 plugins/symbol-db/plugin.c                         |    5 +-
 plugins/symbol-db/symbol-db-system.c               |   24 +-
 po/da.po                                           | 3706 +++--
 po/de.po                                           | 1258 +-
 po/en_GB.po                                        | 3729 +++--
 po/es.po                                           |  347 +-
 po/fr.po                                           | 3470 +++--
 po/gl.po                                           |  333 +-
 po/hu.po                                           | 3410 +++--
 po/id.po                                           | 1221 +-
 po/sl.po                                           |  735 +-
 po/sr.po                                           |14340 +++++++++-----------
 po/sr latin po                                     |14330 +++++++++-----------
 36 files changed, 23375 insertions(+), 23855 deletions(-)
---