[tracker/pushplugin: 31/32] Merge branch 'master' into pushplugin

[Philip Van Hoof <pvanhoof src gnome org>]

commit cb5c6117bd3c1d21ae1670dddb8c88b5dcbf1151
Merge: 0ad5110... 395a451...
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Sep 23 16:18:59 2009 +0200

    Merge branch 'master' into pushplugin
    
    Conflicts:
    	src/plugins/evolution/tracker-evolution-plugin.c
    	src/plugins/evolution/tracker-evolution-registrar.c

 .gitignore                                         |    1 -
 configure.ac                                       |    1 +
 data/Makefile.am                                   |    2 +-
 data/miners/Makefile.am                            |   16 +
 data/miners/tracker-miner-applications.desktop.in  |    6 +
 data/miners/tracker-miner-files.desktop.in         |    6 +
 data/ontologies/30-nie.ontology                    |    1 -
 data/tracker-miner-fs.desktop.in.in                |    2 +-
 po/POTFILES.in                                     |    1 +
 po/ar.po                                           | 2015 +++++++++------
 po/en_GB.po                                        | 2752 +++++++++++++-------
 po/es.po                                           |  454 ++--
 po/hu.po                                           | 1391 ++++++-----
 po/sv.po                                           | 1048 ++++----
 python/gtk-sparql/gtk-sparql.ui                    |   20 +-
 src/libstemmer/modules.h                           |    5 +
 src/libtracker-common/tracker-power-hal.c          |    2 +-
 src/libtracker-common/tracker-sparql-builder.vala  |    2 +-
 src/libtracker-common/tracker-storage-hal.c        |    2 +-
 src/libtracker-common/tracker-turtle-writer.vala   |    2 +-
 src/libtracker-common/tracker-utils.c              |   32 +-
 src/libtracker-data/tracker-sparql-query.vala      |  109 +-
 src/libtracker-miner/Makefile.am                   |    1 +
 src/libtracker-miner/tracker-crawler.c             |   29 +
 src/libtracker-miner/tracker-crawler.h             |    6 +
 src/libtracker-miner/tracker-miner-fs.c            |  126 +-
 src/libtracker-miner/tracker-miner-fs.h            |    3 +
 src/libtracker-miner/tracker-miner-manager.c       |  152 +-
 src/libtracker-miner/tracker-miner-manager.h       |    3 +
 src/libtracker-miner/tracker-miner.c               |   78 +-
 src/plugins/kmail/tracker-kmail-registrar.c        |   12 +-
 src/tracker-extract/tracker-albumart.c             |    4 +-
 src/tracker-extract/tracker-dbus.c                 |   10 +-
 src/tracker-extract/tracker-extract-pdf.c          |    5 +-
 src/tracker-extract/tracker-extract-text.c         |    5 +-
 src/tracker-extract/tracker-extract.c              |    4 +-
 src/tracker-miner-fs/tracker-dbus.c                |   14 +-
 src/tracker-miner-fs/tracker-main.c                |    4 +-
 src/tracker-miner-fs/tracker-miner-files.c         |   35 +-
 src/tracker-miner-fs/tracker-thumbnailer.c         |    2 +-
 src/tracker-preferences/tracker-preferences.ui     |  317 +--
 src/tracker-preferences/tracker-preferences.vala   |    4 +-
 .../tracker-search-tool-callbacks.c                |    2 +-
 src/tracker-search-tool/tracker-search-tool.c      |    2 +-
 src/tracker-status-icon/tracker-status-icon.c      |    9 +-
 src/tracker-store/tracker-backup.c                 |    4 +-
 src/tracker-store/tracker-dbus.c                   |   14 +-
 src/tracker-store/tracker-main.c                   |    2 +-
 src/tracker-store/tracker-push.c                   |    2 +-
 src/tracker-store/tracker-resources.c              |   14 +-
 src/tracker-utils/tracker-import.c                 |    2 +-
 src/tracker-utils/tracker-info.c                   |    6 +-
 src/tracker-utils/tracker-processes.c              |    8 +-
 src/tracker-utils/tracker-sparql.c                 |    2 +-
 src/tracker-utils/tracker-stats.c                  |    2 +-
 src/tracker-utils/tracker-status.c                 |   10 +-
 src/tracker-utils/tracker-tag.c                    |    7 +-
 57 files changed, 5428 insertions(+), 3342 deletions(-)
---