[tracker/harmattan: 1603/2240] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit 77d5570cb21bc5c90f269bd05bc3658f637a0fc8
Merge: ea111d7 4140ea5
Author: Jürg Billeter <j bitron ch>
Date:   Fri Nov 20 17:37:15 2009 +0100

    Merge branch 'master' into harmattan

 NEWS                                              |   36 +
 configure.ac                                      |   30 +-
 data/ontologies/10-xsd.description                |   15 +
 data/ontologies/11-rdf.description                |   11 +
 data/ontologies/12-nrl.description                |   11 +
 data/ontologies/20-dc.description                 |   11 +
 data/ontologies/30-nie.description                |   19 +
 data/ontologies/30-nie.ontology                   |    9 +-
 data/ontologies/31-nao.description                |   11 +
 data/ontologies/31-nao.ontology                   |    3 +-
 data/ontologies/32-nco.description                |   12 +
 data/ontologies/32-nco.ontology                   |   80 +-
 data/ontologies/33-nfo.description                |    2 +
 data/ontologies/34-nmo.description                |   23 +
 data/ontologies/34-nmo.ontology                   |   86 +-
 data/ontologies/35-ncal.description               |   12 +
 data/ontologies/36-scal.description               |   11 +
 data/ontologies/37-nid3.description               |   11 +
 data/ontologies/38-nmm.description                |    1 +
 data/ontologies/39-mto.description                |    3 +-
 data/ontologies/40-mlo.description                |    1 +
 data/ontologies/41-mfo.description                |   11 +
 data/ontologies/89-mtp.description                |   11 +
 data/ontologies/90-tracker.description            |   11 +
 data/ontologies/91-maemo.description              |   11 +
 docs/manpages/tracker-control.1                   |    3 +
 docs/manpages/tracker-import.1                    |    3 +
 docs/manpages/tracker-info.1                      |    3 +
 docs/manpages/tracker-search-tool.1               |    4 +
 docs/manpages/tracker-search.1                    |    3 +
 docs/manpages/tracker-sparql.1                    |    4 +
 docs/manpages/tracker-stats.1                     |    3 +
 docs/manpages/tracker-status-icon.1               |    8 +
 docs/manpages/tracker-status.1                    |    8 +
 docs/manpages/tracker-tag.1                       |    3 +
 docs/ontologies/README.ontologiesdoc              |   48 +
 docs/ontologies/explanation.html.template         |   14 +
 docs/ontologies/nie/explanation.html              |   80 +
 docs/ontologies/nie/overview.dia                  |  Bin 0 -> 2086 bytes
 docs/ontologies/nmo/explanation.html              |   49 +
 po/sl.po                                          |  454 ++--
 po/zh_CN.po                                       | 2762 ++++++++++++++-------
 python/rss_reader/main.py                         |  104 +-
 python/rss_reader/rss_viewer.ui                   |  109 +
 python/rss_reader/tracker_backend.py              |    2 +-
 python/rss_reader/zeitgeist_backend.py            |   92 +
 src/libinotify/Makefile.am                        |    3 -
 src/libtracker-common/libtracker-common.vapi      |    2 +
 src/libtracker-common/tracker-sparql-builder.vala |    5 +-
 src/libtracker-data/libtracker-data.vapi          |   10 +-
 src/libtracker-data/tracker-data-manager.c        |   23 +-
 src/libtracker-data/tracker-data-update.c         |  282 ++-
 src/libtracker-data/tracker-data-update.h         |   66 +-
 src/libtracker-data/tracker-sparql-query.vala     |   92 +-
 src/libtracker-data/tracker-turtle-reader.vala    |    7 +-
 src/libtracker-gtk/tracker-ui.h                   |    2 +-
 src/plugins/Makefile.am                           |    4 +-
 src/tracker-control/tracker-control.c             |   19 +
 src/tracker-explorer/tracker-explorer.vala        |    2 -
 src/tracker-extract/tracker-extract-gstreamer.c   |   39 +-
 src/tracker-extract/tracker-extract-jpeg.c        |   12 +-
 src/tracker-extract/tracker-extract-mp3.c         |   22 +
 src/tracker-extract/tracker-extract-pdf.c         |   10 +-
 src/tracker-extract/tracker-extract-png.c         |   10 +-
 src/tracker-extract/tracker-extract-tiff.c        |   10 +-
 src/tracker-extract/tracker-xmp.c                 |  115 +-
 src/tracker-miner-fs/tracker-config.c             |    2 +-
 src/tracker-miner-fs/tracker-miner-files.c        |   11 +-
 src/tracker-search-tool/tracker-query.gs          |   11 +-
 src/tracker-search-tool/tracker-search-tool.gs    |   19 +-
 src/tracker-search-tool/tracker-utils.gs          |   22 +-
 src/tracker-status-icon/eggaccelerators.c         |    2 +-
 src/tracker-status-icon/tracker-main.c            |   20 +
 src/tracker-store/tracker-resources.c             |   30 +-
 src/tracker-store/tracker-store.c                 |   50 +-
 src/tracker-store/tracker-store.h                 |    6 -
 src/tracker-utils/tracker-import.c                |   23 +
 src/tracker-utils/tracker-info.c                  |   22 +
 src/tracker-utils/tracker-search.c                |   24 +-
 src/tracker-utils/tracker-sparql.c                |   22 +
 src/tracker-utils/tracker-stats.c                 |   29 +
 src/tracker-utils/tracker-status.c                |   22 +
 src/tracker-utils/tracker-tag.c                   |   22 +
 tests/libtracker-data/nie/filter-identifier-1.out |    5 +
 tests/libtracker-data/nie/filter-title-1.out      |    5 +
 utils/services/.gitignore                         |    1 +
 utils/services/Makefile.am                        |   13 +-
 utils/services/data-validator.c                   |    5 +-
 utils/services/file-class.cache.test              |  801 ++++++
 utils/services/gen-doc.sh                         |   14 +-
 utils/services/ontology-validator.c               |    7 +-
 utils/services/qname-test.c                       |  152 ++
 utils/services/qname.c                            |  124 +-
 utils/services/qname.h                            |    2 +
 utils/services/resources/LICENSE.txt              |   21 +
 utils/services/ttl2html.c                         |    8 +-
 utils/services/ttl_html.c                         |   31 +-
 utils/services/ttl_html.h                         |    3 +-
 utils/services/ttl_loader.c                       |    9 +
 utils/services/ttl_model.h                        |    3 +
 100 files changed, 4979 insertions(+), 1495 deletions(-)
---