[tracker/anonymous-file-nodes: 41/41] Merge branch 'master' into anonymous-file-nodes

[Carlos Garnacho <carlosg src gnome org>]

commit 03d36285687047fdd67151d854b711a722351f49
Merge: e3bb7e2 c6fe856
Author: Carlos Garnacho <carlos lanedo com>
Date:   Fri Jan 29 17:34:23 2010 +0100

    Merge branch 'master' into anonymous-file-nodes
    
    Conflicts:
    	src/tracker-extract/tracker-extract-mp3.c
    	src/tracker-writeback/tracker-writeback-xmp.c

 NEWS                                               |   53 +++++
 configure.ac                                       |    2 +-
 data/ontologies/10-xsd.description                 |    2 +-
 data/ontologies/30-nie.description                 |    4 +-
 data/ontologies/31-nao.description                 |    2 +-
 data/ontologies/32-nco.description                 |    2 +-
 data/ontologies/33-nfo.description                 |    2 +-
 data/ontologies/34-nmo.description                 |    2 +-
 data/ontologies/35-ncal.description                |    2 +-
 data/ontologies/38-nmm.description                 |    2 +-
 data/ontologies/39-mto.description                 |    2 +-
 data/ontologies/40-mlo.description                 |    2 +-
 data/ontologies/40-mlo.ontology                    |    3 +-
 docs/ontologies/.gitignore                         |    5 +
 docs/ontologies/README.ontologiesdoc               |   70 +++++--
 docs/ontologies/explanation.html.template          |   17 --
 docs/ontologies/explanation.xml.template           |   50 +++++
 docs/ontologies/mfo/explanation.html               |   17 --
 docs/ontologies/mfo/explanation.xml                |   25 +++
 docs/ontologies/mlo/explanation.xml                |   67 +++++++
 docs/ontologies/mlo/location-overview.dia          |  Bin 0 -> 3853 bytes
 docs/ontologies/nie/explanation.html               |  110 -----------
 docs/ontologies/nie/explanation.xml                |  167 ++++++++++++++++
 docs/ontologies/nmm/explanation.html               |   38 ----
 docs/ontologies/nmm/explanation.xml                |   54 ++++++
 docs/ontologies/nmo/explanation.html               |   49 -----
 docs/ontologies/nmo/explanation.xml                |   62 ++++++
 docs/ontologies/xsd/explanation.html               |   10 -
 docs/ontologies/xsd/explanation.xml                |   16 ++
 docs/reference/ontology/.gitignore                 |    5 +
 docs/reference/ontology/Makefile.am                |   13 +-
 docs/reference/ontology/ontology-docs.sgml         |   14 ++
 docs/tools/.gitignore                              |    5 +
 docs/tools/Makefile.am                             |   23 ++-
 docs/tools/gen-doc.sh                              |    2 +-
 docs/tools/ttl_sgml.c                              |  186 ++++++------------
 po/es.po                                           |  200 ++++++++++----------
 po/et.po                                           |  155 ++++++++-------
 po/hu.po                                           |   69 +++----
 src/libtracker-common/tracker-file-utils.c         |   16 +-
 src/libtracker-common/tracker-file-utils.h         |    1 +
 src/libtracker-data/tracker-sparql-query.vala      |   52 +++++-
 src/libtracker-db/tracker-db-manager.c             |   68 +++++++
 src/libtracker-extract/tracker-exif.c              |   18 +-
 src/libtracker-extract/tracker-xmp.c               |   20 +-
 src/libtracker-miner/tracker-miner-fs.c            |   28 +++-
 src/libtracker-miner/tracker-monitor.c             |   32 +++-
 src/plugins/evolution/tracker-evolution-plugin.c   |    4 +-
 src/tracker-control/tracker-control.c              |   20 ++-
 src/tracker-extract/tracker-extract-mp3.c          |    3 +-
 src/tracker-extract/tracker-extract-tiff.c         |   18 +-
 src/tracker-search-tool/tracker-result-grid.gs     |    8 +-
 src/tracker-utils/tracker-search.c                 |    8 +-
 src/tracker-writeback/tracker-writeback-xmp.c      |   18 +-
 tests/libtracker-data/functions/Makefile.am        |    4 +
 tests/libtracker-data/functions/data-3.ontology    |   25 +++
 tests/libtracker-data/functions/data-3.ttl         |   22 +++
 .../functions/functions-tracker-loc-1.out          |    4 +
 .../functions/functions-tracker-loc-1.rq           |   11 +
 tests/libtracker-data/tracker-sparql-test.c        |    1 +
 tests/tracker-writeback/01-writeback.py            |    4 +-
 utils/services/file-class.cache.test               |   18 +-
 62 files changed, 1217 insertions(+), 695 deletions(-)
---