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

[James Liggett <jrliggett src gnome org>]

commit 90ae8036991650acdde2ef780ddd4dbe21fb1c86
Merge: eb1e757 0bc51f8
Author: James Liggett <jrliggett cox net>
Date:   Fri Jul 23 20:23:34 2010 -0700

    Merge branch 'master' into git-shell
    
    Conflicts:
    	po/de.po

 libanjuta/Makefile.am                              |   12 +-
 libanjuta/interfaces/Makefile.am.iface             |   39 +-
 libanjuta/interfaces/libanjuta.idl                 |   12 +-
 manuals/reference/libanjuta/libanjuta-docs.sgml    |    1 -
 .../reference/libanjuta/project-wizard-format.sgml |   16 +-
 plugins/debug-manager/anjuta-debug-manager.xml     |    3 +-
 plugins/debug-manager/command.c                    |    8 +-
 plugins/debug-manager/command.h                    |    2 +-
 plugins/debug-manager/debug_tree.c                 |  270 +-
 plugins/debug-manager/locals.c                     |    3 -
 plugins/debug-manager/plugin.c                     |   46 +-
 plugins/debug-manager/queue.c                      |   11 +-
 plugins/gdb/debugger.c                             |   21 +-
 plugins/gdb/debugger.h                             |    2 +-
 plugins/gdb/plugin.c                               |    4 +-
 plugins/js-debugger/plugin.c                       |    3 +-
 plugins/project-wizard/property.c                  |   77 +-
 plugins/project-wizard/property.h                  |    1 +
 .../project-wizard/templates/anjuta-plugin.wiz.in  |   10 +-
 plugins/project-wizard/templates/cpp.wiz.in        |   10 +-
 plugins/project-wizard/templates/gcj.wiz.in        |   10 +-
 .../project-wizard/templates/gnome-applet.wiz.in   |    8 +-
 plugins/project-wizard/templates/gtk.wiz.in        |    8 +-
 plugins/project-wizard/templates/gtkmm.wiz.in      |    8 +-
 plugins/project-wizard/templates/java.wiz.in       |    8 +-
 plugins/project-wizard/templates/library.wiz.in    |   10 +-
 plugins/project-wizard/templates/minimal.wiz.in    |   10 +-
 plugins/project-wizard/templates/python.wiz.in     |   10 +-
 plugins/project-wizard/templates/terminal.wiz.in   |   10 +-
 plugins/project-wizard/templates/wxwin.wiz.in      |    8 +-
 plugins/project-wizard/templates/xlib-dock.wiz.in  |    8 +-
 plugins/project-wizard/templates/xlib.wiz.in       |    8 +-
 plugins/terminal/terminal.c                        |    2 +-
 po/de.po                                           | 3314 +++++++++++--------
 po/es.po                                           |  789 +++---
 po/gl.po                                           |  313 +-
 po/zh_CN.po                                        | 1808 ++++++-----
 po/zh_HK.po                                        | 3147 +++++++++++--------
 po/zh_TW.po                                        | 3155 +++++++++++--------
 39 files changed, 7667 insertions(+), 5518 deletions(-)
---