[anjuta: 2/4] Merge branch 'master' into pez

[Massimo Cora' <mcora src gnome org>]

commit d893117e957b1035bfb0738fc384248885110bca
Merge: c575715... c6499e1...
Author: Massimo Corà <mcora src gnome org>
Date:   Sun Jun 14 13:58:05 2009 +0200

    Merge branch 'master' into pez

 plugins/devhelp/plugin.c                           |    2 +-
 plugins/document-manager/anjuta-bookmarks.c        |   53 +-
 plugins/file-loader/plugin.c                       |   52 +-
 plugins/file-loader/plugin.h                       |    5 +-
 plugins/file-manager/file-manager.ui               |   12 +-
 plugins/git/anjuta-git.ui                          |  419 +++-
 plugins/git/git-add-command.c                      |    4 +-
 plugins/git/git-branch-delete-command.c            |   15 +-
 plugins/git/git-branch-delete-command.h            |    3 +-
 plugins/git/git-checkout-files-command.c           |    4 +-
 plugins/git/git-checkout-files-dialog.c            |    2 +-
 plugins/git/git-command.c                          |    4 +-
 plugins/git/git-command.h                          |    4 +-
 plugins/git/git-commit-command.c                   |    4 +-
 plugins/git/git-commit-dialog.c                    |    2 +-
 plugins/git/git-delete-branch-dialog.c             |   91 +-
 plugins/git/git-ignore-command.c                   |    4 +-
 plugins/git/git-ignore-dialog.c                    |    2 +-
 plugins/git/git-log-dialog.c                       |    9 +
 plugins/git/git-push-command.c                     |   11 +-
 plugins/git/git-push-command.h                     |    3 +-
 plugins/git/git-push-dialog.c                      |   44 +-
 plugins/git/git-remove-command.c                   |    4 +-
 plugins/git/git-reset-files-command.c              |    4 +-
 plugins/git/git-resolve-dialog.c                   |    2 +-
 plugins/git/git-ui-utils.c                         |   60 +
 plugins/git/git-ui-utils.h                         |    6 +
 plugins/git/git-unstage-dialog.c                   |    2 +-
 .../anjuta-language-cpp-java.ui                    |   32 +-
 plugins/sourceview/anjuta-editor-sourceview.ui     |   36 +-
 plugins/subversion/anjuta-subversion.ui            |  182 +-
 plugins/symbol-db/plugin.c                         |    2 +-
 po/es.po                                           | 1052 ++++----
 po/fr.po                                           | 2798 +++++++++++---------
 src/preferences.ui                                 |   18 +-
 35 files changed, 2872 insertions(+), 2075 deletions(-)
---