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

[James Liggett <jrliggett src gnome org>]

commit b3cebe9b8d26c35081bd9c73ac9b3e3577b809e7
Merge: cfbec23 2704dcc
Author: James Liggett <jrliggett cox net>
Date:   Mon Sep 27 16:57:15 2010 -0700

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

 NEWS                                               |   19 +
 configure.in                                       |    4 +-
 manuals/anjuta-manual/de/de.po                     |  459 +-
 plugins/project-wizard/druid.c                     |   25 +-
 plugins/project-wizard/templates/gtk.wiz.in        |    4 +-
 .../project-wizard/templates/gtk/src/project.ui    |    2 +-
 plugins/project-wizard/templates/gtkmm.wiz.in      |    2 +-
 plugins/snippets-manager/plugin.c                  |    8 +-
 plugins/snippets-manager/snippets-editor.c         |    2 +-
 plugins/snippets-manager/snippets-editor.ui        |    6 +-
 po/POTFILES.in                                     |    1 +
 po/ca.po                                           | 3910 +++++---
 po/cs.po                                           | 3849 ++++---
 po/da.po                                           |  393 +-
 po/de.po                                           |  128 +-
 po/el.po                                           | 4543 +++++----
 po/en_GB.po                                        |  145 +-
 po/es.po                                           |  140 +-
 po/fr.po                                           |  142 +-
 po/gl.po                                           |  155 +-
 po/hu.po                                           |  134 +-
 po/id.po                                           |  142 +-
 po/it.po                                           | 3548 ++++---
 po/ja.po                                           |   10 +-
 po/pl.po                                           |10611 +++++++++-----------
 po/pt.po                                           | 3861 +++++---
 po/pt_BR.po                                        | 3829 +++++---
 po/ru.po                                           | 4465 +++++----
 po/sl.po                                           |  162 +-
 po/zh_CN.po                                        |  151 +-
 po/zh_HK.po                                        | 1897 +++--
 po/zh_TW.po                                        | 1961 +++--
 32 files changed, 24906 insertions(+), 19802 deletions(-)
---