[anjuta/newproject: 111/114] Merge branch 'master' into newproject

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 17df2c7b1e1f3896ee48c21afb537326bece76ea
Merge: 89a5756 4499969
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Sun Mar 7 21:50:50 2010 +0100

    Merge branch 'master' into newproject
    
    Conflicts (removed):
    	plugins/gbf-am/test.c
    	plugins/gbf-mkfile/gbf-mkfile-project.c

 AUTHORS                                            |    7 +-
 MAINTAINERS                                        |    6 +-
 NEWS                                               |   46 +-
 anjuta.doap                                        |    6 +
 configure.in                                       |   36 +-
 doc/anjuta.1.in                                    |   35 +-
 libanjuta/anjuta-plugin-manager.c                  |    4 +-
 libanjuta/anjuta-preferences.c                     |    4 +-
 libanjuta/anjuta-project.c                         |    6 +-
 libanjuta/anjuta-utils.c                           |    3 +-
 libanjuta/gbf-project.h                            |   10 +-
 libanjuta/interfaces/libanjuta.idl                 |   32 +-
 manuals/anjuta-manual/de/de.po                     |  468 +-
 plugins/build-basic-autotools/plugin.c             |   78 +-
 plugins/build-basic-autotools/program.c            |    5 +-
 plugins/debug-manager/breakpoints.c                |   15 +-
 plugins/debug-manager/chunk_view.c                 |    2 +-
 plugins/dir-project/dir-project.c                  |   35 -
 plugins/document-manager/plugin.c                  |    4 +-
 plugins/file-manager/file-model.c                  |    7 +-
 plugins/file-manager/file-view.c                   |   59 +-
 plugins/file-manager/plugin.h                      |    2 +
 plugins/glade/plugin.c                             |   12 -
 plugins/gtodo/egg-datetime.c                       |    2 +-
 plugins/gtodo/libgtodo.c                           |    2 +-
 plugins/language-manager/languages.xml             |   12 +-
 plugins/language-manager/plugin.c                  |   16 +
 .../anjuta-language-cpp-java.ui                    |  122 +-
 .../language-support-cpp-java/cpp-java-assist.c    | 1690 +++--
 .../cxxparser/Makefile.am                          |    4 +-
 .../cxxparser/engine-parser.cpp                    |  133 +-
 plugins/language-support-cpp-java/plugin.c         |   34 +-
 plugins/language-support-cpp-java/plugin.h         |    3 +
 plugins/language-support-js/plugin.c               |    2 +-
 plugins/macro/macro-actions.c                      |    2 +-
 plugins/message-view/anjuta-msgman.c               |    5 +-
 plugins/message-view/message-view.c                |   10 +-
 plugins/project-import/project-import.ui           |    1 +
 plugins/project-manager/gbf-project-model.c        |  161 -
 plugins/project-manager/plugin.c                   |  103 +-
 plugins/project-wizard/druid.c                     |    2 +-
 plugins/project-wizard/property.c                  |    4 +-
 plugins/project-wizard/templates/django.wiz        |    2 +-
 .../templates/js_minimal/src/main.js               |    5 +-
 .../templates/translatable-strings.h               |   33 +-
 plugins/sourceview/anjuta-editor-sourceview.ui     |   13 +-
 plugins/sourceview/anjuta-view.c                   |   20 +-
 plugins/sourceview/sourceview-cell.c               |    1 +
 plugins/sourceview/sourceview-provider.c           |   13 +-
 plugins/sourceview/sourceview.c                    |    2 +-
 plugins/starter/Makefile.am                        |    3 +-
 plugins/starter/plugin.c                           |   73 +-
 plugins/starter/plugin.h                           |    1 +
 plugins/symbol-db/anjuta-tags/Makefile.am          |   14 +-
 plugins/symbol-db/anjuta-tags/ctags-visitor.vala   |  397 +
 plugins/symbol-db/anjuta-tags/parsers.h            |   48 +
 plugins/symbol-db/anjuta-tags/vala.c               |  102 +
 plugins/symbol-db/plugin.c                         |   36 +-
 plugins/symbol-db/symbol-db-engine-core.c          |    4 +-
 plugins/symbol-db/symbol-db-engine-utils.c         |   12 +-
 plugins/symbol-db/symbol-db-iface.c                |   89 +-
 plugins/symbol-db/symbol-db-search-command.c       |   43 +-
 plugins/symbol-db/symbol-db-search-command.h       |    3 +
 plugins/symbol-db/symbol-db-view-locals.c          |   19 +-
 plugins/symbol-db/symbol-db-view-search.c          |    4 +-
 plugins/symbol-db/symbol-db-view.c                 |   11 +-
 po/cs.po                                           | 5933 +++++++------
 po/da.po                                           | 5023 ++++++-----
 po/de.po                                           | 4351 +++++----
 po/el.po                                           | 9557 ++++++++++++--------
 po/en_GB.po                                        | 2695 +++---
 po/es.po                                           |  909 +-
 po/fr.po                                           | 2229 +++--
 po/gl.po                                           | 2519 +++---
 po/ru.po                                           | 2957 +++---
 po/sl.po                                           | 1403 ++--
 po/th.po                                           |  547 +-
 po/zh_HK.po                                        | 5168 +++++------
 po/zh_TW.po                                        | 5182 +++++------
 src/anjuta-app.c                                   |   37 +
 src/main.c                                         |   22 +-
 81 files changed, 28240 insertions(+), 24430 deletions(-)
---