[anjuta/sdb-core-trans: 136/136] Merge branch 'master' into sdb-core-trans
- From: Massimo Cora' <mcora src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/sdb-core-trans: 136/136] Merge branch 'master' into sdb-core-trans
- Date: Wed, 6 Oct 2010 21:16:20 +0000 (UTC)
commit 6583b129db45c180c6ebfb044a5f9ba60a4ba406
Merge: f5da06d 27d3986
Author: Massimo Corà <mcora src gnome org>
Date: Wed Oct 6 22:45:22 2010 +0200
Merge branch 'master' into sdb-core-trans
Conflicts:
libanjuta/anjuta-utils.h
ABOUT-NLS | 324 -
NEWS | 80 +
anjuta.desktop.in.in | 2 +-
autogen.sh | 2 +
configure.in | 26 +-
libanjuta/Makefile.am | 21 +-
libanjuta/anjuta-error.c | 40 -
libanjuta/anjuta-error.h | 37 -
libanjuta/anjuta-launcher.c | 3 +-
libanjuta/anjuta-preferences.c | 2 +-
libanjuta/anjuta-preferences.h | 6 +-
libanjuta/anjuta-save-prompt.c | 14 +-
libanjuta/anjuta-tabber.c | 2 +-
libanjuta/anjuta-utils.c | 51 +-
libanjuta/interfaces/anjuta-idl-compiler.pl | 21 +-
libanjuta/interfaces/libanjuta.idl | 297 +-
libfoocanvas/foo-canvas-marshal.c | 131 -
libfoocanvas/foo-canvas-marshal.h | 28 -
manuals/anjuta-manual/Makefile.am | 2 +-
manuals/anjuta-manual/de/de.po | 459 +-
manuals/anjuta-manual/es/es.po | 29 +-
manuals/anjuta-manual/fr/fr.po | 34 +-
manuals/anjuta-manual/ja/ja.po | 5248 +++++++
plugins/Makefile.am | 4 +-
plugins/build-basic-autotools/plugin.c | 2 +-
plugins/class-gen/window.c | 2 +-
plugins/document-manager/anjuta-docman.c | 4 +-
plugins/document-manager/plugin.c | 259 +-
plugins/file-loader/dnd.c | 2 +-
plugins/file-wizard/file.c | 66 +-
plugins/file-wizard/file.h | 1 -
plugins/gdb/preferences.c | 9 +-
plugins/gtodo/export.c | 5 +-
plugins/language-manager/languages.xml | 3 +
.../anjuta-language-cpp-java.ui | 2 +-
.../cxxparser/engine-parser.cpp | 2 +-
.../anjuta-language-javascript.ui | 6 +-
plugins/language-support-python/Makefile.am | 3 +-
plugins/language-support-python/plugin.c | 19 +-
plugins/language-support-python/plugin.h | 3 +
plugins/language-support-python/python-assist.c | 2 +-
.../python-plugin-properties.ui | 42 +-
plugins/language-support-vala/Makefile.am | 2 +-
plugins/language-support-vala/libanjuta-1.0.vapi | 267 +-
plugins/language-support-vala/plugin.vala | 26 +-
plugins/language-support-vala/provider.vala | 44 +-
plugins/macro/Makefile.am | 58 -
plugins/macro/anjuta-macro.plugin.in | 6 -
plugins/macro/anjuta-macro.png | Bin 1046 -> 0 bytes
plugins/macro/anjuta-macro.ui | 339 -
plugins/macro/anjuta-macro.xml | 14 -
plugins/macro/macro-actions.c | 169 -
plugins/macro/macro-actions.h | 27 -
plugins/macro/macro-db.c | 486 -
plugins/macro/macro-db.h | 79 -
plugins/macro/macro-dialog.c | 352 -
plugins/macro/macro-dialog.h | 56 -
plugins/macro/macro-edit.c | 309 -
plugins/macro/macro-edit.h | 68 -
plugins/macro/macro-util.c | 332 -
plugins/macro/macro-util.h | 25 -
plugins/macro/macros.xml | 285 -
plugins/macro/plugin.c | 293 -
plugins/macro/plugin.h | 68 -
plugins/message-view/anjuta-msgman.c | 2 +-
plugins/project-wizard/druid.c | 28 +-
plugins/project-wizard/plugin.c | 2 +-
.../project-wizard/templates/anjuta-plugin.wiz.in | 5 -
plugins/project-wizard/templates/cpp.wiz.in | 5 -
.../project-wizard/templates/cpp/src/Makefile.am | 4 +-
plugins/project-wizard/templates/gcj.wiz.in | 5 -
plugins/project-wizard/templates/gtk.wiz.in | 9 +-
.../project-wizard/templates/gtk/src/project.ui | 2 +-
plugins/project-wizard/templates/gtkmm.wiz.in | 7 +-
plugins/project-wizard/templates/java.wiz.in | 5 -
plugins/project-wizard/templates/library.wiz.in | 5 -
plugins/project-wizard/templates/minimal.wiz.in | 1 -
plugins/project-wizard/templates/pygtk.wiz.in | 5 -
plugins/project-wizard/templates/python.wiz.in | 5 -
plugins/project-wizard/templates/sdl.wiz.in | 5 -
plugins/project-wizard/templates/terminal.wiz.in | 3 -
.../project-wizard/templates/terminal/Makefile.am | 3 +-
.../templates/terminal/po/Makefile.am | 4 +-
.../templates/terminal/src/Makefile.am | 4 +-
plugins/project-wizard/templates/wxwin.wiz.in | 5 -
plugins/project-wizard/templates/xlib-dock.wiz.in | 5 -
plugins/project-wizard/templates/xlib.wiz.in | 5 -
plugins/python-loader/Makefile.am | 3 +-
.../python-loader/anjuta-python-loader.plugin.in | 2 +-
plugins/snippets-manager/Makefile.am | 80 +
.../anjuta-snippets-manager.plugin.in | 6 +
.../snippets-manager/anjuta-snippets-manager.png | Bin 0 -> 6496 bytes
plugins/snippets-manager/plugin.c | 982 ++
plugins/snippets-manager/plugin.h | 92 +
plugins/snippets-manager/snippet-variables-store.c | 719 +
plugins/snippets-manager/snippet-variables-store.h | 110 +
plugins/snippets-manager/snippet.c | 1226 ++
plugins/snippets-manager/snippet.h | 124 +
plugins/snippets-manager/snippets-browser.c | 1215 ++
plugins/snippets-manager/snippets-browser.h | 83 +
plugins/snippets-manager/snippets-browser.ui | 45 +
plugins/snippets-manager/snippets-db.c | 2132 +++
plugins/snippets-manager/snippets-db.h | 165 +
plugins/snippets-manager/snippets-editor.c | 2012 +++
plugins/snippets-manager/snippets-editor.h | 72 +
plugins/snippets-manager/snippets-editor.ui | 581 +
.../snippets-manager/snippets-global-variables.xml | 14 +
plugins/snippets-manager/snippets-group.c | 290 +
plugins/snippets-manager/snippets-group.h | 73 +
plugins/snippets-manager/snippets-import-export.c | 217 +
plugins/snippets-manager/snippets-import-export.h | 28 +
.../snippets-interaction-interpreter.c | 931 ++
.../snippets-interaction-interpreter.h | 72 +
.../snippets-manager-preferences.ui | 108 +
plugins/snippets-manager/snippets-manager-ui.xml | 16 +
plugins/snippets-manager/snippets-provider.c | 755 +
plugins/snippets-manager/snippets-provider.h | 70 +
plugins/snippets-manager/snippets-xml-parser.c | 840 ++
plugins/snippets-manager/snippets-xml-parser.h | 36 +
plugins/snippets-manager/snippets.anjuta-snippets | 464 +
plugins/sourceview/anjuta-view.c | 2 +-
plugins/sourceview/sourceview-io.c | 2 +-
plugins/sourceview/sourceview.c | 8 +-
plugins/symbol-db/anjuta-tags/Makefile.am | 2 +-
plugins/symbol-db/plugin.c | 5 +-
plugins/symbol-db/symbol-db-system.c | 24 +-
po/LINGUAS | 1 +
po/POTFILES.in | 16 +-
po/POTFILES.skip | 1 +
po/ca.po | 3910 ++++---
po/cs.po | 3849 +++---
po/da.po | 3855 ++++---
po/de.po | 1433 ++-
po/el.po | 4585 ++++---
po/en_GB.po | 3880 ++++---
po/es.po | 932 +-
po/fr.po | 3593 +++---
po/gl.po | 972 +-
po/hu.po | 3547 +++--
po/hy.po |10078 ++++++++++++++
po/id.po | 1297 +-
po/it.po | 3548 +++--
po/ja.po |11975 ++++++++++------
po/nb.po | 3024 +++--
po/pl.po |10611 ++++++---------
po/pt.po | 4252 ++++---
po/pt_BR.po | 3829 ++++--
po/ru.po | 4463 ++++---
po/sl.po | 823 +-
po/sr.po |14340 +++++++++-----------
po/sr latin po |14330 +++++++++-----------
po/sv.po | 788 +-
po/zh_CN.po | 1211 +-
po/zh_HK.po | 1897 ++-
po/zh_TW.po | 1961 ++--
155 files changed, 88658 insertions(+), 54673 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
