[tracker/writeback: 53/54] Merge branch 'master' into writeback

[Philip Van Hoof <pvanhoof src gnome org>]

commit 99339c435f19c8f4dfe218e28f4671e5c11d0a30
Merge: f9d0465... b93b360...
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Nov 24 12:24:25 2009 +0100

    Merge branch 'master' into writeback

 Makefile.am                                        |    2 +-
 NEWS                                               |   36 ++
 configure.ac                                       |   15 +-
 data/ontologies/10-xsd.description                 |   10 +-
 data/ontologies/30-nie.description                 |    4 +-
 data/ontologies/31-nao.description                 |   21 +-
 data/ontologies/32-nco.description                 |   18 +-
 data/ontologies/32-nco.ontology                    |   21 +
 data/ontologies/33-nfo.description                 |   21 +-
 data/ontologies/34-nmo.description                 |   17 +-
 data/ontologies/34-nmo.ontology                    |   86 +++-
 data/ontologies/35-ncal.description                |   18 +-
 data/ontologies/38-nmm.description                 |    7 +-
 data/ontologies/38-nmm.ontology                    |    7 +
 data/ontologies/39-mto.description                 |    6 +-
 data/ontologies/40-mlo.description                 |    3 +-
 data/ontologies/41-mfo.description                 |    8 +-
 docs/ontologies/README.ontologiesdoc               |   33 +-
 docs/ontologies/explanation.html.template          |    7 +
 docs/ontologies/index.html                         |   51 ++
 docs/ontologies/nie/explanation.html               |    2 +
 docs/ontologies/nie/overview.dia                   |  Bin 0 -> 2086 bytes
 docs/ontologies/nmo/explanation.html               |   49 ++
 examples/Makefile.am                               |    4 +
 .../test => examples/libtracker-miner}/.gitignore  |    0
 .../test => examples/libtracker-miner}/Makefile.am |    1 +
 .../libtracker-miner}/tracker-main.c               |   24 +-
 .../libtracker-miner}/tracker-miner-test.c         |    0
 .../libtracker-miner}/tracker-miner-test.h         |    0
 po/es.po                                           |  561 ++++++++++----------
 python/rss_reader/rss_viewer.ui                    |  109 ++++
 python/rss_reader/signaler.py                      |    2 +-
 src/libtracker-common/libtracker-common.vapi       |    2 +
 src/libtracker-data/tracker-data-manager.c         |   23 +-
 src/libtracker-data/tracker-sparql-query.vala      |   56 ++-
 src/libtracker-fts/tracker-parser.c                |    2 +-
 src/libtracker-miner/Makefile.am                   |    2 -
 src/libtracker-miner/tracker-miner-fs.c            |    6 +-
 src/libtracker-miner/tracker-monitor.c             |  152 ++++--
 src/tracker-control/tracker-control.c              |    2 +-
 src/tracker-extract/Makefile.am                    |    7 +-
 src/tracker-miner-fs/tracker-config.c              |   20 +
 src/tracker-miner-fs/tracker-main.c                |   12 -
 src/tracker-status-icon/Makefile.am                |    5 +-
 tests/libtracker-common/Makefile.am                |   28 +-
 tests/libtracker-common/tracker-type-utils-test.c  |    1 -
 tests/libtracker-data/nie/filter-identifier-1.out  |    5 +
 tests/libtracker-data/nie/filter-title-1.out       |    5 +
 utils/services/Makefile.am                         |    4 +
 utils/services/gen-doc.sh                          |   10 +-
 utils/services/qname-test.c                        |   20 +-
 utils/services/resources/LICENSE.txt               |   21 +
 utils/services/resources/nepomuk-logo.png          |  Bin 0 -> 11107 bytes
 utils/services/resources/nie-maemo.css             |    2 +
 utils/services/resources/tracker-logo.png          |  Bin 0 -> 7331 bytes
 utils/services/ttl_html.c                          |   59 ++-
 utils/services/ttl_loader.c                        |   11 +
 utils/services/ttl_model.c                         |   13 +-
 utils/services/ttl_model.h                         |    2 +
 59 files changed, 1168 insertions(+), 445 deletions(-)
---