[tracker/tracker-store] Rename trackerd to tracker-store

From: Jürg Billeter <juergbi src gnome org>
To: svn-commits-list gnome org
Subject: [tracker/tracker-store] Rename trackerd to tracker-store
Date: Thu, 14 May 2009 05:43:36 -0400 (EDT)
commit 3b09ab2874a78312502f0280baa22d96017bf625
Author: JÃ¼rg Billeter <j bitron ch>
Date:   Thu May 14 11:38:07 2009 +0200

    Rename trackerd to tracker-store
---
 configure.ac                                       |    4 +-
 data/Makefile.am                                   |    8 ++--
 data/dbus/org.freedesktop.Tracker.service.in       |    2 +-
 ...d.desktop.in.in => tracker-store.desktop.in.in} |    2 +-
 docs/manpages/Makefile.am                          |    2 +-
 docs/manpages/tracker-applet.1                     |    4 +-
 docs/manpages/tracker-extract.1                    |    2 +-
 docs/manpages/tracker-info.1                       |    2 +-
 docs/manpages/tracker-preferences.1                |    6 +-
 docs/manpages/tracker-search-tool.1                |    4 +-
 docs/manpages/tracker-search.1                     |    6 +-
 docs/manpages/tracker-stats.1                      |    4 +-
 docs/manpages/tracker-status.1                     |    6 +-
 docs/manpages/{trackerd.1 => tracker-store.1}      |   18 ++++----
 docs/manpages/tracker-tag.1                        |    2 +-
 docs/manpages/tracker-thumbnailer.1                |    4 +-
 docs/manpages/tracker.cfg.5                        |   16 +++---
 docs/reference/libtracker-module/Makefile.am       |    2 +-
 .../libtracker-module/writing-an-extractor.sgml    |    2 +-
 po/ChangeLog                                       |    2 +-
 po/POTFILES.in                                     |    4 +-
 po/POTFILES.skip                                   |    2 +-
 po/ar.po                                           |   32 ++++++------
 po/be.po                                           |   44 +++++++++---------
 po/be latin po                                     |   44 +++++++++---------
 po/ca.po                                           |   44 +++++++++---------
 po/cs.po                                           |   44 +++++++++---------
 po/da.po                                           |   28 ++++++------
 po/de.po                                           |   32 ++++++------
 po/dz.po                                           |   42 ++++++++--------
 po/el.po                                           |   44 +++++++++---------
 po/en_GB.po                                        |   44 +++++++++---------
 po/es.po                                           |   32 ++++++------
 po/et.po                                           |   28 ++++++------
 po/fi.po                                           |   44 +++++++++---------
 po/fr.po                                           |   34 +++++++-------
 po/gl.po                                           |   28 ++++++------
 po/he.po                                           |   44 +++++++++---------
 po/hu.po                                           |   28 ++++++------
 po/it.po                                           |   28 ++++++------
 po/ja.po                                           |   42 ++++++++--------
 po/ko.po                                           |   44 +++++++++---------
 po/lt.po                                           |   44 +++++++++---------
 po/mk.po                                           |   40 ++++++++--------
 po/nb.po                                           |   34 +++++++-------
 po/nl.po                                           |   32 ++++++------
 po/oc.po                                           |   42 ++++++++--------
 po/pl.po                                           |   50 ++++++++++----------
 po/pt.po                                           |   34 +++++++-------
 po/pt_BR.po                                        |   38 +++++++-------
 po/ru.po                                           |   42 ++++++++--------
 po/sk.po                                           |   38 +++++++-------
 po/sl.po                                           |   42 ++++++++--------
 po/sv.po                                           |   32 ++++++------
 po/th.po                                           |   44 +++++++++---------
 po/zh_CN.po                                        |   44 +++++++++---------
 python/deskbar-handler/tracker-handler.py          |    2 +-
 python/deskbar-handler/tracker-module.py           |    2 +-
 src/Makefile.am                                    |    4 +-
 src/libtracker-data/tracker-data-manager.c         |    4 +-
 .../evolution/tracker-evolution-registrar.c        |    2 +-
 .../evolution/tracker-evolution-registrar.h        |    2 +-
 src/plugins/kmail/tracker-kmail-registrar.c        |    2 +-
 src/plugins/kmail/tracker-kmail-registrar.h        |    2 +-
 src/plugins/rss/tracker-rss-registrar.c            |    2 +-
 src/plugins/rss/tracker-rss-registrar.h            |    2 +-
 src/tracker-applet/tracker-applet.c                |    4 +-
 src/tracker-indexer/Makefile.am                    |    2 +-
 src/tracker-indexer/tracker-main.c                 |    2 +-
 src/tracker-preferences/tracker-preferences.c      |    6 +-
 src/tracker-store/.gitignore                       |    1 +
 src/{trackerd => tracker-store}/Makefile.am        |   10 ++--
 src/{trackerd => tracker-store}/mingw-compat.h     |    0
 src/{trackerd => tracker-store}/tracker-backup.c   |    0
 src/{trackerd => tracker-store}/tracker-backup.h   |    0
 src/{trackerd => tracker-store}/tracker-crawler.c  |    0
 src/{trackerd => tracker-store}/tracker-crawler.h  |    0
 src/{trackerd => tracker-store}/tracker-daemon.c   |    0
 src/{trackerd => tracker-store}/tracker-daemon.h   |    0
 src/{trackerd => tracker-store}/tracker-dbus.c     |    0
 src/{trackerd => tracker-store}/tracker-dbus.h     |    0
 src/{trackerd => tracker-store}/tracker-events.c   |    2 +-
 src/{trackerd => tracker-store}/tracker-events.h   |    0
 src/{trackerd => tracker-store}/tracker-main.c     |    4 +-
 src/{trackerd => tracker-store}/tracker-main.h     |    0
 .../tracker-marshal-main.c                         |    0
 .../tracker-marshal.list                           |    0
 src/{trackerd => tracker-store}/tracker-monitor.c  |    0
 src/{trackerd => tracker-store}/tracker-monitor.h  |    0
 .../tracker-processor.c                            |    0
 .../tracker-processor.h                            |    0
 .../tracker-push-registrar.c                       |    0
 .../tracker-push-registrar.h                       |    0
 src/{trackerd => tracker-store}/tracker-push.c     |    0
 src/{trackerd => tracker-store}/tracker-push.h     |    0
 .../tracker-resource-class.c                       |    0
 .../tracker-resource-class.h                       |    0
 .../tracker-resources.c                            |    0
 .../tracker-resources.h                            |    0
 src/{trackerd => tracker-store}/tracker-search.c   |    0
 src/{trackerd => tracker-store}/tracker-search.h   |    0
 src/{trackerd => tracker-store}/tracker-status.c   |    0
 src/{trackerd => tracker-store}/tracker-status.h   |    0
 src/{trackerd => tracker-store}/tracker-utils.c    |    0
 src/{trackerd => tracker-store}/tracker-utils.h    |    0
 .../tracker-volume-cleanup.c                       |    0
 .../tracker-volume-cleanup.h                       |    0
 src/tracker-utils/tracker-sparql.c                 |    2 +-
 src/tracker-utils/tracker-tag.c                    |    2 +-
 src/trackerd/.gitignore                            |    1 -
 tests/tracker-indexer/Makefile.am                  |    6 +-
 111 files changed, 738 insertions(+), 738 deletions(-)

diff --git a/configure.ac b/configure.ac
index cbc05e9..7ecc7be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_INIT([tracker], [tracker_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=tracker],
 	[tracker])
 
-AC_CONFIG_SRCDIR([src/trackerd/tracker-main.c])
+AC_CONFIG_SRCDIR([src/tracker-store/tracker-main.c])
 
 AM_INIT_AUTOMAKE([no-define tar-ustar])
 AM_CONFIG_HEADER(config.h)
@@ -1369,7 +1369,7 @@ AC_CONFIG_FILES([
 	src/rasqal/Makefile
 	src/tracker-applet/Makefile
 	src/tracker-applet/tracker-applet.desktop.in
-	src/trackerd/Makefile
+	src/tracker-store/Makefile
 	src/tracker-extract/Makefile
 	src/tracker-fts/Makefile
 	src/tracker-indexer/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 41c03fa..14cfcb1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,14 +2,14 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = db dbus modules languages icons ontologies
 
-trackerd.desktop.in: trackerd.desktop.in.in
+tracker-store.desktop.in: tracker-store.desktop.in.in
 	@sed -e "s|@libexecdir[ ]|${libexecdir}|" \
 	     -e "s|@VERSION[ ]|${VERSION}|" $< > $@
 
 autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_in_files = trackerd.desktop.in.in
-autostart_in_files = trackerd.desktop.in
-autostart_DATA = trackerd.desktop
+autostart_in_in_files = tracker-store.desktop.in.in
+autostart_in_files = tracker-store.desktop.in
+autostart_DATA = tracker-store.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/data/dbus/org.freedesktop.Tracker.service.in b/data/dbus/org.freedesktop.Tracker.service.in
index 775f509..a0eb015 100644
--- a/data/dbus/org.freedesktop.Tracker.service.in
+++ b/data/dbus/org.freedesktop.Tracker.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Tracker
-Exec= libexecdir@/trackerd
+Exec= libexecdir@/tracker-store
diff --git a/data/trackerd.desktop.in.in b/data/tracker-store.desktop.in.in
similarity index 93%
rename from data/trackerd.desktop.in.in
rename to data/tracker-store.desktop.in.in
index 8808cac..0c2f2c3 100644
--- a/data/trackerd.desktop.in.in
+++ b/data/tracker-store.desktop.in.in
@@ -3,7 +3,7 @@ Encoding=UTF-8
 _Name=Tracker
 _Comment=Tracker search and indexing service
 Icon=
-Exec= libexecdir@/trackerd
+Exec= libexecdir@/tracker-store
 Terminal=false
 Type=Application
 Categories=
diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am
index 376acc1..288483e 100644
--- a/docs/manpages/Makefile.am
+++ b/docs/manpages/Makefile.am
@@ -16,7 +16,7 @@ man_MANS = 			\
 	tracker-extract.1	\
 	tracker-search.1	\
 	tracker-stats.1		\
-	trackerd.1		\
+	tracker-store.1		\
 	tracker-thumbnailer.1	\
 	tracker-tag.1		\
 	tracker-status.1	\
diff --git a/docs/manpages/tracker-applet.1 b/docs/manpages/tracker-applet.1
index dea4219..8639683 100644
--- a/docs/manpages/tracker-applet.1
+++ b/docs/manpages/tracker-applet.1
@@ -9,7 +9,7 @@ tracker-applet \- The tracker tray-icon and on-click-search-entry
 .SH DESCRIPTION
 .B tracker-applet
 is a
-.BR trackerd (1)
+.BR tracker-store (1)
 system tray icon, meant to provide a fast way of accessing tracker's
 database, configuring tracker through
 .BR tracker-preferences
@@ -18,4 +18,4 @@ statistics page to the user.
 
 .SH SEE ALSO
 .BR tracker-search-tool (1),
-.BR trackerd (1).
+.BR tracker-store (1).
diff --git a/docs/manpages/tracker-extract.1 b/docs/manpages/tracker-extract.1
index 73dadf9..c68d072 100644
--- a/docs/manpages/tracker-extract.1
+++ b/docs/manpages/tracker-extract.1
@@ -18,4 +18,4 @@ Using tracker-extract from command line to extract metadata from one file:
 $ echo -e "/x/y/z.mp3\\naudio/mpeg" | tracker-extract
 
 .SH SEE ALSO
-.BR trackerd (1)
+.BR tracker-store (1)
diff --git a/docs/manpages/tracker-info.1 b/docs/manpages/tracker-info.1
index 42a362f..5709f00 100644
--- a/docs/manpages/tracker-info.1
+++ b/docs/manpages/tracker-info.1
@@ -26,7 +26,7 @@ tracker services, see
 .BR tracker-services (1)
 
 .SH SEE ALSO
-.BR trackerd (1),
+.BR tracker-store (1),
 .BR tracker-services (1).
 
 .SH AUTHOR
diff --git a/docs/manpages/tracker-preferences.1 b/docs/manpages/tracker-preferences.1
index 32bde03..29e7180 100644
--- a/docs/manpages/tracker-preferences.1
+++ b/docs/manpages/tracker-preferences.1
@@ -1,7 +1,7 @@
 .TH tracker-preferences 1 "November, 2007" GNU "User Commands"
 
 .SH NAME
-tracker-preferences \- Preferences editor for trackerd
+tracker-preferences \- Preferences editor for tracker-store
 
 .SH SYNOPSIS
 .B tracker-preferences
@@ -9,9 +9,9 @@ tracker-preferences \- Preferences editor for trackerd
 .SH DESCRIPTION
 .B tracker-preferences
 is a graphical configuration front end for the
-.BR trackerd (1)
+.BR tracker-store (1)
 indexer and search daemon.
 
 .SH SEE ALSO
 .BR tracker-search-tool (1),
-.BR trackerd (1).
+.BR tracker-store (1).
diff --git a/docs/manpages/tracker-search-tool.1 b/docs/manpages/tracker-search-tool.1
index 28a2d80..ad4a376 100644
--- a/docs/manpages/tracker-search-tool.1
+++ b/docs/manpages/tracker-search-tool.1
@@ -10,7 +10,7 @@ tracker-search-tool \- Gnome Tracker Search Tool
 .B tracker-search-tool 
 is a graphical search front end for Gnome.
 It uses 
-.B trackerd
+.B tracker-store
 to get instant search results.
 
 .SH OPTIONS
@@ -48,7 +48,7 @@ X display to use
 
 .SH SEE ALSO
 .BR tracker-search (1),
-.BR trackerd (1),
+.BR tracker-store (1),
 .BR tracker-services (1).
 
 .SH AUTHOR
diff --git a/docs/manpages/tracker-search.1 b/docs/manpages/tracker-search.1
index a9f2fb9..7157df5 100644
--- a/docs/manpages/tracker-search.1
+++ b/docs/manpages/tracker-search.1
@@ -2,7 +2,7 @@
 
 .SH NAME
 tracker-search \- command line tool to search documents indexed by
-trackerd
+tracker-store
 
 .SH SYNOPSIS
 .B tracker-search
@@ -12,7 +12,7 @@ trackerd
 .SH DESCRIPTION
 .B tracker-search
 searches all by
-.BR trackerd(1)
+.BR tracker-store(1)
 indexed content for
 .I expression.
 .I Expression
@@ -38,6 +38,6 @@ see
 .BR tracker-services (1).
 
 .SH "SEE ALSO"
-.BR trackerd (1),
+.BR tracker-store (1),
 .BR tracker-search-tool (1),
 .BR tracker-services (1).
diff --git a/docs/manpages/tracker-stats.1 b/docs/manpages/tracker-stats.1
index 48d14d1..716aa38 100644
--- a/docs/manpages/tracker-stats.1
+++ b/docs/manpages/tracker-stats.1
@@ -3,7 +3,7 @@
 .SH NAME
 tracker-stats\- command line tool that provides statistics on files
 indexed by
-.B trackerd 
+.B tracker-store 
 
 .SH SYNOPSIS
 .B tracker-stats [OPTIONS] 
@@ -19,6 +19,6 @@ by service type.
 Show a brief help message.
 
 .SH SEE ALSO
-.BR trackerd (1),
+.BR tracker-store (1),
 .BR tracker-status (1),
 .BR tracker-services (7).
diff --git a/docs/manpages/tracker-status.1 b/docs/manpages/tracker-status.1
index 2993e86..eea5e65 100644
--- a/docs/manpages/tracker-status.1
+++ b/docs/manpages/tracker-status.1
@@ -1,17 +1,17 @@
 .TH tracker-status 1 "July 2007" GNU "User Commands"
 
 .SH NAME
-tracker-status\- command line tool that reports the trackerd status
+tracker-status\- command line tool that reports the tracker-store status
 
 .SH SYNOPSIS
 .B tracker-status
 
 .SH DESCRIPTION
 .B tracker-status
-Prints trackerd's status. Which can be one of the following:
+Prints tracker-store's status. Which can be one of the following:
 .PP
 Initializing, Watching, Indexing, Pending, Optimizing, Idle, Shutdown.
 
 .SH SEE ALSO
-.BR trackerd (1),
+.BR tracker-store (1),
 .BR tracker-stats (1)
diff --git a/docs/manpages/trackerd.1 b/docs/manpages/tracker-store.1
similarity index 86%
rename from docs/manpages/trackerd.1
rename to docs/manpages/tracker-store.1
index ff80a1a..abdbfd7 100644
--- a/docs/manpages/trackerd.1
+++ b/docs/manpages/tracker-store.1
@@ -1,10 +1,10 @@
-.TH trackerd 1 "Jan 2008" GNU "User Commands"
+.TH tracker-store 1 "Jan 2008" GNU "User Commands"
 
 .SH NAME
-trackerd \- indexer daemon for tracker search tool
+tracker-store \- indexer daemon for tracker search tool
 
 .SH SYNOPSIS
-.B trackerd [OPTIONS]
+.B tracker-store [OPTIONS]
 
 .SH DESCRIPTION
 .B Trackerd
@@ -12,7 +12,7 @@ provides both a powerful indexer and an extensible metadata database. It
 indexes files including the text contents and any available metadata to
 provide fast search services.
 .PP
-By default, trackerd will index all files in a user's home directory (with
+By default, tracker-store will index all files in a user's home directory (with
 the exception of hidden files). This can be overridden by specifying
 one or more directories to be indexed instead in the configuration file
 ($HOME/.config/tracker/tracker.cfg) and/or by using the --include-dir
@@ -44,13 +44,13 @@ indexable content but do not watch for directory or file changes.
 .TP
 \-n, --disable-indexing
 Prevent
-.B trackerd
+.B tracker-store
 from indexing and watching. Searching is still
 possible.
 
 .TP
 \-v, --verbosity=value
-Makes trackerd log/print more information. Value can be one of 0 - show
+Makes tracker-store log/print more information. Value can be one of 0 - show
 only errors, 1 - show only minimal output, 2 - show detailed output and
 3 - show debug output (don't do this, unless you know what you are doing).
 
@@ -61,7 +61,7 @@ Minimise memory usage. Note that this may slow down indexing.
 .TP
 \-s, --initial-sleep=value
 Set the initial sleep time in seconds. This is the time
-.B trackerd
+.B tracker-store
 waits at startup before indexing.
 
 .TP
@@ -71,14 +71,14 @@ code).
 
 .TP
 \-R, --force-reindex
-This forces trackerd to re-index all watched files and directories.
+This forces tracker-store to re-index all watched files and directories.
 Since every watched directory and any previously indexed file has to be
 read and processed again, this may degrade the whole system performance.
 
 .TP
 \-f, --fatal-errors
 Makes any errors fatal, i.e. forces abortion of
-.B trackerd.
+.B tracker-store.
 This switch is only useful for debugging.
 
 .SH FILES
diff --git a/docs/manpages/tracker-tag.1 b/docs/manpages/tracker-tag.1
index 1881c66..515858b 100644
--- a/docs/manpages/tracker-tag.1
+++ b/docs/manpages/tracker-tag.1
@@ -36,7 +36,7 @@ If no file name is given, all known tags and their count is listed.
 Search for files matching the given tag.
 
 .SH SEE ALSO
-.BR trackerd (1).
+.BR tracker-store (1).
 
 .SH AUTHOR
 tracker-tag was written by Jamie McCracken <jamiemcc gnome org>.
diff --git a/docs/manpages/tracker-thumbnailer.1 b/docs/manpages/tracker-thumbnailer.1
index be2b060..d772b76 100644
--- a/docs/manpages/tracker-thumbnailer.1
+++ b/docs/manpages/tracker-thumbnailer.1
@@ -26,7 +26,7 @@ actual transformation.
 .PP
 .B tracker-thumbnailer
 is called by 
-.B trackerd
+.B tracker-store
 to create thumbnails which are then used by frontends like
 .B tracker-search-tool
 to illustrate the search results.
@@ -46,7 +46,7 @@ Size of the generated thumbnail.
 Currently supported is only \fBnormal\fR, which is 128x128 pixel.
 
 .SH SEE ALSO
-.BR trackerd (1),
+.BR tracker-store (1),
 .BR tracker-search (1),
 .BR tracker-search-tool (1),
 .BR convert (1).
diff --git a/docs/manpages/tracker.cfg.5 b/docs/manpages/tracker.cfg.5
index 863a903..11f1dcc 100644
--- a/docs/manpages/tracker.cfg.5
+++ b/docs/manpages/tracker.cfg.5
@@ -1,7 +1,7 @@
 .TH tracker.cfg 5 "July 2007" GNU "Configuration Files"
 
 .SH NAME
-tracker.cfg \- configuration file for the trackerd search daemon
+tracker.cfg \- configuration file for the tracker-store search daemon
 
 .SH DESCRIPTION
 The tracker.cfg file resides in the $HOME/.config/tracker directory.
@@ -32,10 +32,10 @@ LowMemoryMode=false
 
 .SH Sections
 .SS General
-This section may contain general settings for trackerd.
+This section may contain general settings for tracker-store.
 .TP
 Verbosity=VALUE
-Specifies how verbose trackerd should be logging. VALUE can be one of
+Specifies how verbose tracker-store should be logging. VALUE can be one of
 0 through 3.
 .RS
 .TP
@@ -57,8 +57,8 @@ Enables low memory mode. Tracker may be slightly less fast at
 indexing/search but also needs less system memory.
 .TP
 InitialSleep=VALUE
-Sets the initial sleep time for trackerd. This is a number of seconds
-that trackerd wait before indexing.
+Sets the initial sleep time for tracker-store. This is a number of seconds
+that tracker-store wait before indexing.
 .TP
 NFSLocking=BOOLEAN
 Set to TRUE when the home directory is in a NFS filesystem.
@@ -66,14 +66,14 @@ Set to TRUE when the home directory is in a NFS filesystem.
 .SS Watches
 .TP
 WatchDirectoryRoots=DIRECTORY[;MORE;DIRECTORIES]
-Sets the directories trackerd should watch and index. Defaults to the
+Sets the directories tracker-store should watch and index. Defaults to the
 users home directory.
 .TP
 NoWatchDirectory=DIRECTORY[;MORE;DIRECTORIES]
-Sets directories trackerd should ignore, i.e. not index or watch.
+Sets directories tracker-store should ignore, i.e. not index or watch.
 .TP
 CrawlDirectory=DIRECTORY[;MORE;DIRECTORIES]
-Sets directories trackerd should index once but not watch for changes.
+Sets directories tracker-store should index once but not watch for changes.
 .TP
 EnableWatching=BOOLEAN
 Enables or disables watching of directories, i.e. re-index files when
diff --git a/docs/reference/libtracker-module/Makefile.am b/docs/reference/libtracker-module/Makefile.am
index a967b47..84773f4 100644
--- a/docs/reference/libtracker-module/Makefile.am
+++ b/docs/reference/libtracker-module/Makefile.am
@@ -51,7 +51,7 @@ GTKDOC_LIBS =								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libstemmer/libstemmer.la	 		\
 	$(top_builddir)/src/tracker-indexer/libtracker-module.la	\
-	$(trackerd_win_libs)						\
+	$(tracker_store_win_libs)						\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
diff --git a/docs/reference/libtracker-module/writing-an-extractor.sgml b/docs/reference/libtracker-module/writing-an-extractor.sgml
index b365c2f..0b7d3fd 100644
--- a/docs/reference/libtracker-module/writing-an-extractor.sgml
+++ b/docs/reference/libtracker-module/writing-an-extractor.sgml
@@ -124,7 +124,7 @@ void name_of_the_function (const gchar *filename,
       with maximum verbosity to know what is happening. The log is
       printed on the console, but also in two files:
       <simplelist>
-	<member><filename>~/.local/share/tracker/trackerd.log</filename></member>
+	<member><filename>~/.local/share/tracker/tracker-store.log</filename></member>
 	<member><filename>~/.local/share/tracker/tracker-indexer.log</filename></member>
       </simplelist>
     </para>
diff --git a/po/ChangeLog b/po/ChangeLog
index 0df02c3..6b2bea3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1138,7 +1138,7 @@
 
 a2006-11-30  Luca Ferretti  <elle uca libero it>
 
-	* POTFILES.in: Add trackerd.c
+	* POTFILES.in: Add tracker-store.c
 
 2006-11-21  Luca Ferretti  <elle uca libero it>
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6ad47ba..43acfee 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
 
-data/trackerd.desktop.in.in
+data/tracker-store.desktop.in.in
 python/deskbar-handler/tracker-handler-static.py
 python/deskbar-handler/tracker-handler.py
 python/deskbar-handler/tracker-module.py
@@ -32,4 +32,4 @@ src/tracker-utils/tracker-sparql.c
 src/tracker-utils/tracker-stats.c
 src/tracker-utils/tracker-status.c
 src/tracker-utils/tracker-tag.c
-src/trackerd/tracker-main.c
+src/tracker-store/tracker-main.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 43a1ef1..d5c080e 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,7 +1,7 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
 
-data/trackerd.desktop.in
+data/tracker-store.desktop.in
 src/rasqal/rdql_parser.c
 src/rasqal/sparql_parser.c
 src/tracker-applet/tracker-applet.desktop.in
diff --git a/po/ar.po b/po/ar.po
index 1bcb61e..165fda4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -21,12 +21,12 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.3.1\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2327
 msgid "Tracker"
 msgstr "Ø§Ù?Ù?Ù?Ù?ØªÙ?Ù?"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Ø®Ø¯Ù?Ø© Ø¨ØØ« Ù?Ù?Ù?Ø±Ø³Ø© Ø§Ù?Ù?Ù?Ù?ØªÙ?Ù?"
 
@@ -753,12 +753,12 @@ msgid "Control and monitor the Tracker search and indexing service"
 msgstr "ØªØÙ?Ù?Ù? Ù?Ø±Ø§Ù?Ø¨ Ø®Ø¯Ù?Ø© Ø¨ØØ« Ù?Ù?Ù?Ø±Ø³Ø© Ø§Ù?Ù?Ù?Ù?ØªÙ?Ù?"
 
 #: ../src/tracker-extract/tracker-main.c:81
-#: ../src/tracker-indexer/tracker-main.c:84 ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-indexer/tracker-main.c:84 ../src/tracker-store/tracker-main.c:136
 msgid "Displays version information"
 msgstr "Ù?Ø¹Ø±Ø¶ Ù?Ø¹Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø¥ØµØ¯Ø§Ø±Ø©"
 
 #: ../src/tracker-extract/tracker-main.c:85
-#: ../src/tracker-indexer/tracker-main.c:88 ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-indexer/tracker-main.c:88 ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1826,44 +1826,44 @@ msgstr ""
 "Ù?Ù?Ø§ØØ¸Ø©: Ù?ØµÙ?Ù?Ø§ Ù?Ù?ØØ¯ Ø§Ù?Ù?Ø³Ù?Ù?ØØ? Ù?Ù?Ø§Ù? Ø§Ù?Ù?Ø«Ù?Ø± Ù?Ù? Ø§Ù?Ù?ØªØ§Ø¦Ø¬ Ù?Ù? Ù?Ø§Ø¹Ø¯Ø© Ø§Ù?Ø¨Ù?Ø§Ù?Ø§Øª Ù?Ù?Ù? "
 "ØªØ³Ø±Ø¯ Ù?Ù?Ø§"
 
-#: ../src/trackerd/tracker-main.c:145
+#: ../src/tracker-store/tracker-main.c:145
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:149
+#: ../src/tracker-store/tracker-main.c:149
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Ù?Ø®Ù?Ù? Ø§Ø³ØªØ¹Ù?Ø§Ù? Ø§Ù?Ø°Ø§Ù?Ø±Ø©Ø? Ù?Ù?Ù?Ù? Ø£Ù? Ù?Ø¨Ø·Ø¦ Ø§Ù?Ù?Ù?Ø±Ø³Ø©"
 
-#: ../src/trackerd/tracker-main.c:153
+#: ../src/tracker-store/tracker-main.c:153
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:157
+#: ../src/tracker-store/tracker-main.c:157
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:161
+#: ../src/tracker-store/tracker-main.c:161
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:165
+#: ../src/tracker-store/tracker-main.c:165
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:171
+#: ../src/tracker-store/tracker-main.c:171
 msgid "Force a re-index of all content"
 msgstr "Ø§Ù?Ø±Ø¶ Ø¥Ø¹Ø§Ø¯Ø© Ù?Ù?Ø±Ø³Ø© Ù?Ù? Ø§Ù?Ù?ØØªÙ?Ù?"
 
-#: ../src/trackerd/tracker-main.c:175
+#: ../src/tracker-store/tracker-main.c:175
 msgid "Disable any indexing and monitoring"
 msgstr "Ø¹Ø·Ù?Ù? Ø£Ù? Ù?Ù?Ø±Ø³Ø© Ø£Ù? Ù?Ø±Ø§Ù?Ø¨Ø©"
 
-#: ../src/trackerd/tracker-main.c:178
+#: ../src/tracker-store/tracker-main.c:178
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr "Ø§Ù?Ù?ØºØ© Ø§Ù?Ù?ØªÙ? Ø³ØªØ³ØªØ®Ø¯Ù? Ù?Ù?Ù?Ø¬Ø°Ù?Ø± Ù?Ø§Ù?Ù?Ù?Ù?Ù?Ù?Ø© (Ø±Ù?Ù?Ø² Ù?ØØ§Ø±Ù? ISO 639-1 2)"
@@ -1871,7 +1871,7 @@ msgstr "Ø§Ù?Ù?ØºØ© Ø§Ù?Ù?ØªÙ? Ø³ØªØ³ØªØ®Ø¯Ù? Ù?Ù?Ù?Ø¬Ø°Ù?Ø± Ù?Ø§Ù?Ù?Ù?Ù?Ù?Ù?Ø© (
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:853
+#: ../src/tracker-store/tracker-main.c:853
 msgid "- start the tracker daemon"
 msgstr "- Ø§Ø¨Ø¯Ø£ Ø¹Ù?Ø±Ù?Øª Ø§Ù?Ù?Ù?Ù?ØªÙ?Ù?"
 
@@ -1959,8 +1959,8 @@ msgstr "- Ø§Ø¨Ø¯Ø£ Ø¹Ù?Ø±Ù?Øª Ø§Ù?Ù?Ù?Ù?ØªÙ?Ù?"
 #~ msgid "%s: no connection to tracker daemon"
 #~ msgstr "%s: Ù?Ø§ Ø§ØªØµØ§Ù? Ø¨Ø¹Ù?Ø±Ù?Øª Ø§Ù?Ù?Ù?Ù?ØªÙ?Ù?"
 
-#~ msgid "Ensure \"trackerd\" is running before launch this command."
-#~ msgstr "ØªØ£Ù?Ù?Ø¯ Ù?Ù? Ø£Ù? \"trackerd\" Ù?Ø¹Ù?Ù? Ù?Ø¨Ù? ØªØ´ØºÙ?Ù? Ù?Ø°Ø§ Ø§Ù?Ø£Ù?Ø±"
+#~ msgid "Ensure \"tracker-store\" is running before launch this command."
+#~ msgstr "ØªØ£Ù?Ù?Ø¯ Ù?Ù? Ø£Ù? \"tracker-store\" Ù?Ø¹Ù?Ù? Ù?Ø¨Ù? ØªØ´ØºÙ?Ù? Ù?Ø°Ø§ Ø§Ù?Ø£Ù?Ø±"
 
 #~ msgid "%s: internal tracker error: %s"
 #~ msgstr "%s: Ø®Ø·Ø£ Ù?Ù?Ù?ØªÙ?Ù? Ø¯Ø§Ø®Ù?Ù?: %s"
diff --git a/po/be.po b/po/be.po
index c53fe8c..cb412ba 100644
--- a/po/be.po
+++ b/po/be.po
@@ -433,8 +433,8 @@ msgstr "%s: Ð°Ð´Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ð°Ðµ Ñ?Ñ?Ð²Ñ?Ð·Ñ? Ð· Ñ?Ð»Ñ?Ð¶Ð±Ð°Ð¹ tracker"
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "Ð£Ð¿Ñ?Ñ?Ð½Ñ?Ñ?ÐµÑ?Ñ?, Ñ?Ñ?Ð¾ \"trackerd\" Ð¿Ñ?Ð°Ñ?Ñ?Ðµ, Ð¿ÐµÑ?Ñ? Ñ?Ñ?Ð¼ Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð³Ñ?Ñ?Ñ? Ð·Ð°Ð³Ð°Ð´."
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "Ð£Ð¿Ñ?Ñ?Ð½Ñ?Ñ?ÐµÑ?Ñ?, Ñ?Ñ?Ð¾ \"tracker-store\" Ð¿Ñ?Ð°Ñ?Ñ?Ðµ, Ð¿ÐµÑ?Ñ? Ñ?Ñ?Ð¼ Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð³Ñ?Ñ?Ñ? Ð·Ð°Ð³Ð°Ð´."
 
 #: ../src/libtracker/tracker-search.c:147
 #, c-format
@@ -518,79 +518,79 @@ msgstr "%s: Ð½ÐµÑ?Ñ?Ñ?Ð°Ñ?Ñ?Ð½Ñ?Ñ? Ð°Ñ?Ð³Ñ?Ð¼Ñ?Ð½Ñ?Ñ?"
 msgid "%s: file %s not found"
 msgstr "%s: Ñ?Ð°Ð¹Ð» %s Ð½Ñ? Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ?"
 
-#: ../src/trackerd/trackerd.c:150
+#: ../src/tracker-store/tracker-store.c:150
 msgid "Directory to exclude from indexing"
 msgstr "Ð¢Ñ?Ñ?ÐºÑ?, Ñ?ÐºÑ?Ñ? Ð½Ñ? Ñ?Ñ?Ñ?Ð±Ð° Ñ?Ð½Ð´Ñ?ÐºÑ?Ð°Ð²Ð°Ñ?Ñ?"
 
-#: ../src/trackerd/trackerd.c:150 ../src/trackerd/trackerd.c:151
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:150 ../src/tracker-store/tracker-store.c:151
+#: ../src/tracker-store/tracker-store.c:152
 msgid "/PATH/DIR"
 msgstr "/Ð¨Ð?Ð¯Ð¥/Ð?Ð«Ð ÐÐ?Ð¢Ð?Ð Ð«Ð¯"
 
-#: ../src/trackerd/trackerd.c:151
+#: ../src/tracker-store/tracker-store.c:151
 msgid "Directory to include in indexing"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:152
 msgid "Directory to crawl for indexing at start up only"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:153
+#: ../src/tracker-store/tracker-store.c:153
 msgid "Disable any indexing or watching taking place"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:154
+#: ../src/tracker-store/tracker-store.c:154
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:154 ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:154 ../src/tracker-store/tracker-store.c:155
 msgid "VALUE"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:155
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:156
+#: ../src/tracker-store/tracker-store.c:156
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:157
+#: ../src/tracker-store/tracker-store.c:157
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid "LANG"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:159
+#: ../src/tracker-store/tracker-store.c:159
 msgid "Force a re-index of all content"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:160
 msgid "Make tracker errors fatal"
 msgstr ""
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2434
+#: ../src/tracker-store/tracker-store.c:2434
 msgid "- start the tracker daemon"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:2435 ../src/trackerd/trackerd.c:2436
+#: ../src/tracker-store/tracker-store.c:2435 ../src/tracker-store/tracker-store.c:2436
 msgid "DIRECTORY"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:2443
+#: ../src/tracker-store/tracker-store.c:2443
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -736,7 +736,7 @@ msgstr "Alexander Nyakhaychyk"
 msgid "Tracker Web Site"
 msgstr "Ð¡Ð°Ð¹Ñ? Ð¿Ñ?Ð°Ð³Ñ?Ð°Ð¼Ñ? Tracker"
 
-#: ../src/tracker-applet/tracker-applet.c:1914 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1914 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Ð¢Ñ?Ñ?ÐºÐµÑ?"
 
@@ -1426,6 +1426,6 @@ msgstr ""
 msgid "link to %s"
 msgstr ""
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr ""
diff --git a/po/be latin po b/po/be latin po
index 07114db..d538b76 100644
--- a/po/be latin po
+++ b/po/be latin po
@@ -434,9 +434,9 @@ msgstr "%s: niama spaÅ?uÄ?eÅ?nia z demanam tracker"
 
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
-msgid "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
 msgstr ""
-"UpeÅnisia, Å¡to \"trackerd\" pracuje pierad uruchamleÅ?niem hetaha zahadu."
+"UpeÅnisia, Å¡to \"tracker-store\" pracuje pierad uruchamleÅ?niem hetaha zahadu."
 
 #: ../src/libtracker/tracker-search.c:147
 msgid "Service not recognized, searching in Other Files...\n"
@@ -518,28 +518,28 @@ msgstr "%s: niapravilnyja arhumenty"
 msgid "%s: file %s not found"
 msgstr "%s: fajÅ? %s nia znojdzieny"
 
-#: ../src/trackerd/trackerd.c:150
+#: ../src/tracker-store/tracker-store.c:150
 msgid "Directory to exclude from indexing"
 msgstr "Kataloh, jaki nia treba indeksavaÄ?"
 
-#: ../src/trackerd/trackerd.c:150 ../src/trackerd/trackerd.c:151
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:150 ../src/tracker-store/tracker-store.c:151
+#: ../src/tracker-store/tracker-store.c:152
 msgid "/PATH/DIR"
 msgstr "/Å?CIEÅ½KA/KATALOH"
 
-#: ../src/trackerd/trackerd.c:151
+#: ../src/tracker-store/tracker-store.c:151
 msgid "Directory to include in indexing"
 msgstr "Kataloh, jaki treba indeksavaÄ?"
 
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:152
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Kataloh, jaki treba indeksavaÄ? tolki pry ÅruchamleÅ?ni"
 
-#: ../src/trackerd/trackerd.c:153
+#: ../src/tracker-store/tracker-store.c:153
 msgid "Disable any indexing or watching taking place"
 msgstr "VykluÄ? luboje dziejnaje indeksavaÅ?nie ci naziraÅ?nie"
 
-#: ../src/trackerd/trackerd.c:154
+#: ../src/tracker-store/tracker-store.c:154
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -548,11 +548,11 @@ msgstr ""
 "vartaÅ?ci: 0 (pakazvaje/zapisvaje tolki pamyÅ?ki), 1 (minimalna), 2 "
 "(padrabiazna) i 3 (debugavaÅ?nie)"
 
-#: ../src/trackerd/trackerd.c:154 ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:154 ../src/tracker-store/tracker-store.c:155
 msgid "VALUE"
 msgstr "VARTAÅ?Ä?"
 
-#: ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:155
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
@@ -560,43 +560,43 @@ msgstr ""
 "VartaÅ?Ä? dla strymvaÅ?nia indeksavaÅ?nia. VartaÅ?Ä? musiÄ? byÄ? u mieÅ¾ach 0-99 "
 "(zmoÅÄ?ana 0), mienÅ¡yja vartaÅ?ci pamianÅ¡ajuÄ? chutkaÅ?Ä? indeksavaÅ?nia"
 
-#: ../src/trackerd/trackerd.c:156
+#: ../src/tracker-store/tracker-store.c:156
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimalizuje vykarystaÅ?nie pamiaci, ale moÅ¾a zapavoliÄ? indeksavaÅ?nie"
 
-#: ../src/trackerd/trackerd.c:157
+#: ../src/tracker-store/tracker-store.c:157
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "Inicyjalny Ä?as snu, prosta da indeksavaÅ?nia, u sekundach"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Mova dla Å?pisaÅ karanioÅ i spynnych sÅ?ovaÅ (dvuchznakavy kod ISO 639-1)"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid "LANG"
 msgstr "MOVA"
 
-#: ../src/trackerd/trackerd.c:159
+#: ../src/tracker-store/tracker-store.c:159
 msgid "Force a re-index of all content"
 msgstr "Vymahaj pieraindeksavaÅ?nie Åsiaho ÅºmieÅ?civa"
 
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:160
 msgid "Make tracker errors fatal"
 msgstr "Fatalizuj pamyÅ?ki trackera"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2434
+#: ../src/tracker-store/tracker-store.c:2434
 msgid "- start the tracker daemon"
 msgstr "- uruchom demana tracker"
 
-#: ../src/trackerd/trackerd.c:2435 ../src/trackerd/trackerd.c:2436
+#: ../src/tracker-store/tracker-store.c:2435 ../src/tracker-store/tracker-store.c:2436
 msgid "DIRECTORY"
 msgstr "KATALOH"
 
-#: ../src/trackerd/trackerd.c:2443
+#: ../src/tracker-store/tracker-store.c:2443
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -760,7 +760,7 @@ msgstr "Ihar HraÄ?yÅ¡ka <booxter lacinka org>"
 msgid "Tracker Web Site"
 msgstr "Web-staronka Tracker"
 
-#: ../src/tracker-applet/tracker-applet.c:1914 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1914 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1483,7 +1483,7 @@ msgstr "spasyÅ?ka (zÅ?amanaja)"
 msgid "link to %s"
 msgstr "spasyÅ?ka na %s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "PasÅ?uha poÅ¡uku i indeksavaÅ?nia Trackera"
 
diff --git a/po/ca.po b/po/ca.po
index d85de00..aa9b379 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -434,9 +434,9 @@ msgstr "%s: no hi ha connexiÃ³ amb el dimoni del tracker"
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
 msgstr ""
-"Assegureu-vos que estÃ  funcionant el Â«trackerdÂ» abans d'executar aquesta "
+"Assegureu-vos que estÃ  funcionant el Â«tracker-storeÂ» abans d'executar aquesta "
 "ordre."
 
 #: ../src/libtracker/tracker-search.c:147
@@ -521,29 +521,29 @@ msgstr "%s: arguments no vÃ lids"
 msgid "%s: file %s not found"
 msgstr "%s: no s'ha trobat el fitxer %s"
 
-#: ../src/trackerd/trackerd.c:150
+#: ../src/tracker-store/tracker-store.c:150
 msgid "Directory to exclude from indexing"
 msgstr "Directori a excloure de la indexaciÃ³"
 
-#: ../src/trackerd/trackerd.c:150 ../src/trackerd/trackerd.c:151
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:150 ../src/tracker-store/tracker-store.c:151
+#: ../src/tracker-store/tracker-store.c:152
 msgid "/PATH/DIR"
 msgstr "/CAMÃ/DIRECTORI"
 
-#: ../src/trackerd/trackerd.c:151
+#: ../src/tracker-store/tracker-store.c:151
 msgid "Directory to include in indexing"
 msgstr "Directori a incloure en la indexaciÃ³"
 
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:152
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Directori que s'ha d'indexar nomÃ©s a l'inici"
 
-#: ../src/trackerd/trackerd.c:153
+#: ../src/tracker-store/tracker-store.c:153
 msgid "Disable any indexing or watching taking place"
 msgstr ""
 "Inhabilita qualsevol indexaciÃ³ o visualitzaciÃ³ que s'estigui duent a terme"
 
-#: ../src/trackerd/trackerd.c:154
+#: ../src/tracker-store/tracker-store.c:154
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -551,11 +551,11 @@ msgstr ""
 "Valor que controla el nivell d'enregistrament. Els valors vÃ lids sÃ³n 0 "
 "(nomÃ©s mostra/enregistra errors), 1 (mÃnim) i 2 (detallat) i 3 (depuraciÃ³)"
 
-#: ../src/trackerd/trackerd.c:154 ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:154 ../src/tracker-store/tracker-store.c:155
 msgid "VALUE"
 msgstr "VALOR"
 
-#: ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:155
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
@@ -564,44 +564,44 @@ msgstr ""
 "d'estar entre 0-99 (predeterminat a 0) en quÃ¨ els valors baixos incrementen "
 "la velocitat d'indexaciÃ³"
 
-#: ../src/trackerd/trackerd.c:156
+#: ../src/tracker-store/tracker-store.c:156
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimitza l'Ãºs de memÃ²ria perÃ² pot alentir la indexaciÃ³"
 
-#: ../src/trackerd/trackerd.c:157
+#: ../src/tracker-store/tracker-store.c:157
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "Temps d'espera inicial, abans de comenÃ§ar a indexar, en segons"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Llenguatge a utilitzar per al leximitzador i per a la llista de paraules "
 "buides (codi de 2 carÃ cters de l'ISO 639-1)"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid "LANG"
 msgstr "LLENG"
 
-#: ../src/trackerd/trackerd.c:159
+#: ../src/tracker-store/tracker-store.c:159
 msgid "Force a re-index of all content"
 msgstr "ForÃ§a una reindexaciÃ³ de tots els continguts"
 
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:160
 msgid "Make tracker errors fatal"
 msgstr "Fes que els errors del Tracker siguin fatals"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2424
+#: ../src/tracker-store/tracker-store.c:2424
 msgid "- start the tracker daemon"
 msgstr "- inicia el dimoni del tracker"
 
-#: ../src/trackerd/trackerd.c:2425 ../src/trackerd/trackerd.c:2426
+#: ../src/tracker-store/tracker-store.c:2425 ../src/tracker-store/tracker-store.c:2426
 msgid "DIRECTORY"
 msgstr "DIRECTORI"
 
-#: ../src/trackerd/trackerd.c:2433
+#: ../src/tracker-store/tracker-store.c:2433
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -762,7 +762,7 @@ msgstr "Gil Forcada <gilforcada guifi net>"
 msgid "Tracker Web Site"
 msgstr "Lloc web del Tracker"
 
-#: ../src/tracker-applet/tracker-applet.c:1912 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1912 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1486,7 +1486,7 @@ msgstr "enllaÃ§ (trencat)"
 msgid "link to %s"
 msgstr "enllaÃ§ a %s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Servei de cerca i d'indexaciÃ³ Tracker"
 
diff --git a/po/cs.po b/po/cs.po
index a451c3b..1cab0c0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -434,8 +434,8 @@ msgstr "%s: Å¾Ã¡dnÃ© spojenÃ s dÃ©monem trackeru"
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "PÅ?ed spuÅ¡tÄ?nÃm tohoto pÅ?Ãkazu se ujistÄ?te, Å¾e \"trackerd\" bÄ?Å¾Ã."
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "PÅ?ed spuÅ¡tÄ?nÃm tohoto pÅ?Ãkazu se ujistÄ?te, Å¾e \"tracker-store\" bÄ?Å¾Ã."
 
 #: ../src/libtracker/tracker-search.c:147
 #, c-format
@@ -519,28 +519,28 @@ msgstr "%s: neplatnÃ© parametry"
 msgid "%s: file %s not found"
 msgstr "%s: soubor %s nenalezen"
 
-#: ../src/trackerd/trackerd.c:127
+#: ../src/tracker-store/tracker-store.c:127
 msgid "Directory to exclude from indexing"
 msgstr "SloÅ¾ka, kterou vyjmout z indexovÃ¡nÃ"
 
-#: ../src/trackerd/trackerd.c:127 ../src/trackerd/trackerd.c:128
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:127 ../src/tracker-store/tracker-store.c:128
+#: ../src/tracker-store/tracker-store.c:129
 msgid "/PATH/DIR"
 msgstr "/CESTA/ADRESÃ?Å?"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid "Directory to include in indexing"
 msgstr "SloÅ¾ka, kterou zahrnout do indexovÃ¡nÃ"
 
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:129
 msgid "Directory to crawl for indexing at start up only"
 msgstr "SloÅ¾ka, kterou prochÃ¡zet pouze pÅ?i spuÅ¡tÄ?nÃ"
 
-#: ../src/trackerd/trackerd.c:130
+#: ../src/tracker-store/tracker-store.c:130
 msgid "Disable any indexing or watching taking place"
 msgstr "ZakÃ¡zat jakÃ©koliv probÃhajÃcÃ indexovÃ¡nÃ nebo sledovÃ¡nÃ"
 
-#: ../src/trackerd/trackerd.c:131
+#: ../src/tracker-store/tracker-store.c:131
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -548,11 +548,11 @@ msgstr ""
 "Hodnota, kterÃ¡ ovlÃ¡dÃ¡ ÃºroveÅ? protokolovÃ¡nÃ. PlatnÃ© hodnoty jsou 0 (zobrazit/"
 "zaznamenÃ¡vat pouze chyby), 1 (minimÃ¡lnÃ), 2 (podrobnÃ©) a 3 (ladÄ?nÃ)"
 
-#: ../src/trackerd/trackerd.c:131 ../src/trackerd/trackerd.c:132
+#: ../src/tracker-store/tracker-store.c:131 ../src/tracker-store/tracker-store.c:132
 msgid "VALUE"
 msgstr "HODNOTA"
 
-#: ../src/trackerd/trackerd.c:132
+#: ../src/tracker-store/tracker-store.c:132
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
@@ -560,44 +560,44 @@ msgstr ""
 "Hodnota pro zpomalovÃ¡nÃ indexovÃ¡nÃ. Hodnota musÃ bÃ½t v rozsahu 0-99 (vÃ½chozÃ "
 "0) s tÃm, Å¾e niÅ¾Å¡Ã hodnoty zvyÅ¡ujÃ rychlost indexace"
 
-#: ../src/trackerd/trackerd.c:133
+#: ../src/tracker-store/tracker-store.c:133
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "SnÃÅ¾Ã vyuÅ¾itÃ pamÄ?ti, ale mÅ¯Å¾e zpomalit indexovÃ¡nÃ"
 
-#: ../src/trackerd/trackerd.c:134
+#: ../src/tracker-store/tracker-store.c:134
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "VÃ½chozÃ pauza, pÅ?ed spuÅ¡tÄ?nÃm indexovÃ¡nÃ, v sekundÃ¡ch"
 
-#: ../src/trackerd/trackerd.c:135
+#: ../src/tracker-store/tracker-store.c:135
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Jazyk, kterÃ½ pouÅ¾Ãvat pro zjiÅ¡Å¥ovÃ¡nÃ slovnÃch koÅ?enÅ¯ a seznamu stopslov "
 "(dvouznakovÃ½ kÃ³d ISO 639-1)"
 
-#: ../src/trackerd/trackerd.c:135
+#: ../src/tracker-store/tracker-store.c:135
 msgid "LANG"
 msgstr "JAZYK"
 
-#: ../src/trackerd/trackerd.c:136
+#: ../src/tracker-store/tracker-store.c:136
 msgid "Force a re-index of all content"
 msgstr "Vynutit pÅ?eindexovÃ¡nÃ vÅ¡eho obsahu"
 
-#: ../src/trackerd/trackerd.c:137
+#: ../src/tracker-store/tracker-store.c:137
 msgid "Make tracker errors fatal"
 msgstr "OznaÄ?it chyby trackeru jako fatÃ¡lnÃ"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:794
+#: ../src/tracker-store/tracker-store.c:794
 msgid "- start the tracker daemon"
 msgstr "- spustit dÃ©mona trackeru"
 
-#: ../src/trackerd/trackerd.c:795 ../src/trackerd/trackerd.c:796
+#: ../src/tracker-store/tracker-store.c:795 ../src/tracker-store/tracker-store.c:796
 msgid "DIRECTORY"
 msgstr "ADRESÃ?Å?"
 
-#: ../src/trackerd/trackerd.c:803
+#: ../src/tracker-store/tracker-store.c:803
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -755,7 +755,7 @@ msgstr "_O programu"
 msgid "_Quit"
 msgstr "_UkonÄ?it"
 
-#: ../src/tracker-applet/tracker-applet.c:1997 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1997 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1478,6 +1478,6 @@ msgstr "odkaz (neplatnÃ½)"
 msgid "link to %s"
 msgstr "odkaz na %s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "ProhledÃ¡vacÃ a indexovacÃ sluÅ¾ba Tracker"
diff --git a/po/da.po b/po/da.po
index d68d057..ef44362 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2226
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Tracker sÃ¸ge- og indekseringstjeneste"
 
@@ -753,12 +753,12 @@ msgid "Control and monitor the Tracker search and indexing service"
 msgstr "KontrollÃ©r og overvÃ¥g Tracker sÃ¸ge- og indekseringstjeneste"
 
 #: ../src/tracker-extract/tracker-main.c:77
-#: ../src/tracker-indexer/tracker-main.c:79 ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-indexer/tracker-main.c:79 ../src/tracker-store/tracker-main.c:136
 msgid "Displays version information"
 msgstr "Viser versionsoplysninger"
 
 #: ../src/tracker-extract/tracker-main.c:81
-#: ../src/tracker-indexer/tracker-main.c:83 ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-indexer/tracker-main.c:83 ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1961,17 +1961,17 @@ msgstr "PÃ¥krÃ¦vede felter"
 msgid "Fields are missing"
 msgstr "Felter mangler"
 
-#: ../src/trackerd/tracker-main.c:145
+#: ../src/tracker-store/tracker-main.c:145
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 "Sekunders ventetid fÃ¸r pÃ¥begyndelse af gennemsÃ¸gning og indeksering "
 "(standard = 45)"
 
-#: ../src/trackerd/tracker-main.c:149
+#: ../src/tracker-store/tracker-main.c:149
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimerer forbrug af hukommelse, men kan gÃ¸re indeksering langsommere"
 
-#: ../src/trackerd/tracker-main.c:153
+#: ../src/tracker-store/tracker-main.c:153
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
@@ -1979,7 +1979,7 @@ msgstr ""
 "Mapper som skal udelukkes fra overvÃ¥gning af filÃ¦ndringer (du kan anvende -e "
 "<sti> -e <sti>)"
 
-#: ../src/trackerd/tracker-main.c:157
+#: ../src/tracker-store/tracker-main.c:157
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
@@ -1987,28 +1987,28 @@ msgstr ""
 "Mapper som skal inkluderes i overvÃ¥gning af filÃ¦ndringer (du kan anvende -e "
 "<sti> -e <sti>)"
 
-#: ../src/trackerd/tracker-main.c:161
+#: ../src/tracker-store/tracker-main.c:161
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 "Mapper at gennemsÃ¸ge for at indeksere filer (du kan anvende -c <sti> -c "
 "<sti>)"
 
-#: ../src/trackerd/tracker-main.c:165
+#: ../src/tracker-store/tracker-main.c:165
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 "DeaktivÃ©r moduler fra at blive behandlet (du kan anvende -d <modul> -d "
 "<modul>)"
 
-#: ../src/trackerd/tracker-main.c:171
+#: ../src/tracker-store/tracker-main.c:171
 msgid "Force a re-index of all content"
 msgstr "Gennemtving en genindeksering af alt indhold"
 
-#: ../src/trackerd/tracker-main.c:175
+#: ../src/tracker-store/tracker-main.c:175
 msgid "Disable any indexing and monitoring"
 msgstr "DeaktivÃ©r enhver indeksering og overvÃ¥gning"
 
-#: ../src/trackerd/tracker-main.c:178
+#: ../src/tracker-store/tracker-main.c:178
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -2018,7 +2018,7 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:896
+#: ../src/tracker-store/tracker-main.c:896
 msgid "- start the tracker daemon"
 msgstr "- start tracker-dÃ¦mon"
 
diff --git a/po/de.po b/po/de.po
index 3d44810..f32dcd3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,12 +24,12 @@ msgstr ""
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2327
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Tracker Such- und Indizierungsdienst"
 
@@ -766,12 +766,12 @@ msgid "Control and monitor the Tracker search and indexing service"
 msgstr "Statusanzeige fÃ¼r Tracker Such- und Indizierungsdienst"
 
 #: ../src/tracker-extract/tracker-main.c:82
-#: ../src/tracker-indexer/tracker-main.c:84 ../src/trackerd/tracker-main.c:137
+#: ../src/tracker-indexer/tracker-main.c:84 ../src/tracker-store/tracker-main.c:137
 msgid "Displays version information"
 msgstr "Versionsinformationen anzeigen"
 
 #: ../src/tracker-extract/tracker-main.c:86
-#: ../src/tracker-indexer/tracker-main.c:88 ../src/trackerd/tracker-main.c:141
+#: ../src/tracker-indexer/tracker-main.c:88 ../src/tracker-store/tracker-main.c:141
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1834,17 +1834,17 @@ msgstr ""
 "ACHTUNG: Limit wurde erreicht. Die Datenbank enthÃ¤lt weitere hier nicht "
 "aufgelistete EintrÃ¤ge"
 
-#: ../src/trackerd/tracker-main.c:146
+#: ../src/tracker-store/tracker-main.c:146
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 "Wartezeit in Sekunden vor dem Beginn der Durchsuchung oder Indizierung "
 "(Vorgabe = 45)"
 
-#: ../src/trackerd/tracker-main.c:150
+#: ../src/tracker-store/tracker-main.c:150
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimiert den Speicherverbrauch auf Kosten der Geschwindigkeit"
 
-#: ../src/trackerd/tracker-main.c:154
+#: ../src/tracker-store/tracker-main.c:154
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
@@ -1852,7 +1852,7 @@ msgstr ""
 "Von der Ã?berwachung der DateiÃ¤nderungen auszuschlieÃ?ende Ordner (-e <Pfad> -e "
 "<Pfad>)"
 
-#: ../src/trackerd/tracker-main.c:158
+#: ../src/tracker-store/tracker-main.c:158
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
@@ -1860,24 +1860,24 @@ msgstr ""
 "In die Ã?berwachung der DateiÃ¤nderungen einzuschlieÃ?ende Ordner (-i <Pfad> -i "
 "<Pfad>)"
 
-#: ../src/trackerd/tracker-main.c:162
+#: ../src/tracker-store/tracker-main.c:162
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr "Ordner fÃ¼r die Suche nach Indexdateien (-c <Pfad> c <Pfad>)"
 
-#: ../src/trackerd/tracker-main.c:166
+#: ../src/tracker-store/tracker-main.c:166
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr "Module von der AusfÃ¼hrung ausschlieÃ?en (z.B. mit -d <Modul> -d <Modul>)"
 
-#: ../src/trackerd/tracker-main.c:172
+#: ../src/tracker-store/tracker-main.c:172
 msgid "Force a re-index of all content"
 msgstr "Erzwingt eine Neuindizierung aller Inhalte"
 
-#: ../src/trackerd/tracker-main.c:176
+#: ../src/tracker-store/tracker-main.c:176
 msgid "Disable any indexing and monitoring"
 msgstr "Jegliche Indizierung und DateiÃ¼berwachung deaktivieren"
 
-#: ../src/trackerd/tracker-main.c:179
+#: ../src/tracker-store/tracker-main.c:179
 msgid "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
 "Sprache, die fÃ¼r den Wortstamm und die Stopwortliste verwendet wird (ISO 639-"
@@ -1886,7 +1886,7 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:856
+#: ../src/tracker-store/tracker-main.c:856
 msgid "- start the tracker daemon"
 msgstr "- startet den Tracker-Dienst"
 
@@ -1909,9 +1909,9 @@ msgstr "- startet den Tracker-Dienst"
 #~ msgid "%s: no connection to tracker daemon"
 #~ msgstr "%s: Verbindung zu Tracker konnte nicht hergestellt werden"
 
-#~ msgid "Ensure \"trackerd\" is running before launch this command."
+#~ msgid "Ensure \"tracker-store\" is running before launch this command."
 #~ msgstr ""
-#~ "Stellen Sie sicher, dass Â»trackerdÂ« lÃ¤uft bevor Sie diese Anwendung starten."
+#~ "Stellen Sie sicher, dass Â»tracker-storeÂ« lÃ¤uft bevor Sie diese Anwendung starten."
 
 #~ msgid "Service not recognized, searching in Other Files...\n"
 #~ msgstr ""
diff --git a/po/dz.po b/po/dz.po
index 19ff606..289ca51 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -19,11 +19,11 @@ msgstr ""
 "X-Poedit-Country: Bhutan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../trackerd.desktop.in.in.h:1
+#: ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr ""
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr ""
 
@@ -291,9 +291,9 @@ msgstr "%s: à½?à½ºà¼?à½?à½¢à¼?à½?à½ºà¼?à½?à½±à½¼à½?à¼?à½£à½´à¼?à½?à½?à½´à½?à¼?
 
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
-msgid "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
 msgstr ""
-"\"trackerd\"à½ à½?à½²à¼?  à½?à½¢à¾¡à¼?à½?à½?à½¼à½?à¼?à½?à½?à½²à¼?à½?à½?à½´à½?à½¦à¼?à½?à¼?à½ à½?à½?à¼?à½?à½ à½²à¼?à½§à½ºà¼?à½?à½¢à¼?à½?à½¡à½¼à½?à¼?à½?à½?à½¼à½£à¼?à½?à½¼à¼?à½¡à½¼à½?à½?à¼?à½¦à¾¦à½ºà¼?à½?à½ºà½¦à¼?à½?à½?à½?à¼?à½?à½?à½¼à¼?"
+"\"tracker-store\"à½ à½?à½²à¼?  à½?à½¢à¾¡à¼?à½?à½?à½¼à½?à¼?à½?à½?à½²à¼?à½?à½?à½´à½?à½¦à¼?à½?à¼?à½ à½?à½?à¼?à½?à½ à½²à¼?à½§à½ºà¼?à½?à½¢à¼?à½?à½¡à½¼à½?à¼?à½?à½?à½¼à½£à¼?à½?à½¼à¼?à½¡à½¼à½?à½?à¼?à½¦à¾¦à½ºà¼?à½?à½ºà½¦à¼?à½?à½?à½?à¼?à½?à½?à½¼à¼?"
 
 #: ../src/libtracker/tracker-search.c:147
 msgid "Service not recognized, searching in Other Files...\n"
@@ -374,29 +374,29 @@ msgstr "%s: à½?à½´à½¦à¼?à½?à½ºà½?à¼?à½¦à¾?à¾²à½´à½?à¼?à½¢à¾?à½?à½¦à¼?à½?à½´à¼?"
 msgid "%s: file %s not found"
 msgstr "%s: à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? %s à½?à¼?à½?à½¼à½?à¼?"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid "Directory to exclude from indexing"
 msgstr "à½?à½´à½¢à¼?à½?à½¼à¼?à½?à½?à¼?à½?à½?à½¼à½?à¼?à½?à½²à¼?à½£à½¦à¼?à½?à¾±à½²à½¢à¼?à½?à½¼à½?à¼?à½?à½²à½ à½²à¼?à½¦à¾£à½¼à½?à¼?à½?à½¼à¼?"
 
-#: ../src/trackerd/trackerd.c:158 ../src/trackerd/trackerd.c:159
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:158 ../src/tracker-store/tracker-store.c:159
+#: ../src/tracker-store/tracker-store.c:160
 msgid "/PATH/DIR"
 msgstr "/PATH/DIR"
 
-#: ../src/trackerd/trackerd.c:159
+#: ../src/tracker-store/tracker-store.c:159
 msgid "Directory to include in indexing"
 msgstr "à½?à½´à½¢à¼?à½?à½¼à¼?à½?à½?à¼?à½?à½?à½¼à½?à¼?à½?à½²à¼?à½£à½¦à¼?à½?à¾²à½?à½¦à¼?à½¦à½´à¼?à½?à½¢à¾©à½²à¼?à½?à½²à¼?à½£à½´à¼?à½¦à¾£à½¼à½?à¼?à½?à½¼à¼?"
 
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:160
 #, fuzzy
 msgid "Directory to crawl for indexing at start up only"
 msgstr "à½?à½´à½¢à¼?à½?à½¼à¼?à½?à½?à¼?à½?à½?à½¼à½?à¼?à½?à½²à¼?à½£à½¦à¼?à½?à¾±à½²à½¢à¼?à½?à½¼à½?à¼?à½?à½²à½ à½²à¼?à½¦à¾£à½¼à½?à¼?à½?à½¼à¼?"
 
-#: ../src/trackerd/trackerd.c:161
+#: ../src/tracker-store/tracker-store.c:161
 msgid "Disable any indexing or watching taking place"
 msgstr "à½?à½´à½¢à¼?à½?à½¼à¼?à½?à½?à¼?à½?à½?à½¼à½?à¼?à½?à½²à¼?à½¡à½?à¼?à½?à¼?à½?à½?à½¦à¼?à½¦à½¼à½¢à¼?à½?à½?à¼?à½¢à½´à½?à¼?à½£à¾?à½¼à½?à½¦à¼?à½?à½ºà½?à¼?à½?à½?à½¼à¼?"
 
-#: ../src/trackerd/trackerd.c:162
+#: ../src/tracker-store/tracker-store.c:162
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -404,11 +404,11 @@ msgstr ""
 "à½?à¾²à½?à¼?à½?à½ºà½?à¼?à½?à½?à½¼à½?à¼?à½?à½²à½ à½²à¼?à½?à½?à½¦à¼?à½¢à½²à½?à¼?à½ à½?à½²à¼?à½?à½²à¼?à½?à½?à¼?à½ à½?à½²à½?à¼?à½?à½?à½¦à¼?à½?à½¼à½?à¼?à¼? à½?à½´à½¦à¼?à½?à½?à¼?à½?à½?à½¦à¼?à½?à½¼à½?à¼?à½?à½´à¼?   à¼  (à½?à½?à¾²à½?à¼?à½¦à¾?à½?à¼?à½?à½´à¼?/à½?à¾²à½?à¼?"
 "à½?à½ºà½?à¼?à½?à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?à½¢à¾?à¾±à½?à½?à¼?à½?à½²à½?à¼?), à¼¡ (à½?à½´à½?à¼?à½¤à½¼à½¦à¼?) ,à¼¢ (à½¢à¾?à¾±à½¦à¼?à½?à½¤à½?à¼?) à½?à½?à¼?  à¼£(à½¢à¾?à¾±à½ºà½?à¼?à½¦à½ºà½£à¼?)à½¨à½²à½?à¼?"
 
-#: ../src/trackerd/trackerd.c:162 ../src/trackerd/trackerd.c:163
+#: ../src/tracker-store/tracker-store.c:162 ../src/tracker-store/tracker-store.c:163
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../src/trackerd/trackerd.c:163
+#: ../src/tracker-store/tracker-store.c:163
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-20 (default "
 "0) with lower values increasing indexing speed"
@@ -416,41 +416,41 @@ msgstr ""
 "à½?à½´à½¢à¼?à½?à½¼à¼?à½?à½?à¼?à½?à½?à½¼à½?à¼?à½?à½²à½ à½²à¼?à½¢à¾?à¾±à½´à½?à¼?à½£à½?à¼?à½?à¾±à½²à¼?à½?à½¼à½?à¼?à½£à½´à¼?à½£à½?à¼?à½£à½ºà½?à¼?à½ à½?à½?à¼?à½?à½²à¼?à½¨à½²à½?à¼?à½?à½ à½²à¼?à½?à½?à½¦à¼?à½?à½¼à½?à¼?à¼?  à½?à½?à½¦à¼?à½?à½¼à½?à¼?à½ à½?à½²à¼?à½?à¾±à½?à¼?à½?à½?à¼?0-20 "
 "(à½¦à¾?à½¼à½?à¼?à½¦à¾?à¾²à½²à½?à¼?0)à½?à½?à¼?  à½?à½´à½¢à¼?à½?à½¼à½ à½²à¼?à½?à½?à¾±à½¼à½?à½¦à¼?à½?à½?à¼?à½¡à½¢à¼?à½ à½?à½¢à¼?à½?à½?à½¦à¼?à½?à½¼à½?à¼?à½?à½?à½ à¼?à½?à½²à¼?à½?à½?à¼?à½?à½²à½?à¼?à½?à½¢à¼?à½?à½?à½¼à½?à¼?à½¨à½²à½?à¼?"
 
-#: ../src/trackerd/trackerd.c:164
+#: ../src/tracker-store/tracker-store.c:164
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr ""
 "à½?à¾²à½?à¼?à½?à½?à¼?à½?à¾±à½²à¼?à½£à½?à¼?à½£à½ºà½?à¼?à½ à½?à½²à¼?à½?à½?à¼?à½£à½ºà½?à¼?à½ à½?à½?à½?à¼?à½¨à½²à½?à¼?  à½?à½ºà¼?à½ à½?à½?à½?à¼?à½?à¼? à½?à½´à½¢à¼?à½?à½¼à¼?à½?à½?à¼?à½?à½?à½¼à½?à¼?à½?à½²à¼?à½¡à½?à¼?à½?à½¢à¼?à½?à½?à¼?à½ à½?à½?à¼?à½ à½¼à½?à¼?"
 
-#: ../src/trackerd/trackerd.c:165
+#: ../src/tracker-store/tracker-store.c:165
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:166
+#: ../src/tracker-store/tracker-store.c:166
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "à½¦à½²à¼?à½?à½²à¼?à½?à½¢à¼?à½?à½?à¼?à½?à½²à½?à¼?à½?à½²à½?à¼?à½?à½¼à¼?à½¡à½²à½?à¼?(ISO 639-1 2 characters code)à½?à½?à½?à¼?à½?à½²à½ à½²à¼?à½?à½¼à½?à¼?à½£à½´à¼?  à½£à½?à¼?à½£à½ºà½?à¼?à½ à½?à½?à¼?à½?à½²à¼?"
 "à½£à½´à¼?à½¦à¾?à½?à¼?à½¡à½²à½?à¼?"
 
-#: ../src/trackerd/trackerd.c:166
+#: ../src/tracker-store/tracker-store.c:166
 msgid "LANG"
 msgstr "LANG"
 
-#: ../src/trackerd/trackerd.c:167
+#: ../src/tracker-store/tracker-store.c:167
 msgid "Force a re-index of all content"
 msgstr "à½?à½?à¼?à½?à½¼à½?à¼?à½?à¼?à½?à½?à½?à¼?à½?à¾±à½²à¼?à½?à½´à½¢à¼?à½?à½¼à¼? à½¦à¾³à½¢à¼?à½?à½?à½¼à½?à¼?à½?à½²à¼?à½£à½´à¼?à½?à½?à¼?à½?à½?à½¼à½?à¼?à½ à½?à½?à¼?"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2047
+#: ../src/tracker-store/tracker-store.c:2047
 msgid "- start the tracker daemon"
 msgstr "- à½?à½ºà¼?à½?à½¢à¼?à½?à½ºà¼?à½?à½±à½¼à½?à¼?à½ à½?à½²à¼?à½ à½?à½¼à¼?à½?à½?à½´à½?à½¦à¼?"
 
-#: ../src/trackerd/trackerd.c:2048 ../src/trackerd/trackerd.c:2049
+#: ../src/tracker-store/tracker-store.c:2048 ../src/tracker-store/tracker-store.c:2049
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#: ../src/trackerd/trackerd.c:2056
+#: ../src/tracker-store/tracker-store.c:2056
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
diff --git a/po/el.po b/po/el.po
index a9ec565..619b94c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -444,9 +444,9 @@ msgstr "%s: Î´ÎµÎ½ Ï?Ï?Î¬Ï?Ï?ÎµÎ¹ Ï?Ï?Î½Î´ÎµÏ?Î· Ï?Ï?Î·Î½ Ï?Ï?Î·Ï?ÎµÏ?Î¯Î± ÎµÏ?
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
 msgstr ""
-"Î?ÎµÎ²Î±Î¹Ï?Î¸ÎµÎ¯Ï?Îµ Ï?Ï?Î¹ Î· Ï?Ï?Î·Ï?ÎµÏ?Î¯Î± \"trackerd\" ÎµÎºÏ?ÎµÎ»ÎµÎ¯Ï?Î±Î¹ Ï?Ï?Î¿Ï?Î¿Ï? ÎµÎºÏ?ÎµÎ»ÎÏ?ÎµÏ?Îµ Î±Ï?Ï?Î®Î½ "
+"Î?ÎµÎ²Î±Î¹Ï?Î¸ÎµÎ¯Ï?Îµ Ï?Ï?Î¹ Î· Ï?Ï?Î·Ï?ÎµÏ?Î¯Î± \"tracker-store\" ÎµÎºÏ?ÎµÎ»ÎµÎ¯Ï?Î±Î¹ Ï?Ï?Î¿Ï?Î¿Ï? ÎµÎºÏ?ÎµÎ»ÎÏ?ÎµÏ?Îµ Î±Ï?Ï?Î®Î½ "
 "Ï?Î·Î½ ÎµÎ½Ï?Î¿Î»Î®."
 
 #: ../src/libtracker/tracker-search.c:147
@@ -532,29 +532,29 @@ msgstr "%s: Î¼Î· ÎÎ³ÎºÏ?Ï?Î¿Î¹ Ï?Î±Ï?Î¬Î¼ÎµÏ?Ï?Î¿Î¹"
 msgid "%s: file %s not found"
 msgstr "%s: Î´Îµ Î²Ï?ÎÎ¸Î·ÎºÎµ Ï?Î¿ Î±Ï?Ï?ÎµÎ¯Î¿ %s"
 
-#: ../src/trackerd/trackerd.c:127
+#: ../src/tracker-store/tracker-store.c:127
 msgid "Directory to exclude from indexing"
 msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï? Ï?Î¿Ï? Î¸Î± Ï?Î±Ï?Î±Î»Î·Ï?Î¸ÎµÎ¯ Î±Ï?Ï? Ï?Î·Î½ ÎµÏ?Ï?ÎµÏ?Î·Ï?Î¯Î±Ï?Î·"
 
-#: ../src/trackerd/trackerd.c:127 ../src/trackerd/trackerd.c:128
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:127 ../src/tracker-store/tracker-store.c:128
+#: ../src/tracker-store/tracker-store.c:129
 msgid "/PATH/DIR"
 msgstr "/Î?Î?Î?Î?Î Î?Î¤Î?/Î?Î?Î¤Î?Î?Î?Î?Î?Î£"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid "Directory to include in indexing"
 msgstr "Î?Î±Ï?Î¬Î»Î¿Î³Î¿Ï? Ï?Î¿Ï? Î¸Î± Ï?Î±Ï?Î±Î»Î·Î¸Ï?ÎµÎ¯ Î±Ï?Ï? Ï?Î·Î½ ÎµÏ?Ï?ÎµÏ?Î·Ï?Î¯Î±Ï?Î·"
 
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:129
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Î?Î±Ï?Î¬Î»Î¿Î³Î¿Ï? Î³Î¹Î± ÎµÏ?Ï?ÎµÏ?Î·Ï?Î¯Î±Ï?Î· Î¼Ï?Î½Î¿ ÎºÎ±Ï?Î¬ Ï?Î·Î½ ÎµÎºÎºÎ¯Î½Î·Ï?Î·"
 
-#: ../src/trackerd/trackerd.c:130
+#: ../src/tracker-store/tracker-store.c:130
 msgid "Disable any indexing or watching taking place"
 msgstr ""
 "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· ÎµÏ?Ï?ÎµÏ?Î·Ï?Î¯Î±Ï?Î·Ï? Î® Ï?Ï?Î½ Ï?Î±Ï?Î±ÎºÎ¿Î»Î¿Ï?Î¸Î®Ï?ÎµÏ?Î½ Ï?Î¿Ï? Ï?Ï?Î±Î³Î¼Î±Ï?Î¿Ï?Î¿Î¹Î¿Ï?Î½Ï?Î±Î¹"
 
-#: ../src/trackerd/trackerd.c:131
+#: ../src/tracker-store/tracker-store.c:131
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -563,11 +563,11 @@ msgstr ""
 "(ÎµÎ¼Ï?Î±Î½Î¯Î¶ÎµÎ¹/ÎºÎ±Ï?Î±Î³Ï?Î¬Ï?ÎµÎ¹ Î¼Ï?Î½Î¿ Ï?Ï?Î¬Î»Î¼Î±Ï?Î±), Ï?Î¿ 1 (ÎµÎ»Î¬Ï?Î¹Ï?Ï?Î·), Ï?Î¿ 2 (Î»ÎµÏ?Ï?Î¿Î¼ÎµÏ?ÎµÎ¹Î±ÎºÎ®) "
 "ÎºÎ±Î¹, Ï?Î¿ 3 (Î±Ï?Î¿Ï?Ï?Î±Î»Î¼Î¬Ï?Ï?Ï?Î·)"
 
-#: ../src/trackerd/trackerd.c:131 ../src/trackerd/trackerd.c:132
+#: ../src/tracker-store/tracker-store.c:131 ../src/tracker-store/tracker-store.c:132
 msgid "VALUE"
 msgstr "Î¤Î?Î?Î?"
 
-#: ../src/trackerd/trackerd.c:132
+#: ../src/tracker-store/tracker-store.c:132
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
@@ -576,49 +576,49 @@ msgstr ""
 "ÎÏ?ÎµÎ¹ ÎµÏ?Ï?Î¿Ï? 0-99 (Ï?Ï?Î¿ÎµÏ?Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿ Ï?Î¿ 0) Î¼Îµ Ï?Î±Î¼Î·Î»Ï?Ï?ÎµÏ?ÎµÏ? Ï?Î¹Î¼ÎÏ? Ï?Ï?Î±Î½ Î±Ï?Î¾Î¬Î½ÎµÏ?Î±Î¹ Î· "
 "Ï?Î±Ï?Ï?Ï?Î·Ï?Î± ÎµÏ?Ï?ÎµÏ?Î·Ï?"
 
-#: ../src/trackerd/trackerd.c:133
+#: ../src/tracker-store/tracker-store.c:133
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr ""
 "Î?Î»Î±Ï?Î¹Ï?Ï?Î¿Ï?Î¿Î¹ÎµÎ¯ Ï?Î· Ï?Ï?Î®Ï?Î· Ï?Î·Ï? Î¼Î½Î®Î¼Î·Ï? Î±Î»Î»Î¬ Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± ÎºÎ±Î¸Ï?Ï?Ï?ÎµÏ?Î®Ï?ÎµÎ¹ Ï?Î· Î´Î¹Î±Î´Î¹ÎºÎ±Ï?Î¯Î± "
 "Ï?Î·Ï? ÎµÏ?Ï?ÎµÏ?Î·Ï?Î¯Î±Ï?Î·Ï?"
 
-#: ../src/trackerd/trackerd.c:134
+#: ../src/tracker-store/tracker-store.c:134
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr ""
 "Î?Ï?Ï?Î¹ÎºÏ?Ï? Ï?Ï?Ï?Î½Î¿Ï? Î±Î´Ï?Î±Î½Î¿Ï?Î¿Î¯Î·Ï?Î·Ï?, Î¼Ï?Î»Î¹Ï? Ï?Ï?Î¹Î½ Ï?Î·Î½ ÎµÏ?Ï?ÎµÏ?Î·Ï?Î¯Î±Ï?Î·, Ï?Îµ Î´ÎµÏ?Ï?ÎµÏ?Ï?Î»ÎµÏ?Ï?Î±"
 
-#: ../src/trackerd/trackerd.c:135
+#: ../src/tracker-store/tracker-store.c:135
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Î? Î³Î»Ï?Ï?Ï?Î± Ï?Î¿Ï? Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Î±Î¹ Î³Î¹Î± Ï?Î¿Î½ ÎµÎ¾Î±Î³Ï?Î³ÎÎ± Ï?Ï?Î¿Î¸ÎµÎ¼Î¬Ï?Ï?Î½ Î»ÎÎ¾ÎµÏ?Î½ ÎºÎ±Î¹ Ï?Î· Î»Î¯Ï?Ï?Î± "
 "Î´Î¹Î±ÎºÎ¿Ï?Î®Ï? Î»ÎÎ¾ÎµÏ?Î½ (Î¼Îµ ÎºÏ?Î´Î¹ÎºÎ¿Ï?Î¿Î¯Î·Ï?Î· Ï?Î±Ï?Î±ÎºÏ?Î®Ï?Ï?Î½ ISO 639-1 2)"
 
-#: ../src/trackerd/trackerd.c:135
+#: ../src/tracker-store/tracker-store.c:135
 msgid "LANG"
 msgstr "Î?Î?Î©Î£Î£Î?"
 
-#: ../src/trackerd/trackerd.c:136
+#: ../src/tracker-store/tracker-store.c:136
 msgid "Force a re-index of all content"
 msgstr "Î?Î¾Î±Î½Î±Î³ÎºÎ±Ï?Î¼Ï?Ï? Î³Î¹Î± ÎµÏ?Ï?ÎµÏ?Î·Ï?Î¯Î±Ï?Î· Î¾Î±Î½Î¬ Ï?Î»Î¿Ï? Ï?Î¿Ï? Ï?ÎµÏ?Î¹ÎµÏ?Î¿Î¼ÎÎ½Î¿Ï?"
 
 # #-#-#-#-#  libbonoboui.HEAD.el.po (el)  #-#-#-#-#
 #
-#: ../src/trackerd/trackerd.c:137
+#: ../src/tracker-store/tracker-store.c:137
 msgid "Make tracker errors fatal"
 msgstr "Î?Î± Î³Î¯Î½Î¿Ï?Î½ ÎºÏ?Î¯Ï?Î¹Î¼Î± Ï?Î»Î± Ï?Î± Ï?Ï?Î¬Î»Î¼Î±Ï?Î± ÎµÏ?Ï?ÎµÏ?Î·Ï?Î¯Î±Ï?Î·Ï?"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:794
+#: ../src/tracker-store/tracker-store.c:794
 msgid "- start the tracker daemon"
 msgstr "- ÎµÎºÎºÎ¯Î½Î·Ï?Î· Ï?Î·Ï? Ï?Ï?Î·Ï?ÎµÏ?Î¯Î±Ï? ÎµÏ?Ï?ÎµÏ?Î·Ï?"
 
-#: ../src/trackerd/trackerd.c:795 ../src/trackerd/trackerd.c:796
+#: ../src/tracker-store/tracker-store.c:795 ../src/tracker-store/tracker-store.c:796
 msgid "DIRECTORY"
 msgstr "Î?Î?Î¤Î?Î?Î?Î?Î?Î£"
 
-#: ../src/trackerd/trackerd.c:803
+#: ../src/tracker-store/tracker-store.c:803
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -961,7 +961,7 @@ msgstr "_Î ÎµÏ?Î¯"
 msgid "_Quit"
 msgstr "Î?_Î¾Î¿Î´Î¿Ï?"
 
-#: ../src/tracker-applet/tracker-applet.c:1997 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1997 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Î?Ï?Ï?ÎµÏ?Î· (Tracker)"
 
@@ -1929,6 +1929,6 @@ msgstr "Ï?Ï?Î½Î´ÎµÏ?Î¼Î¿Ï? (ÎºÎ±Ï?ÎµÏ?Ï?Ï?Î±Î¼Î¼ÎÎ½Î¿Ï?)"
 msgid "link to %s"
 msgstr "Ï?Ï?Î½Î´ÎµÏ?Î¼Î¿Ï? Ï?Îµ %s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Î¥Ï?Î·Ï?ÎµÏ?Î¯Î± Î±Î½Î±Î¶Î®Ï?Î·Ï?Î·Ï? ÎºÎ±Î¹ ÎµÏ?Ï?ÎµÏ?Î·Ï?Î¯Î±Ï?Î·Ï?"
diff --git a/po/en_GB.po b/po/en_GB.po
index eedefea..2d4b9fb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -434,8 +434,8 @@ msgstr "%s: no connection to tracker daemon"
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "Ensure \"tracker-store\" is running before launch this command."
 
 #: ../src/libtracker/tracker-search.c:147
 #, c-format
@@ -519,28 +519,28 @@ msgstr "%s: invalid arguments"
 msgid "%s: file %s not found"
 msgstr "%s: file %s not found"
 
-#: ../src/trackerd/trackerd.c:150
+#: ../src/tracker-store/tracker-store.c:150
 msgid "Directory to exclude from indexing"
 msgstr "Directory to exclude from indexing"
 
-#: ../src/trackerd/trackerd.c:150 ../src/trackerd/trackerd.c:151
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:150 ../src/tracker-store/tracker-store.c:151
+#: ../src/tracker-store/tracker-store.c:152
 msgid "/PATH/DIR"
 msgstr "/PATH/DIR"
 
-#: ../src/trackerd/trackerd.c:151
+#: ../src/tracker-store/tracker-store.c:151
 msgid "Directory to include in indexing"
 msgstr "Directory to include in indexing"
 
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:152
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Directory to crawl for indexing at start up only"
 
-#: ../src/trackerd/trackerd.c:153
+#: ../src/tracker-store/tracker-store.c:153
 msgid "Disable any indexing or watching taking place"
 msgstr "Disable any indexing or watching taking place"
 
-#: ../src/trackerd/trackerd.c:154
+#: ../src/tracker-store/tracker-store.c:154
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -548,11 +548,11 @@ msgstr ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
 
-#: ../src/trackerd/trackerd.c:154 ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:154 ../src/tracker-store/tracker-store.c:155
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:155
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
@@ -560,43 +560,43 @@ msgstr ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
 
-#: ../src/trackerd/trackerd.c:156
+#: ../src/tracker-store/tracker-store.c:156
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimises the use of memory but may slow indexing down"
 
-#: ../src/trackerd/trackerd.c:157
+#: ../src/tracker-store/tracker-store.c:157
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "Initial sleep time, just before indexing, in seconds"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid "LANG"
 msgstr "LANG"
 
-#: ../src/trackerd/trackerd.c:159
+#: ../src/tracker-store/tracker-store.c:159
 msgid "Force a re-index of all content"
 msgstr "Force a re-index of all content"
 
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:160
 msgid "Make tracker errors fatal"
 msgstr "Make Tracker errors fatal"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2434
+#: ../src/tracker-store/tracker-store.c:2434
 msgid "- start the tracker daemon"
 msgstr "- start the tracker daemon"
 
-#: ../src/trackerd/trackerd.c:2435 ../src/trackerd/trackerd.c:2436
+#: ../src/tracker-store/tracker-store.c:2435 ../src/tracker-store/tracker-store.c:2436
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#: ../src/trackerd/trackerd.c:2443
+#: ../src/tracker-store/tracker-store.c:2443
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -759,7 +759,7 @@ msgstr ""
 msgid "Tracker Web Site"
 msgstr "Tracker Web Site"
 
-#: ../src/tracker-applet/tracker-applet.c:1914 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1914 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1477,7 +1477,7 @@ msgstr "link (broken)"
 msgid "link to %s"
 msgstr "link to %s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Tracker search and indexing service"
 
diff --git a/po/es.po b/po/es.po
index 16013dd..894ec4c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2327
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Servicio de bÃºsqueda e indexado Tracker"
 
@@ -762,12 +762,12 @@ msgid "Control and monitor the Tracker search and indexing service"
 msgstr "Controle y monitorice el servicio de bÃºsqueda e indexado Tracker"
 
 #: ../src/tracker-extract/tracker-main.c:82
-#: ../src/tracker-indexer/tracker-main.c:84 ../src/trackerd/tracker-main.c:137
+#: ../src/tracker-indexer/tracker-main.c:84 ../src/tracker-store/tracker-main.c:137
 msgid "Displays version information"
 msgstr "Muestra informaciÃ³n de la versiÃ³n"
 
 #: ../src/tracker-extract/tracker-main.c:86
-#: ../src/tracker-indexer/tracker-main.c:88 ../src/trackerd/tracker-main.c:141
+#: ../src/tracker-indexer/tracker-main.c:88 ../src/tracker-store/tracker-main.c:141
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1828,17 +1828,17 @@ msgstr ""
 "NOTA: Se alcanzÃ³ el lÃmite, existen mÃ¡s elementos en la base de datos que no "
 "se listan aquÃ"
 
-#: ../src/trackerd/tracker-main.c:146
+#: ../src/tracker-store/tracker-main.c:146
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 "Segundos que esperar antes de iniciar una bÃºsqueda o indexado "
 "(predeterminado = 45)"
 
-#: ../src/trackerd/tracker-main.c:150
+#: ../src/tracker-store/tracker-main.c:150
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimiza el uso de memoria pero puede ralentizar el indexado"
 
-#: ../src/trackerd/tracker-main.c:154
+#: ../src/tracker-store/tracker-main.c:154
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
@@ -1846,7 +1846,7 @@ msgstr ""
 "Directorios que excluir para la monitorizaciÃ³n del cambio de archivos (puede "
 "hacer -e <ruta> -e <ruta>)"
 
-#: ../src/trackerd/tracker-main.c:158
+#: ../src/tracker-store/tracker-main.c:158
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
@@ -1854,28 +1854,28 @@ msgstr ""
 "Directorios que incluir para la monitorizaciÃ³n del cambio de archivos (puede "
 "hacer -i <ruta> -i <ruta>)"
 
-#: ../src/trackerd/tracker-main.c:162
+#: ../src/tracker-store/tracker-main.c:162
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 "Directorios en los que arrastrarse para indexar sus archivos (puede hacer -c "
 "<ruta> -c <ruta>)"
 
-#: ../src/trackerd/tracker-main.c:166
+#: ../src/tracker-store/tracker-main.c:166
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 "Desactivar mÃ³dulos para que no sean procesados (puede hacer -d <mÃ³dulo> -d "
 "<mÃ³dulo>)"
 
-#: ../src/trackerd/tracker-main.c:172
+#: ../src/tracker-store/tracker-main.c:172
 msgid "Force a re-index of all content"
 msgstr "Forzar un reindexamiento de todo el contenido"
 
-#: ../src/trackerd/tracker-main.c:176
+#: ../src/tracker-store/tracker-main.c:176
 msgid "Disable any indexing and monitoring"
 msgstr "Desactivar cualquier indexado y monitorizaciÃ³n"
 
-#: ../src/trackerd/tracker-main.c:179
+#: ../src/tracker-store/tracker-main.c:179
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -1885,7 +1885,7 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:856
+#: ../src/tracker-store/tracker-main.c:856
 msgid "- start the tracker daemon"
 msgstr "iniciar el demonio de tracker"
 
@@ -2245,9 +2245,9 @@ msgstr "iniciar el demonio de tracker"
 #~ msgid "%s: no connection to tracker daemon"
 #~ msgstr "%s: no hay conexiÃ³n al demonio de tracker"
 
-#~ msgid "Ensure \"trackerd\" is running before launch this command."
+#~ msgid "Ensure \"tracker-store\" is running before launch this command."
 #~ msgstr ""
-#~ "AsegÃºrese de que Â«trackerdÂ» estÃ© funcionando antes de lanzar este comando."
+#~ "AsegÃºrese de que Â«tracker-storeÂ» estÃ© funcionando antes de lanzar este comando."
 
 #~ msgid "%s: internal tracker error: %s"
 #~ msgstr "%s: error interno de tracker: %s"
diff --git a/po/et.po b/po/et.po
index b9ae6e2..8945ad8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -21,12 +21,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2236
 msgid "Tracker"
 msgstr ""
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr ""
 
@@ -725,12 +725,12 @@ msgid "Control and monitor the Tracker search and indexing service"
 msgstr ""
 
 #: ../src/tracker-extract/tracker-main.c:78
-#: ../src/tracker-indexer/tracker-main.c:79 ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-indexer/tracker-main.c:79 ../src/tracker-store/tracker-main.c:136
 msgid "Displays version information"
 msgstr "Versiooniandmete kuvamine"
 
 #: ../src/tracker-extract/tracker-main.c:82
-#: ../src/tracker-indexer/tracker-main.c:83 ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-indexer/tracker-main.c:83 ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1976,44 +1976,44 @@ msgstr ""
 msgid "Fields are missing"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:145
+#: ../src/tracker-store/tracker-main.c:145
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:149
+#: ../src/tracker-store/tracker-main.c:149
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:153
+#: ../src/tracker-store/tracker-main.c:153
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:157
+#: ../src/tracker-store/tracker-main.c:157
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:161
+#: ../src/tracker-store/tracker-main.c:161
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:165
+#: ../src/tracker-store/tracker-main.c:165
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:171
+#: ../src/tracker-store/tracker-main.c:171
 msgid "Force a re-index of all content"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:175
+#: ../src/tracker-store/tracker-main.c:175
 msgid "Disable any indexing and monitoring"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:178
+#: ../src/tracker-store/tracker-main.c:178
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -2021,6 +2021,6 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:878
+#: ../src/tracker-store/tracker-main.c:878
 msgid "- start the tracker daemon"
 msgstr "- jÃ¤lgimisdeemoni kÃ¤ivitamine"
diff --git a/po/fi.po b/po/fi.po
index 704f3fc..ddf313e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -438,8 +438,8 @@ msgstr "%s: ei yhteyttÃ¤ tracker-palvelimeen"
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "Varmista, ettÃ¤ \"trackerd\" on kÃ¤ynnissÃ¤ ennen komennon suorittamista."
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "Varmista, ettÃ¤ \"tracker-store\" on kÃ¤ynnissÃ¤ ennen komennon suorittamista."
 
 #: ../src/libtracker/tracker-search.c:147
 #, c-format
@@ -523,28 +523,28 @@ msgstr "%s: virheellisiÃ¤ argumentteja"
 msgid "%s: file %s not found"
 msgstr "%s: tiedostoa %s ei lÃ¶ydy"
 
-#: ../src/trackerd/trackerd.c:120
+#: ../src/tracker-store/tracker-store.c:120
 msgid "Directory to exclude from indexing"
 msgstr "Indeksoitaessa ohitettava kansio"
 
-#: ../src/trackerd/trackerd.c:120 ../src/trackerd/trackerd.c:121
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:120 ../src/tracker-store/tracker-store.c:121
+#: ../src/tracker-store/tracker-store.c:122
 msgid "/PATH/DIR"
 msgstr "/POLKU/KANSIO"
 
-#: ../src/trackerd/trackerd.c:121
+#: ../src/tracker-store/tracker-store.c:121
 msgid "Directory to include in indexing"
 msgstr "Indeksoitavaksi liitettÃ¤vÃ¤ kansio"
 
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:122
 msgid "Directory to crawl for indexing at start up only"
 msgstr "KÃ¤ynnistettÃ¤essÃ¤ indeksointia varten lÃ¤pikÃ¤ytÃ¤vÃ¤ kansio"
 
-#: ../src/trackerd/trackerd.c:123
+#: ../src/tracker-store/tracker-store.c:123
 msgid "Disable any indexing or watching taking place"
 msgstr "Poista kaikki indeksointi ja tarkkailu kÃ¤ytÃ¶stÃ¤"
 
-#: ../src/trackerd/trackerd.c:124
+#: ../src/tracker-store/tracker-store.c:124
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -553,11 +553,11 @@ msgstr ""
 "arvoja ovat 0 (nÃ¤yttÃ¤Ã¤/kirjoittaa lokiin vain virheet), 1 (minimaalinen), 2 "
 "(yksityiskohtainen), ja 3 (virheenjÃ¤ljitys)"
 
-#: ../src/trackerd/trackerd.c:124 ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:124 ../src/tracker-store/tracker-store.c:125
 msgid "VALUE"
 msgstr "ARVO"
 
-#: ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:125
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
@@ -565,44 +565,44 @@ msgstr ""
 "Arvo jota kÃ¤ytetÃ¤Ã¤n indeksoinnin nopeuden sÃ¤Ã¤telyyn. Arvon tulee olla "
 "vÃ¤lillÃ¤ 0-99 (oletus 0), pienempien arvojen lisÃ¤tessÃ¤ indeksointinopeutta"
 
-#: ../src/trackerd/trackerd.c:126
+#: ../src/tracker-store/tracker-store.c:126
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimoi kÃ¤ytettÃ¤vÃ¤n muistin mÃ¤Ã¤rÃ¤n, mutta voi hidastaa indeksointia"
 
-#: ../src/trackerd/trackerd.c:127
+#: ../src/tracker-store/tracker-store.c:127
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "Odotusaika aluksi ennen indeksointia, sekunneissa"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Kieli jota kÃ¤ytetÃ¤Ã¤n louhinta- ja hukkasanaluetteloihin (ISO 639-1 "
 "kaksikirjaiminen koodi)"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid "LANG"
 msgstr "KIELI"
 
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:129
 msgid "Force a re-index of all content"
 msgstr "Pakota kaiken sisÃ¤llÃ¶n uudelleenindeksointi"
 
-#: ../src/trackerd/trackerd.c:130
+#: ../src/tracker-store/tracker-store.c:130
 msgid "Make tracker errors fatal"
 msgstr "Tee trackerin virheistÃ¤ kriittisiÃ¤"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:668
+#: ../src/tracker-store/tracker-store.c:668
 msgid "- start the tracker daemon"
 msgstr "- kÃ¤ynnistÃ¤ tracker-seurantapalvelin"
 
-#: ../src/trackerd/trackerd.c:669 ../src/trackerd/trackerd.c:670
+#: ../src/tracker-store/tracker-store.c:669 ../src/tracker-store/tracker-store.c:670
 msgid "DIRECTORY"
 msgstr "KANSIO"
 
-#: ../src/trackerd/trackerd.c:677
+#: ../src/tracker-store/tracker-store.c:677
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -768,7 +768,7 @@ msgstr "Tietoj_a"
 msgid "_Quit"
 msgstr "_Poistu"
 
-#: ../src/tracker-applet/tracker-applet.c:1997 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1997 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1496,7 +1496,7 @@ msgstr "linkki (rikki)"
 msgid "link to %s"
 msgstr "linkki kohteeseen %s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Haku- ja indeksointipalvelu"
 
diff --git a/po/fr.po b/po/fr.po
index 8fc8d26..1e7708f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,12 +22,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2117
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Service de recherche et d'indexation Tracker"
 
@@ -714,7 +714,7 @@ msgstr ""
 msgid "Here are some examples of how to use this command:"
 msgstr "Voici quelques exemples d'utilisation de cette commandeÂ :"
 
-#: ../src/tracker-indexer/tracker-main.c:72 ../src/trackerd/tracker-main.c:123
+#: ../src/tracker-indexer/tracker-main.c:72 ../src/tracker-store/tracker-main.c:123
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1795,17 +1795,17 @@ msgstr "Champs obligatoires"
 msgid "Fields are missing"
 msgstr "Les champs sont manquants"
 
-#: ../src/trackerd/tracker-main.c:128
+#: ../src/tracker-store/tracker-main.c:128
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 "Nombre de secondes d'attente avant de dÃ©marrer toute indexation (par "
 "dÃ©faut 45)"
 
-#: ../src/trackerd/tracker-main.c:132
+#: ../src/tracker-store/tracker-main.c:132
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "RÃ©duit l'utilisation de la mÃ©moire, mais peut ralentir l'indexation"
 
-#: ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-store/tracker-main.c:136
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
@@ -1813,7 +1813,7 @@ msgstr ""
 "RÃ©pertoires Ã  exclure de la surveillance de modification de fichiers (utiliser "
 "-e <chemin> -e <chemin>)"
 
-#: ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
@@ -1821,26 +1821,26 @@ msgstr ""
 "RÃ©pertoires Ã  inclure dans la surveillance de modification de fichiers (utiliser "
 "-i <chemin> -i <chemin>)"
 
-#: ../src/trackerd/tracker-main.c:144
+#: ../src/tracker-store/tracker-main.c:144
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 "RÃ©pertoires Ã  explorer pour l'indexation de fichiers (utiliser -c <chemin> -"
 "c <chemin>)"
 
-#: ../src/trackerd/tracker-main.c:148
+#: ../src/tracker-store/tracker-main.c:148
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr "EmpÃªche des modules d'Ãªtre traitÃ©s (utiliser -d <module> -d <module>)"
 
-#: ../src/trackerd/tracker-main.c:156
+#: ../src/tracker-store/tracker-main.c:156
 msgid "Force a re-index of all content"
 msgstr "Force une rÃ©indexation de tout le contenu"
 
-#: ../src/trackerd/tracker-main.c:160
+#: ../src/tracker-store/tracker-main.c:160
 msgid "Disable any indexing and monitoring"
 msgstr "DÃ©sactive toute indexation ou surveillance"
 
-#: ../src/trackerd/tracker-main.c:163
+#: ../src/tracker-store/tracker-main.c:163
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -1850,22 +1850,22 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:792
+#: ../src/tracker-store/tracker-main.c:792
 msgid "- start the tracker daemon"
 msgstr "- dÃ©marre le dÃ©mon tracker"
 
-#: ../src/trackerd/tracker-main.c:796
+#: ../src/tracker-store/tracker-main.c:796
 msgid "Daemon Options"
 msgstr "Options du dÃ©mon"
 
-#: ../src/trackerd/tracker-main.c:797
+#: ../src/tracker-store/tracker-main.c:797
 msgid "Show daemon options"
 msgstr "Affiche les options du dÃ©mon"
 
-#: ../src/trackerd/tracker-main.c:805
+#: ../src/tracker-store/tracker-main.c:805
 msgid "Indexer Options"
 msgstr "Options d'indexation"
 
-#: ../src/trackerd/tracker-main.c:806
+#: ../src/tracker-store/tracker-main.c:806
 msgid "Show indexer options"
 msgstr "Affiche les options de l'indexeur"
diff --git a/po/gl.po b/po/gl.po
index 6a9fa59..f2da18c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 0.3\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2254
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Servizo de busca e indexaciÃ³n do Tracker"
 
@@ -750,12 +750,12 @@ msgid "Control and monitor the Tracker search and indexing service"
 msgstr "Controlar e monitorizar o servizo de busca e indexaciÃ³n do Tracker"
 
 #: ../src/tracker-extract/tracker-main.c:78
-#: ../src/tracker-indexer/tracker-main.c:79 ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-indexer/tracker-main.c:79 ../src/tracker-store/tracker-main.c:136
 msgid "Displays version information"
 msgstr "Mostra a informaciÃ³n da versiÃ³n"
 
 #: ../src/tracker-extract/tracker-main.c:82
-#: ../src/tracker-indexer/tracker-main.c:83 ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-indexer/tracker-main.c:83 ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1955,17 +1955,17 @@ msgstr "Campos requiridos"
 msgid "Fields are missing"
 msgstr "Faltan campos"
 
-#: ../src/trackerd/tracker-main.c:145
+#: ../src/tracker-store/tracker-main.c:145
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 "Os segundos que hai que agardar antes de comezar calquera indexaciÃ³n ou "
 "percorrido (predeterminado = 45)"
 
-#: ../src/trackerd/tracker-main.c:149
+#: ../src/tracker-store/tracker-main.c:149
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimiza o uso da memoria mais pode ralentizar a indexaciÃ³n"
 
-#: ../src/trackerd/tracker-main.c:153
+#: ../src/tracker-store/tracker-main.c:153
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
@@ -1973,7 +1973,7 @@ msgstr ""
 "Directorios que hai que excluÃr da monitorizaciÃ³n de cambios nos ficheiros "
 "(pode facer -e <camiÃ±o> -e <camiÃ±o>)"
 
-#: ../src/trackerd/tracker-main.c:157
+#: ../src/tracker-store/tracker-main.c:157
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
@@ -1981,27 +1981,27 @@ msgstr ""
 "Directorios que hai que incluÃr da monitorizaciÃ³n de cambios nos ficheiros "
 "(pode facer -i <camiÃ±o> -i <camiÃ±o>)"
 
-#: ../src/trackerd/tracker-main.c:161
+#: ../src/tracker-store/tracker-main.c:161
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 "Directorios que hai que percorrer para indexar ficheiros (pode facer -c "
 "<camiÃ±o> -c <camiÃ±o>)"
 
-#: ../src/trackerd/tracker-main.c:165
+#: ../src/tracker-store/tracker-main.c:165
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 "Desactivar os mÃ³dulos do procesamento (pode facer un -d <mÃ³dulo> -d <mÃ³dulo>)"
 
-#: ../src/trackerd/tracker-main.c:171
+#: ../src/tracker-store/tracker-main.c:171
 msgid "Force a re-index of all content"
 msgstr "Forzar unha reindexaciÃ³n de todo o contido"
 
-#: ../src/trackerd/tracker-main.c:175
+#: ../src/tracker-store/tracker-main.c:175
 msgid "Disable any indexing and monitoring"
 msgstr "Desactivar toda indexaciÃ³n e monitorizaciÃ³n"
 
-#: ../src/trackerd/tracker-main.c:178
+#: ../src/tracker-store/tracker-main.c:178
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:896
+#: ../src/tracker-store/tracker-main.c:896
 msgid "- start the tracker daemon"
 msgstr "- iniciar o daemon do Tracker"
 
diff --git a/po/he.po b/po/he.po
index 07b758b..3affe56 100644
--- a/po/he.po
+++ b/po/he.po
@@ -420,8 +420,8 @@ msgstr "%s: no connection to tracker daemon"
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "Ensure \"tracker-store\" is running before launch this command."
 
 #: ../src/libtracker/tracker-search.c:147
 #, c-format
@@ -505,28 +505,28 @@ msgstr "%s: invalid arguments"
 msgid "%s: file %s not found"
 msgstr "%s: file %s not found"
 
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:129
 msgid "Directory to exclude from indexing"
 msgstr "Directory to exclude from indexing"
 
-#: ../src/trackerd/trackerd.c:129 ../src/trackerd/trackerd.c:130
-#: ../src/trackerd/trackerd.c:131
+#: ../src/tracker-store/tracker-store.c:129 ../src/tracker-store/tracker-store.c:130
+#: ../src/tracker-store/tracker-store.c:131
 msgid "/PATH/DIR"
 msgstr "/PATH/DIR"
 
-#: ../src/trackerd/trackerd.c:130
+#: ../src/tracker-store/tracker-store.c:130
 msgid "Directory to include in indexing"
 msgstr "Directory to include in indexing"
 
-#: ../src/trackerd/trackerd.c:131
+#: ../src/tracker-store/tracker-store.c:131
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Directory to crawl for indexing at start up only"
 
-#: ../src/trackerd/trackerd.c:132
+#: ../src/tracker-store/tracker-store.c:132
 msgid "Disable any indexing or watching taking place"
 msgstr "Disable any indexing or watching taking place"
 
-#: ../src/trackerd/trackerd.c:133
+#: ../src/tracker-store/tracker-store.c:133
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -534,11 +534,11 @@ msgstr ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
 
-#: ../src/trackerd/trackerd.c:133 ../src/trackerd/trackerd.c:134
+#: ../src/tracker-store/tracker-store.c:133 ../src/tracker-store/tracker-store.c:134
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../src/trackerd/trackerd.c:134
+#: ../src/tracker-store/tracker-store.c:134
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
@@ -546,43 +546,43 @@ msgstr ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
 
-#: ../src/trackerd/trackerd.c:135
+#: ../src/tracker-store/tracker-store.c:135
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimizes the use of memory but may slow indexing down"
 
-#: ../src/trackerd/trackerd.c:136
+#: ../src/tracker-store/tracker-store.c:136
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "Initial sleep time, just before indexing, in seconds"
 
-#: ../src/trackerd/trackerd.c:137
+#: ../src/tracker-store/tracker-store.c:137
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 
-#: ../src/trackerd/trackerd.c:137
+#: ../src/tracker-store/tracker-store.c:137
 msgid "LANG"
 msgstr "LANG"
 
-#: ../src/trackerd/trackerd.c:138
+#: ../src/tracker-store/tracker-store.c:138
 msgid "Force a re-index of all content"
 msgstr "Force a re-index of all content"
 
-#: ../src/trackerd/trackerd.c:139
+#: ../src/tracker-store/tracker-store.c:139
 msgid "Make tracker errors fatal"
 msgstr "Make tracker errors fatal"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:795
+#: ../src/tracker-store/tracker-store.c:795
 msgid "- start the tracker daemon"
 msgstr "- start the tracker daemon"
 
-#: ../src/trackerd/trackerd.c:796 ../src/trackerd/trackerd.c:797
+#: ../src/tracker-store/tracker-store.c:796 ../src/tracker-store/tracker-store.c:797
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#: ../src/trackerd/trackerd.c:804
+#: ../src/tracker-store/tracker-store.c:804
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -742,7 +742,7 @@ msgstr "_×?×?×?×?×ª"
 msgid "_Quit"
 msgstr "_×?×¦×?×?×?"
 
-#: ../src/tracker-applet/tracker-applet.c:1997 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1997 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr ""
 "â??Tracker"
@@ -1433,6 +1433,6 @@ msgstr ""
 msgid "link to %s"
 msgstr "×§×?×©×?×¨ ×?-%s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 64beeac..b189abd 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -17,12 +17,12 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2236
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Tracker keresÅ?- Ã©s indexelÅ? szolgÃ¡ltatÃ¡s"
 
@@ -741,12 +741,12 @@ msgid "Control and monitor the Tracker search and indexing service"
 msgstr "A Tracker keresÅ?- Ã©s indexelÅ? szolgÃ¡ltatÃ¡s vezÃ©rlÃ©se Ã©s megfigyelÃ©se"
 
 #: ../src/tracker-extract/tracker-main.c:78
-#: ../src/tracker-indexer/tracker-main.c:79 ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-indexer/tracker-main.c:79 ../src/tracker-store/tracker-main.c:136
 msgid "Displays version information"
 msgstr "VerziÃ³informÃ¡ciÃ³k megjelenÃtÃ©se"
 
 #: ../src/tracker-extract/tracker-main.c:82
-#: ../src/tracker-indexer/tracker-main.c:83 ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-indexer/tracker-main.c:83 ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -2093,17 +2093,17 @@ msgstr "SzÃ¼ksÃ©ges mezÅ?k"
 msgid "Fields are missing"
 msgstr "HiÃ¡nyzÃ³ mezÅ?k"
 
-#: ../src/trackerd/tracker-main.c:145
+#: ../src/tracker-store/tracker-main.c:145
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 "VÃ¡rakozÃ¡s ennyi mÃ¡sodpercig bejÃ¡rÃ¡s vagy indexelÃ©s elÅ?tt (alapÃ©rtelmezett: "
 "45)"
 
-#: ../src/trackerd/tracker-main.c:149
+#: ../src/tracker-store/tracker-main.c:149
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "MinimalizÃ¡lja a memÃ³riahasznÃ¡latot, de lelassÃthatja az indexelÃ©st"
 
-#: ../src/trackerd/tracker-main.c:153
+#: ../src/tracker-store/tracker-main.c:153
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
@@ -2111,7 +2111,7 @@ msgstr ""
 "FÃ¡jlvÃ¡ltozÃ¡sok figyelÃ©sÃ©bÅ?l kihagyandÃ³ kÃ¶nyvtÃ¡rak (hasznÃ¡lhatÃ³ a -e "
 "<Ãºtvonal> -e <Ãºtvonal> is)"
 
-#: ../src/trackerd/tracker-main.c:157
+#: ../src/tracker-store/tracker-main.c:157
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
@@ -2119,25 +2119,25 @@ msgstr ""
 "FÃ¡jlvÃ¡ltozÃ¡sok figyelÃ©sÃ©hez hozzÃ¡adandÃ³ kÃ¶nyvtÃ¡rak (hasznÃ¡lhatÃ³ a -e "
 "<Ãºtvonal> -e <Ãºtvonal> is)"
 
-#: ../src/trackerd/tracker-main.c:161
+#: ../src/tracker-store/tracker-main.c:161
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 "IndexelÃ©shez bejÃ¡randÃ³ kÃ¶nyvtÃ¡rak (hasznÃ¡lhatÃ³ a -c <Ãºtvonal> -c <Ãºtvonal> "
 "is)"
 
-#: ../src/trackerd/tracker-main.c:165
+#: ../src/tracker-store/tracker-main.c:165
 msgid "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr "FeldolgozÃ¡sbÃ³l kihagyandÃ³ modulok (hasznÃ¡lhatÃ³ a -d <modul> -d <modul> is)"
 
-#: ../src/trackerd/tracker-main.c:171
+#: ../src/tracker-store/tracker-main.c:171
 msgid "Force a re-index of all content"
 msgstr "Minden tartalom ÃºjraindexelÃ©sÃ©nek kikÃ©nyszerÃtÃ©se"
 
-#: ../src/trackerd/tracker-main.c:175
+#: ../src/tracker-store/tracker-main.c:175
 msgid "Disable any indexing and monitoring"
 msgstr "Minden indexelÃ©s Ã©s figyelÃ©s letiltÃ¡sa"
 
-#: ../src/trackerd/tracker-main.c:178
+#: ../src/tracker-store/tracker-main.c:178
 msgid "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
 "A tÃ¶vezÅ?hÃ¶z Ã©s a megÃ¡llÃtÃ³ szavakhoz hasznÃ¡landÃ³ nyelv (kÃ©tbetÅ±s ISO 639-1 "
@@ -2146,7 +2146,7 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:877
+#: ../src/tracker-store/tracker-main.c:877
 msgid "- start the tracker daemon"
 msgstr "- a tracker dÃ©mon elindÃtÃ¡sa"
 
diff --git a/po/it.po b/po/it.po
index 9592611..900ac4b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2327
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Servizio di ricerca e indicizzazione Tracker"
 
@@ -775,13 +775,13 @@ msgstr ""
 "Tiene sotto controllo il servizio di ricerca e indicizzazione di Tracker"
 
 #: ../src/tracker-extract/tracker-main.c:81
-#: ../src/tracker-indexer/tracker-main.c:84 ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-indexer/tracker-main.c:84 ../src/tracker-store/tracker-main.c:136
 msgid "Displays version information"
 msgstr "Mostra informazioni sulla versione"
 
 # cambiata la punteggiatura
 #: ../src/tracker-extract/tracker-main.c:85
-#: ../src/tracker-indexer/tracker-main.c:88 ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-indexer/tracker-main.c:88 ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1862,18 +1862,18 @@ msgstr ""
 "NOTA: Ã¨ stato raggiunto il limite, ci sono altre voci nel database non "
 "elencate qui"
 
-#: ../src/trackerd/tracker-main.c:145
+#: ../src/tracker-store/tracker-main.c:145
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 "Secondi da attendere prima di avviare ogni osservazione o indicizzazione "
 "(predefinito = 45)"
 
-#: ../src/trackerd/tracker-main.c:149
+#: ../src/tracker-store/tracker-main.c:149
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimizza l'uso della memoria, ma potrebbe rallentare l'indicizzazione"
 
 # cambiata la forma tra parentesi, qui e successivi
-#: ../src/trackerd/tracker-main.c:153
+#: ../src/tracker-store/tracker-main.c:153
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
@@ -1881,7 +1881,7 @@ msgstr ""
 "Directory da escludere nel monitoraggio dei cambiamenti dei file "
 "(ripetizione ammessa: -e PERCORSO -e PERCORSO)"
 
-#: ../src/trackerd/tracker-main.c:157
+#: ../src/tracker-store/tracker-main.c:157
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
@@ -1889,28 +1889,28 @@ msgstr ""
 "Directory da includere nel monitoraggio dei cambiamenti dei file "
 "(ripetizione ammessa: -i PERCORSO -i PERCORSO)"
 
-#: ../src/trackerd/tracker-main.c:161
+#: ../src/tracker-store/tracker-main.c:161
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 "Directory da osservare per indicizzare i file (ripetizione ammessa: -c "
 "PERCORSO -c PERCORSO)"
 
-#: ../src/trackerd/tracker-main.c:165
+#: ../src/tracker-store/tracker-main.c:165
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 "Disabilita i moduli dall'essere processati (ripetizione ammessa: -d MODULO -"
 "d MODULO)"
 
-#: ../src/trackerd/tracker-main.c:171
+#: ../src/tracker-store/tracker-main.c:171
 msgid "Force a re-index of all content"
 msgstr "Forza una re-indicizzazione di tutti i contenuti"
 
-#: ../src/trackerd/tracker-main.c:175
+#: ../src/tracker-store/tracker-main.c:175
 msgid "Disable any indexing and monitoring"
 msgstr "Disabilita ogni indicizzazione e monitoraggio"
 
-#: ../src/trackerd/tracker-main.c:178
+#: ../src/tracker-store/tracker-main.c:178
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -1920,7 +1920,7 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:853
+#: ../src/tracker-store/tracker-main.c:853
 msgid "- start the tracker daemon"
 msgstr "- avvia il demone di Tracker"
 
diff --git a/po/ja.po b/po/ja.po
index 64854bb..c2a9ba7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -417,7 +417,7 @@ msgstr ""
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
 msgstr ""
 
 #: ../src/libtracker/tracker-search.c:147
@@ -500,79 +500,79 @@ msgstr ""
 msgid "%s: file %s not found"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:120
+#: ../src/tracker-store/tracker-store.c:120
 msgid "Directory to exclude from indexing"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:120 ../src/trackerd/trackerd.c:121
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:120 ../src/tracker-store/tracker-store.c:121
+#: ../src/tracker-store/tracker-store.c:122
 msgid "/PATH/DIR"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:121
+#: ../src/tracker-store/tracker-store.c:121
 msgid "Directory to include in indexing"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:122
 msgid "Directory to crawl for indexing at start up only"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:123
+#: ../src/tracker-store/tracker-store.c:123
 msgid "Disable any indexing or watching taking place"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:124
+#: ../src/tracker-store/tracker-store.c:124
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:124 ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:124 ../src/tracker-store/tracker-store.c:125
 msgid "VALUE"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:125
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:126
+#: ../src/tracker-store/tracker-store.c:126
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:127
+#: ../src/tracker-store/tracker-store.c:127
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid "LANG"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:129
 msgid "Force a re-index of all content"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:130
+#: ../src/tracker-store/tracker-store.c:130
 msgid "Make tracker errors fatal"
 msgstr ""
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:664
+#: ../src/tracker-store/tracker-store.c:664
 msgid "- start the tracker daemon"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:665 ../src/trackerd/trackerd.c:666
+#: ../src/tracker-store/tracker-store.c:665 ../src/tracker-store/tracker-store.c:666
 msgid "DIRECTORY"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:673
+#: ../src/tracker-store/tracker-store.c:673
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -718,7 +718,7 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ../src/tracker-applet/tracker-applet.c:1997 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1997 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1422,6 +1422,6 @@ msgstr ""
 msgid "link to %s"
 msgstr ""
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Tracker æ¤?ç´¢ã?¨ç´¢å¼?ã?µã?¼ã??ã?¹"
diff --git a/po/ko.po b/po/ko.po
index aa86bfd..03fa436 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -433,8 +433,8 @@ msgstr "%s: í?¸ë??ì»¤ ë??ëª¬ì?? ì?°ê²°ë??ì?´ ì??ì§? ì??ì?µë??ë?¤"
 
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "ì?´ ëª?ë ¹ì?? ì?¤í??í??ê¸° ì ?ì?? \"trackerd\" í??ë¡?ì?¸ì?¤ê°? ì?¤í?? ì¤?ì?¸ì§? í??ì?¸í??ì?ì??ì?¤."
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "ì?´ ëª?ë ¹ì?? ì?¤í??í??ê¸° ì ?ì?? \"tracker-store\" í??ë¡?ì?¸ì?¤ê°? ì?¤í?? ì¤?ì?¸ì§? í??ì?¸í??ì?ì??ì?¤."
 
 #: ../src/libtracker/tracker-search.c:147
 msgid "Service not recognized, searching in Other Files...\n"
@@ -516,28 +516,28 @@ msgstr "%s: ì??ëª»ë?? ë§¤ê°? ë³?ì??"
 msgid "%s: file %s not found"
 msgstr "%s: %s í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??"
 
-#: ../src/trackerd/trackerd.c:146
+#: ../src/tracker-store/tracker-store.c:146
 msgid "Directory to exclude from indexing"
 msgstr "ì?¸ë?±ì?±ì??ì?? ì ?ì?¸í?  ë??ë ?í? ë¦¬"
 
-#: ../src/trackerd/trackerd.c:146 ../src/trackerd/trackerd.c:147
-#: ../src/trackerd/trackerd.c:148
+#: ../src/tracker-store/tracker-store.c:146 ../src/tracker-store/tracker-store.c:147
+#: ../src/tracker-store/tracker-store.c:148
 msgid "/PATH/DIR"
 msgstr "/PATH/DIR"
 
-#: ../src/trackerd/trackerd.c:147
+#: ../src/tracker-store/tracker-store.c:147
 msgid "Directory to include in indexing"
 msgstr "ì?¸ë?±ì?±ì?? í?¬í?¨ì??í?¬ ë??ë ?í? ë¦¬"
 
-#: ../src/trackerd/trackerd.c:148
+#: ../src/tracker-store/tracker-store.c:148
 msgid "Directory to crawl for indexing at start up only"
 msgstr "ì??ì?? ì??ì??ë§? ì?¸ë?±ì?±ì?? ì??í??í?  ë??ë ?í? ë¦¬"
 
-#: ../src/trackerd/trackerd.c:149
+#: ../src/tracker-store/tracker-store.c:149
 msgid "Disable any indexing or watching taking place"
 msgstr "ëª¨ë?  ì?¸ë?±ì?±ê³¼ ê°?ì??ë¥¼ ì??í??í??ì§? ì??ì??"
 
-#: ../src/trackerd/trackerd.c:150
+#: ../src/tracker-store/tracker-store.c:150
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -545,54 +545,54 @@ msgstr ""
 "ë¡?ê·¸ ì??ì¤?ì?? ì ?ì?´í??ë?? ê°?. ì?¬ì?©í?  ì?? ì??ë?? ê°?ì?? 0 (ì??ë?¬ë§? ë³´ê¸°/ë¡?ê·¸ ë?¨ê¹?), "
 "1 (ìµ?ì?? ì??ì¤?), 2 (ì??ì?¸ ì ?ë³´), 3 (ë??ë²?ê·¸)"
 
-#: ../src/trackerd/trackerd.c:150 ../src/trackerd/trackerd.c:151
+#: ../src/tracker-store/tracker-store.c:150 ../src/tracker-store/tracker-store.c:151
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../src/trackerd/trackerd.c:151
+#: ../src/tracker-store/tracker-store.c:151
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
 msgstr "ì?¸ë?±ì?±ì?? ì?±ë?¥ì?? ì ?ì?´í??ë?? ê°?. ì?¬ì?©í?  ì?? ì??ë?? ê°?ì?? 0-99ì?´ë©° (ê¸°ë³¸ê°?ì?? 0) "
 "ê°?ì?´ ë?®ì??ì??ë¡? ì?¸ë?±ì?± ì??ë??ê°? ë¹¨ë?¼ì§?"
 
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:152
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "ë©?ëª¨ë¦¬ ì?¬ì?©ë??ì?? ìµ?ì??í??í??ì§?ë§?, ì?¸ë?±ì?±ì?´ ë??ë ¤ì§? ì?? ì??ì??"
 
-#: ../src/trackerd/trackerd.c:153
+#: ../src/tracker-store/tracker-store.c:153
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "ì?¸ë?±ì?± ë°?ë¡? ì§?ì ?ì?? ìµ?ì´? ë??ê¸° ì??ê°? (ì´?)"
 
-#: ../src/trackerd/trackerd.c:154
+#: ../src/tracker-store/tracker-store.c:154
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "ì?¤í??ë¨¸(stemmer)ì?? ì ?ì§? ë?¨ì?´ ëª©ë¡?ì??ì?? ì?¬ì?©í?  ì?¸ì?´ (ISO 639-1 2 ë¬¸ì??ì?? ì½?ë??)"
 
-#: ../src/trackerd/trackerd.c:154
+#: ../src/tracker-store/tracker-store.c:154
 msgid "LANG"
 msgstr "LANG"
 
-#: ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:155
 msgid "Force a re-index of all content"
 msgstr "ê°?ì ?ë¡? ëª¨ë?  ë?´ì?©ì?? ì?¸ë?±ì?±ì?? ë?¤ì?? ì??í??"
 
-#: ../src/trackerd/trackerd.c:156
+#: ../src/tracker-store/tracker-store.c:156
 msgid "Make tracker errors fatal"
 msgstr "í?¸ë??ì»¤ì?? ì?¤ë¥?ë¥¼ ì¹?ëª?ì ?ì?¸ ì?¤ë¥?ë¡? ë§?ë?¬"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2439
+#: ../src/tracker-store/tracker-store.c:2439
 msgid "- start the tracker daemon"
 msgstr "- í?¸ë??ì»¤ ë??ëª¬ì?? ì??ì??í?©ë??ë?¤"
 
-#: ../src/trackerd/trackerd.c:2440 ../src/trackerd/trackerd.c:2441
+#: ../src/tracker-store/tracker-store.c:2440 ../src/tracker-store/tracker-store.c:2441
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#: ../src/trackerd/trackerd.c:2448
+#: ../src/tracker-store/tracker-store.c:2448
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -745,7 +745,7 @@ msgstr ""
 "\n"
 "ì?¬ê¸°ë¥¼ ì?¤ë¥¸ìª½ í?´ë¦í??ë©´ ì?´ ì??ì??ì?? ì¤?ì§?í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../src/tracker-applet/tracker-applet.c:1078 ../trackerd.desktop.in.in.h:2
+#: ../src/tracker-applet/tracker-applet.c:1078 ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "í?¸ë??ì»¤ ì°¾ê¸° ë°? ì?¸ë?±ì?± ì??ë¹?ì?¤"
 
@@ -1337,7 +1337,7 @@ msgstr "ë§?í?¬ (ê¹¨ì§?)"
 msgid "link to %s"
 msgstr "%s(ì?¼)ë¡?ì?? ë§?í?¬"
 
-#: ../trackerd.desktop.in.in.h:1
+#: ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "í?¸ë??ì»¤"
 
diff --git a/po/lt.po b/po/lt.po
index 5df7cb0..9746a9d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -438,8 +438,8 @@ msgstr "%s: nÄ?ra ryÅ¡io su tracker posisteme"
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "PrieÅ¡ paleisdami Å¡iÄ? komandÄ? Ä¯sitikinkite, kad paleista â??trackerdâ??."
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "PrieÅ¡ paleisdami Å¡iÄ? komandÄ? Ä¯sitikinkite, kad paleista â??tracker-storeâ??."
 
 #: ../src/libtracker/tracker-search.c:147
 #, c-format
@@ -523,28 +523,28 @@ msgstr "%s: netinkami argumentai"
 msgid "%s: file %s not found"
 msgstr "%s: failas %s nerastas"
 
-#: ../src/trackerd/trackerd.c:150
+#: ../src/tracker-store/tracker-store.c:150
 msgid "Directory to exclude from indexing"
 msgstr "Neindeksuojamas aplankas"
 
-#: ../src/trackerd/trackerd.c:150 ../src/trackerd/trackerd.c:151
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:150 ../src/tracker-store/tracker-store.c:151
+#: ../src/tracker-store/tracker-store.c:152
 msgid "/PATH/DIR"
 msgstr "/KELIAS/APLANKAS"
 
-#: ../src/trackerd/trackerd.c:151
+#: ../src/tracker-store/tracker-store.c:151
 msgid "Directory to include in indexing"
 msgstr "Indeksuojamas aplankas"
 
-#: ../src/trackerd/trackerd.c:152
+#: ../src/tracker-store/tracker-store.c:152
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Tik paleidimo metu indeksuotinas aplankas"
 
-#: ../src/trackerd/trackerd.c:153
+#: ../src/tracker-store/tracker-store.c:153
 msgid "Disable any indexing or watching taking place"
 msgstr "IÅ¡jungti bet kokÄ¯ indeksavimÄ? arba stebÄ?jimÄ?"
 
-#: ../src/trackerd/trackerd.c:154
+#: ../src/tracker-store/tracker-store.c:154
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -552,11 +552,11 @@ msgstr ""
 "ReikÅ¡mÄ? nurodanti Å¾urnalÅ³ iÅ¡samumÄ?. Galimos reikÅ¡mÄ?s yra 0 (rodo/seka tik "
 "klaidas), 1 (minimalus), 2 (iÅ¡samus) ir 3 (derinimo)"
 
-#: ../src/trackerd/trackerd.c:154 ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:154 ../src/tracker-store/tracker-store.c:155
 msgid "VALUE"
 msgstr "REIKÅ MÄ?"
 
-#: ../src/trackerd/trackerd.c:155
+#: ../src/tracker-store/tracker-store.c:155
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
@@ -564,44 +564,44 @@ msgstr ""
 "ReikÅ¡mÄ?, naudojama indeksavimo greiÄ?io ribojimui. ReikÅ¡mÄ? turi bÅ«ti tarp 0 "
 "ir 99 (numatytoji â??Â 0); maÅ¾esnÄ?s reikÅ¡mÄ?s reiÅ¡kia greitesnÄ¯ indeksavimÄ?"
 
-#: ../src/trackerd/trackerd.c:156
+#: ../src/tracker-store/tracker-store.c:156
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "SumaÅ¾ina atminties naudojimÄ?, taÄ?iau gali sulÄ?tinti indeksavimÄ?"
 
-#: ../src/trackerd/trackerd.c:157
+#: ../src/tracker-store/tracker-store.c:157
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "Pradinis laukimo laikas sekundÄ?mis prieÅ¡ indeksavimÄ?"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Kalba, kuriÄ? naudoti Å¡aknÅ³ analizatoriui, ir sustojimo Å¾odÅ¾iÅ³ sÄ?raÅ¡as (ISO "
 "639-1 dviejÅ³ simboliÅ³ kodas)"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid "LANG"
 msgstr "KALBA"
 
-#: ../src/trackerd/trackerd.c:159
+#: ../src/tracker-store/tracker-store.c:159
 msgid "Force a re-index of all content"
 msgstr "Priverstinis viso turinio perindeksavimas"
 
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:160
 msgid "Make tracker errors fatal"
 msgstr "Padaryti tracker klaidas kritinÄ?mis"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2434
+#: ../src/tracker-store/tracker-store.c:2434
 msgid "- start the tracker daemon"
 msgstr "- paleisti tracker posistemÄ?"
 
-#: ../src/trackerd/trackerd.c:2435 ../src/trackerd/trackerd.c:2436
+#: ../src/tracker-store/tracker-store.c:2435 ../src/tracker-store/tracker-store.c:2436
 msgid "DIRECTORY"
 msgstr "APLANKAS"
 
-#: ../src/trackerd/trackerd.c:2443
+#: ../src/tracker-store/tracker-store.c:2443
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -765,7 +765,7 @@ msgstr ""
 msgid "Tracker Web Site"
 msgstr "Tracker svetainÄ?"
 
-#: ../src/tracker-applet/tracker-applet.c:1914 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1914 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1489,6 +1489,6 @@ msgstr "nuoroda (sugadinta)"
 msgid "link to %s"
 msgstr "nuoroda Ä¯ %s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "PaieÅ¡kos ir indeksavimo tarnyba Tracker"
diff --git a/po/mk.po b/po/mk.po
index c80300a..23e2d69 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../trackerd.desktop.in.in.h:1
+#: ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr ""
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr ""
 
@@ -290,7 +290,7 @@ msgstr "%s: Ð½ÐµÐ¼Ð° Ð²Ñ?Ñ?ÐºÐ° Ñ?Ð¾ Ð´ÐµÐ¼Ð¾Ð½Ð¾Ñ? Ð½Ð° tracker"
 
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
-msgid "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
 msgstr ""
 "Ð?Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ñ?Ðµ Ñ?Ðµ Ð´ÐµÐºÐ° â??trackerâ?? Ñ?Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ñ?Ð²Ð° Ð¿Ñ?ÐµÐ´ Ð´Ð° Ñ?Ð° Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ð°Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°."
 
@@ -373,29 +373,29 @@ msgstr "%s: Ð½ÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð¸ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¸"
 msgid "%s: file %s not found"
 msgstr "%s: Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°Ñ?Ð° %s Ð½Ðµ Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð´ÐµÐ½Ð°"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid "Directory to exclude from indexing"
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ð¼ ÐºÐ¾Ñ? Ñ?Ðµ Ñ?Ðµ Ð¸Ñ?ÐºÐ»Ñ?Ñ?Ð¸ Ð¾Ð´ Ð¿Ñ?ÐµÐ±Ð°Ñ?Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾"
 
-#: ../src/trackerd/trackerd.c:158 ../src/trackerd/trackerd.c:159
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:158 ../src/tracker-store/tracker-store.c:159
+#: ../src/tracker-store/tracker-store.c:160
 msgid "/PATH/DIR"
 msgstr "/Ð?Ð?Ð¢Ð?Ð?Ð?/Ð?Ð?Ð Ð?Ð?Ð¢Ð?Ð Ð?Ð£Ð?"
 
-#: ../src/trackerd/trackerd.c:159
+#: ../src/tracker-store/tracker-store.c:159
 msgid "Directory to include in indexing"
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ð¼ ÐºÐ¾Ñ? Ñ?Ðµ Ñ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸ Ð²Ð¾ Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð°Ñ?ÐµÑ?Ð¾"
 
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:160
 #, fuzzy
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ð¼ ÐºÐ¾Ñ? Ñ?Ðµ Ñ?Ðµ Ð¸Ñ?ÐºÐ»Ñ?Ñ?Ð¸ Ð¾Ð´ Ð¿Ñ?ÐµÐ±Ð°Ñ?Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾"
 
-#: ../src/trackerd/trackerd.c:161
+#: ../src/tracker-store/tracker-store.c:161
 msgid "Disable any indexing or watching taking place"
 msgstr "Ð?Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ Ð´Ð° Ñ?Ðµ Ñ?Ð»Ñ?Ñ?Ð¸ Ð½Ð°Ð´Ð³Ð»ÐµÐ´Ñ?Ð²Ð°Ñ?Ðµ Ð¸Ð»Ð¸ Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: ../src/trackerd/trackerd.c:162
+#: ../src/tracker-store/tracker-store.c:162
 #, fuzzy
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
@@ -404,11 +404,11 @@ msgstr ""
 "Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? ÐºÐ¾Ñ?Ð° Ð³Ð¾ ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ð¸Ñ?Ð° Ð½Ð¸Ð²Ð¾Ñ?Ð¾ Ð½Ð° Ð»Ð¾Ð³Ð¸Ñ?Ð°Ñ?Ðµ. Ð?Ð°Ð»Ð¸Ð´Ð½Ð¸ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ Ñ?Ðµ 0 "
 "(Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¾ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð¾), 1 (Ð´ÐµÑ?Ð°Ð»Ð½Ð¾) Ð¸ 2 (Ð·Ð° Ð´ÐµÐ±Ð°Ð³Ð¸Ñ?Ð°Ñ?Ðµ)"
 
-#: ../src/trackerd/trackerd.c:162 ../src/trackerd/trackerd.c:163
+#: ../src/tracker-store/tracker-store.c:162 ../src/tracker-store/tracker-store.c:163
 msgid "VALUE"
 msgstr "Ð?Ð Ð?Ð?Ð?Ð?Ð¡Ð¢"
 
-#: ../src/trackerd/trackerd.c:163
+#: ../src/tracker-store/tracker-store.c:163
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-20 (default "
 "0) with lower values increasing indexing speed"
@@ -417,41 +417,41 @@ msgstr ""
 "Ð±Ð¸Ð´Ðµ Ð²Ð¾ Ð¾Ð¿Ñ?ÐµÐ³Ð¾Ñ? Ð¾Ð´ 0-20 (Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¾ 0) Ñ?Ð¾ Ð¿Ð¾Ð½Ð¸Ñ?ÐºÐ¸ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ Ð·Ð° Ð·Ð³Ð¾Ð»ÐµÐ¼ÐµÐ½Ð° "
 "Ð±Ñ?Ð·Ð¸Ð½Ð° Ð½Ð° Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: ../src/trackerd/trackerd.c:164
+#: ../src/tracker-store/tracker-store.c:164
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr ""
 "Ð?Ð° Ð¼Ð¸Ð½Ð¸Ð¼Ð¸Ð·Ð¸Ñ?Ð° Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð°Ñ?Ð° Ð½Ð° Ð¼ÐµÐ¼Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ð°, Ð½Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð³Ð¾ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð¾Ñ? Ð±Ð°Ð²ÐµÐ½"
 
-#: ../src/trackerd/trackerd.c:165
+#: ../src/tracker-store/tracker-store.c:165
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:166
+#: ../src/tracker-store/tracker-store.c:166
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Ð?Ð°Ð·Ð¸ÐºÐ¾Ñ? ÐºÐ¾Ñ? Ñ?Ðµ Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð·Ð° stemmer Ð¸ Ð»Ð¸Ñ?Ñ?Ð°Ñ?Ð° Ñ?Ð¾ Ð·Ð°Ð¿Ñ?ÐµÐ½Ð¸ Ð·Ð±Ð¾Ñ?Ð¾Ð²Ð¸ (ÐºÐ¾Ð´ Ð¾Ð´ 2 "
 "ISO 639-1 Ð·Ð½Ð°Ñ?Ð¸)"
 
-#: ../src/trackerd/trackerd.c:166
+#: ../src/tracker-store/tracker-store.c:166
 msgid "LANG"
 msgstr "Ð?Ð?Ð?Ð?Ð?"
 
-#: ../src/trackerd/trackerd.c:167
+#: ../src/tracker-store/tracker-store.c:167
 msgid "Force a re-index of all content"
 msgstr ""
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2047
+#: ../src/tracker-store/tracker-store.c:2047
 msgid "- start the tracker daemon"
 msgstr "- Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ? Ð³Ð¾ tracker Ð´ÐµÐ¼Ð¾Ð½Ð¾Ñ?"
 
-#: ../src/trackerd/trackerd.c:2048 ../src/trackerd/trackerd.c:2049
+#: ../src/tracker-store/tracker-store.c:2048 ../src/tracker-store/tracker-store.c:2049
 msgid "DIRECTORY"
 msgstr "Ð?Ð?Ð Ð?Ð?Ð¢Ð?Ð Ð?Ð£Ð?"
 
-#: ../src/trackerd/trackerd.c:2056
+#: ../src/tracker-store/tracker-store.c:2056
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
diff --git a/po/nb.po b/po/nb.po
index b4d35ed..24dac82 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2113
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Tracker tjeneste for sÃ¸k og indeksering"
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "_Off"
 msgstr "_Av"
 
-#: ../src/tracker-indexer/tracker-main.c:71 ../src/trackerd/tracker-main.c:123
+#: ../src/tracker-indexer/tracker-main.c:71 ../src/tracker-store/tracker-main.c:123
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1704,44 +1704,44 @@ msgstr ""
 msgid "Fields are missing"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:128
+#: ../src/tracker-store/tracker-main.c:128
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:132
+#: ../src/tracker-store/tracker-main.c:132
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-store/tracker-main.c:136
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:144
+#: ../src/tracker-store/tracker-main.c:144
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:148
+#: ../src/tracker-store/tracker-main.c:148
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:156
+#: ../src/tracker-store/tracker-main.c:156
 msgid "Force a re-index of all content"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:160
+#: ../src/tracker-store/tracker-main.c:160
 msgid "Disable any indexing and monitoring"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:163
+#: ../src/tracker-store/tracker-main.c:163
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -1749,22 +1749,22 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:673
+#: ../src/tracker-store/tracker-main.c:673
 msgid "- start the tracker daemon"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:677
+#: ../src/tracker-store/tracker-main.c:677
 msgid "Daemon Options"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:678
+#: ../src/tracker-store/tracker-main.c:678
 msgid "Show daemon options"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:686
+#: ../src/tracker-store/tracker-main.c:686
 msgid "Indexer Options"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:687
+#: ../src/tracker-store/tracker-main.c:687
 msgid "Show indexer options"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 3570de7..ed582bb 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2236
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Tracker zoek- en indexeringsdienst"
 
@@ -767,12 +767,12 @@ msgid "Control and monitor the Tracker search and indexing service"
 msgstr ""
 
 #: ../src/tracker-extract/tracker-main.c:78
-#: ../src/tracker-indexer/tracker-main.c:79 ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-indexer/tracker-main.c:79 ../src/tracker-store/tracker-main.c:136
 msgid "Displays version information"
 msgstr "Toont versie-informatie"
 
 #: ../src/tracker-extract/tracker-main.c:82
-#: ../src/tracker-indexer/tracker-main.c:83 ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-indexer/tracker-main.c:83 ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -2096,45 +2096,45 @@ msgstr "Vereiste velden"
 msgid "Fields are missing"
 msgstr "Bepaalde verplichte velden ontbreken"
 
-#: ../src/trackerd/tracker-main.c:145
+#: ../src/tracker-store/tracker-main.c:145
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:149
+#: ../src/tracker-store/tracker-main.c:149
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Verminderd het geheugengebruik maar kan het indexeren vertragen"
 
-#: ../src/trackerd/tracker-main.c:153
+#: ../src/tracker-store/tracker-main.c:153
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:157
+#: ../src/tracker-store/tracker-main.c:157
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:161
+#: ../src/tracker-store/tracker-main.c:161
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:165
+#: ../src/tracker-store/tracker-main.c:165
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:171
+#: ../src/tracker-store/tracker-main.c:171
 msgid "Force a re-index of all content"
 msgstr "Dwing een herindexering van alle data af"
 
-#: ../src/trackerd/tracker-main.c:175
+#: ../src/tracker-store/tracker-main.c:175
 #, fuzzy
 msgid "Disable any indexing and monitoring"
 msgstr "Schakel alle indexerings- en controleprocessen uit"
 
-#: ../src/trackerd/tracker-main.c:178
+#: ../src/tracker-store/tracker-main.c:178
 #, fuzzy
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
@@ -2145,7 +2145,7 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:878
+#: ../src/tracker-store/tracker-main.c:878
 msgid "- start the tracker daemon"
 msgstr "- start de tracker daemon"
 
@@ -2165,8 +2165,8 @@ msgstr "- start de tracker daemon"
 #~ msgid "%s: no connection to tracker daemon"
 #~ msgstr "%s: geen verbinding met tracker daemon"
 
-#~ msgid "Ensure \"trackerd\" is running before launch this command."
-#~ msgstr "Controleer dat \"trackerd\" draait voordat u dit commando gebruikt."
+#~ msgid "Ensure \"tracker-store\" is running before launch this command."
+#~ msgstr "Controleer dat \"tracker-store\" draait voordat u dit commando gebruikt."
 
 #~ msgid "%s: internal tracker error: %s"
 #~ msgstr "%s: interne tracker fout: %s"
diff --git a/po/oc.po b/po/oc.po
index f020fd4..dbca07e 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -417,7 +417,7 @@ msgstr ""
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
 msgstr ""
 
 #: ../src/libtracker/tracker-search.c:147
@@ -500,79 +500,79 @@ msgstr ""
 msgid "%s: file %s not found"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:120
+#: ../src/tracker-store/tracker-store.c:120
 msgid "Directory to exclude from indexing"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:120 ../src/trackerd/trackerd.c:121
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:120 ../src/tracker-store/tracker-store.c:121
+#: ../src/tracker-store/tracker-store.c:122
 msgid "/PATH/DIR"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:121
+#: ../src/tracker-store/tracker-store.c:121
 msgid "Directory to include in indexing"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:122
 msgid "Directory to crawl for indexing at start up only"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:123
+#: ../src/tracker-store/tracker-store.c:123
 msgid "Disable any indexing or watching taking place"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:124
+#: ../src/tracker-store/tracker-store.c:124
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:124 ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:124 ../src/tracker-store/tracker-store.c:125
 msgid "VALUE"
 msgstr "VALOR"
 
-#: ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:125
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:126
+#: ../src/tracker-store/tracker-store.c:126
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:127
+#: ../src/tracker-store/tracker-store.c:127
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid "LANG"
 msgstr "LENGA"
 
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:129
 msgid "Force a re-index of all content"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:130
+#: ../src/tracker-store/tracker-store.c:130
 msgid "Make tracker errors fatal"
 msgstr ""
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:668
+#: ../src/tracker-store/tracker-store.c:668
 msgid "- start the tracker daemon"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:669 ../src/trackerd/trackerd.c:670
+#: ../src/tracker-store/tracker-store.c:669 ../src/tracker-store/tracker-store.c:670
 msgid "DIRECTORY"
 msgstr "REPERTÃ?RI"
 
-#: ../src/trackerd/trackerd.c:677
+#: ../src/tracker-store/tracker-store.c:677
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -719,7 +719,7 @@ msgstr "_A prepaus"
 msgid "_Quit"
 msgstr "_Sortir"
 
-#: ../src/tracker-applet/tracker-applet.c:1997 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1997 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1411,7 +1411,7 @@ msgstr "ligam (copat)"
 msgid "link to %s"
 msgstr ""
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index b6c32f3..1c050d3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -444,8 +444,8 @@ msgstr "%s: brak poÅ?Ä?czenia z usÅ?ugÄ? tracker"
 #: ../src/libtracker/tracker-status.c:48
 #: ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "ProszÄ? siÄ? upewniÄ?, Å¼e \"trackerd\" dziaÅ?a przed uruchomieniem tego polecenia."
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "ProszÄ? siÄ? upewniÄ?, Å¼e \"tracker-store\" dziaÅ?a przed uruchomieniem tego polecenia."
 
 #: ../src/libtracker/tracker-search.c:147
 #, c-format
@@ -531,77 +531,77 @@ msgstr "%s: niepoprawne argumenty"
 msgid "%s: file %s not found"
 msgstr "%s: plik %s nie zostaÅ? odnaleziony"
 
-#: ../src/trackerd/trackerd.c:120
+#: ../src/tracker-store/tracker-store.c:120
 msgid "Directory to exclude from indexing"
 msgstr "Katalog do wykluczenia z indeksowania"
 
-#: ../src/trackerd/trackerd.c:120
-#: ../src/trackerd/trackerd.c:121
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:120
+#: ../src/tracker-store/tracker-store.c:121
+#: ../src/tracker-store/tracker-store.c:122
 msgid "/PATH/DIR"
 msgstr "/Å?CIEÅ»KA/KATALOG"
 
-#: ../src/trackerd/trackerd.c:121
+#: ../src/tracker-store/tracker-store.c:121
 msgid "Directory to include in indexing"
 msgstr "Katalog do wÅ?Ä?czenia do indeksowania"
 
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:122
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Katalog, ktÃ³ry ma zostaÄ? zindeksowany tylko podczas uruchamiania"
 
-#: ../src/trackerd/trackerd.c:123
+#: ../src/tracker-store/tracker-store.c:123
 msgid "Disable any indexing or watching taking place"
 msgstr "WyÅ?Ä?czenie bieÅ¼Ä?cego indeksowania i obserwowania"
 
-#: ../src/trackerd/trackerd.c:124
+#: ../src/tracker-store/tracker-store.c:124
 msgid "Value that controls the level of logging. Valid values are 0 (displays/logs only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
 msgstr "WartoÅ?Ä? sterujÄ?ca poziomem szczegÃ³Å?owoÅ?ci dziennika. Poprawne wartoÅ?ci to 0 (wyÅ?wietlanie/zapisywanie wyÅ?Ä?cznie bÅ?Ä?dÃ³w), 1 (minimalny), 2 (szczegÃ³Å?owy) i 3 (do debugowania) "
 
-#: ../src/trackerd/trackerd.c:124
-#: ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:124
+#: ../src/tracker-store/tracker-store.c:125
 msgid "VALUE"
 msgstr "WARTOÅ?Ä?"
 
-#: ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:125
 msgid "Value to use for throttling indexing. Value must be in range 0-99 (default 0) with lower values increasing indexing speed"
 msgstr "WartoÅ?Ä? uÅ¼ywana do zmiany prÄ?dkoÅ?ci indeksowania. WartoÅ?Ä? musi znajdowaÄ? siÄ? w zakresie 0-99 (domyÅ?lnie 0), przy czym niÅ¼sze wartoÅ?ci zwiÄ?kszajÄ? prÄ?dkoÅ?Ä? indeksowania"
 
-#: ../src/trackerd/trackerd.c:126
+#: ../src/tracker-store/tracker-store.c:126
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Zmniejsza uÅ¼ycie pamiÄ?ci, ale moÅ¼e spowolniÄ? indeksowanie"
 
-#: ../src/trackerd/trackerd.c:127
+#: ../src/tracker-store/tracker-store.c:127
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "PoczÄ?tkowy okres bezczynnoÅ?ci, tuÅ¼ przed indeksowaniem, w sekundach"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr "JÄ?zyk uÅ¼ywany dla listy wyrazÃ³w wystÄ?pujÄ?cych najczÄ?Å?ciej, a nie wnoszÄ?cych nic do treÅ?ci (\"stopwords\") oraz dla listy rdzeni pozbawionych przedrostkÃ³w i przyrostkÃ³w - \"stemmer words\"  (dwuznakowy kod ISO 639-1)"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid "LANG"
 msgstr "JÄ?ZYK"
 
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:129
 msgid "Force a re-index of all content"
 msgstr "Wymuszenie ponownego zindeksowania caÅ?ej zawartoÅ?ci"
 
-#: ../src/trackerd/trackerd.c:130
+#: ../src/tracker-store/tracker-store.c:130
 msgid "Make tracker errors fatal"
 msgstr "BÅ?Ä?dy tracker jako bÅ?Ä?dy powaÅ¼ne"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:664
+#: ../src/tracker-store/tracker-store.c:664
 msgid "- start the tracker daemon"
 msgstr "- uruchomienie usÅ?ugi tracker"
 
-#: ../src/trackerd/trackerd.c:665
-#: ../src/trackerd/trackerd.c:666
+#: ../src/tracker-store/tracker-store.c:665
+#: ../src/tracker-store/tracker-store.c:666
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: ../src/trackerd/trackerd.c:673
+#: ../src/tracker-store/tracker-store.c:673
 msgid "To include or exclude multiple directories at the same time, join multiple options like:"
 msgstr "Aby doÅ?Ä?czyÄ? lub wyÅ?Ä?czyÄ? wiÄ?cej niÅ¼ jeden katalog w tym samym czasie, naleÅ¼y poÅ?Ä?czyÄ? opcje:"
 
@@ -735,7 +735,7 @@ msgid "_Quit"
 msgstr "_ZakoÅ?cz"
 
 #: ../src/tracker-applet/tracker-applet.c:1997
-#: ../trackerd.desktop.in.in.h:1
+#: ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1431,7 +1431,7 @@ msgstr "odnoÅ?nik (uszkodzony)"
 msgid "link to %s"
 msgstr "odnoÅ?nik do %s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "UsÅ?uga indeksowania i wyszukiwania Tracker"
 
diff --git a/po/pt.po b/po/pt.po
index 6538349..70c3f30 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2224
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "ServiÃ§o de procura e indexaÃ§Ã£o Tracker"
 
@@ -749,7 +749,7 @@ msgid "Control and monitor the Tracker search and indexing service"
 msgstr "Controlo e monitorizaÃ§Ã£o dos serviÃ§os de procura e indexaÃ§Ã£o Tracker"
 
 #: ../src/tracker-extract/tracker-main.c:70
-#: ../src/tracker-indexer/tracker-main.c:80 ../src/trackerd/tracker-main.c:134
+#: ../src/tracker-indexer/tracker-main.c:80 ../src/tracker-store/tracker-main.c:134
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1955,17 +1955,17 @@ msgstr "Campos necessÃ¡rios"
 msgid "Fields are missing"
 msgstr "Faltam campos"
 
-#: ../src/trackerd/tracker-main.c:139
+#: ../src/tracker-store/tracker-main.c:139
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 "Segundos a aguardar antes de comeÃ§ar a registar ou a indexar (omissÃ£o = 45)"
 
-#: ../src/trackerd/tracker-main.c:143
+#: ../src/tracker-store/tracker-main.c:143
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr ""
 "Minimiza a utilizaÃ§Ã£o de memÃ³ria mas pode diminuir a velocidade de indexaÃ§Ã£o"
 
-#: ../src/trackerd/tracker-main.c:147
+#: ../src/tracker-store/tracker-main.c:147
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
@@ -1973,7 +1973,7 @@ msgstr ""
 "DirectÃ³rios a excluir da monitorizaÃ§Ã£o de alteraÃ§Ã£o de ficheiros (pode fazer -"
 "e <caminho> -e <caminho>)"
 
-#: ../src/trackerd/tracker-main.c:151
+#: ../src/tracker-store/tracker-main.c:151
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
@@ -1981,27 +1981,27 @@ msgstr ""
 "DirectÃ³rios a incluir na monitorizaÃ§Ã£o de alteraÃ§Ã£o de ficheiros (pode fazer -"
 "i <caminho> -i <caminho>)"
 
-#: ../src/trackerd/tracker-main.c:155
+#: ../src/tracker-store/tracker-main.c:155
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 "DirectÃ³rios a registar para indexar ficheiros (pode fazer -c <caminho> -c "
 "<caminho>)"
 
-#: ../src/trackerd/tracker-main.c:159
+#: ../src/tracker-store/tracker-main.c:159
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 "MÃ³dulos desactivados do processamento (pode fazer -d <mÃ³dulo> -d <mÃ³dulo>)"
 
-#: ../src/trackerd/tracker-main.c:167
+#: ../src/tracker-store/tracker-main.c:167
 msgid "Force a re-index of all content"
 msgstr "ForÃ§ar a reindexaÃ§Ã£o de todo o conteÃºdo"
 
-#: ../src/trackerd/tracker-main.c:171
+#: ../src/tracker-store/tracker-main.c:171
 msgid "Disable any indexing and monitoring"
 msgstr "Desactivar quaisquer indexaÃ§Ãµes ou observaÃ§Ãµes a decorrer"
 
-#: ../src/trackerd/tracker-main.c:174
+#: ../src/tracker-store/tracker-main.c:174
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -2011,23 +2011,23 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:912
+#: ../src/tracker-store/tracker-main.c:912
 msgid "- start the tracker daemon"
 msgstr "- iniciar o serviÃ§o tracker"
 
-#: ../src/trackerd/tracker-main.c:916
+#: ../src/tracker-store/tracker-main.c:916
 msgid "Daemon Options"
 msgstr "OpÃ§Ãµes do ServiÃ§o"
 
-#: ../src/trackerd/tracker-main.c:917
+#: ../src/tracker-store/tracker-main.c:917
 msgid "Show daemon options"
 msgstr "Mostrar as opÃ§Ãµes do serviÃ§o"
 
-#: ../src/trackerd/tracker-main.c:925
+#: ../src/tracker-store/tracker-main.c:925
 msgid "Indexer Options"
 msgstr "OpÃ§Ãµes do Indexador"
 
-#: ../src/trackerd/tracker-main.c:926
+#: ../src/tracker-store/tracker-main.c:926
 msgid "Show indexer options"
 msgstr "Mostrar as opÃ§Ãµes do indexador"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d338656..d33d147 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,12 +21,12 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2113
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "ServiÃ§o de Pesquisa e IndexaÃ§Ã£o Tracker"
 
@@ -710,7 +710,7 @@ msgstr ""
 msgid "Here are some examples of how to use this command:"
 msgstr "Aqui estÃ£o alguns exemplos de como usar este comando:"
 
-#: ../src/tracker-indexer/tracker-main.c:72 ../src/trackerd/tracker-main.c:123
+#: ../src/tracker-indexer/tracker-main.c:72 ../src/tracker-store/tracker-main.c:123
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1780,17 +1780,17 @@ msgstr "Campos requeridos"
 msgid "Fields are missing"
 msgstr "EstÃ£o faltando campos"
 
-#: ../src/trackerd/tracker-main.c:128
+#: ../src/tracker-store/tracker-main.c:128
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 "Segundos a esperar antes de iniciar qualquer rastreamento ou indexaÃ§Ã£o "
 "(padrÃ£o = 45)"
 
-#: ../src/trackerd/tracker-main.c:132
+#: ../src/tracker-store/tracker-main.c:132
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimiza o uso de memÃ³ria, mas pode diminuir a velocidade de indexaÃ§Ã£o"
 
-#: ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-store/tracker-main.c:136
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
@@ -1798,7 +1798,7 @@ msgstr ""
 "DiretÃ³rios a excluir para a monitoraÃ§Ã£o de mudanÃ§as em arquivos (vocÃª pode "
 "digitar -e <caminho> -e <caminho>)"
 
-#: ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
@@ -1806,28 +1806,28 @@ msgstr ""
 "DiretÃ³rios a incluir para a monitoraÃ§Ã£o de alteraÃ§Ãµes em arquivos (vocÃª pode "
 "digitar -i <caminho> -i <caminho>)"
 
-#: ../src/trackerd/tracker-main.c:144
+#: ../src/tracker-store/tracker-main.c:144
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 "DiretÃ³rios a rastrear para arquivos de Ãndice (vocÃª pode digitar -c "
 "<caminho> -c <caminho>"
 
-#: ../src/trackerd/tracker-main.c:148
+#: ../src/tracker-store/tracker-main.c:148
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 "Desabilitar mÃ³dulos de serem processados (vocÃª pode digitar -d <mÃ³dulo> -d "
 "<mÃ³dulo>)"
 
-#: ../src/trackerd/tracker-main.c:156
+#: ../src/tracker-store/tracker-main.c:156
 msgid "Force a re-index of all content"
 msgstr "ForÃ§ar a reindexaÃ§Ã£o de todo o conteÃºdo"
 
-#: ../src/trackerd/tracker-main.c:160
+#: ../src/tracker-store/tracker-main.c:160
 msgid "Disable any indexing and monitoring"
 msgstr "Desabilitar qualquer indexaÃ§Ã£o e monitoramento"
 
-#: ../src/trackerd/tracker-main.c:163
+#: ../src/tracker-store/tracker-main.c:163
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -1837,23 +1837,23 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:673
+#: ../src/tracker-store/tracker-main.c:673
 msgid "- start the tracker daemon"
 msgstr "- inicia o serviÃ§o tracker"
 
-#: ../src/trackerd/tracker-main.c:677
+#: ../src/tracker-store/tracker-main.c:677
 msgid "Daemon Options"
 msgstr "OpÃ§Ãµes do daemon"
 
-#: ../src/trackerd/tracker-main.c:678
+#: ../src/tracker-store/tracker-main.c:678
 msgid "Show daemon options"
 msgstr "Mostra as opÃ§Ãµes do serviÃ§o"
 
-#: ../src/trackerd/tracker-main.c:686
+#: ../src/tracker-store/tracker-main.c:686
 msgid "Indexer Options"
 msgstr "OpÃ§Ãµes do indexador"
 
-#: ../src/trackerd/tracker-main.c:687
+#: ../src/tracker-store/tracker-main.c:687
 msgid "Show indexer options"
 msgstr "Mostra as opÃ§Ãµes do indexador"
 
@@ -1876,9 +1876,9 @@ msgstr "Mostra as opÃ§Ãµes do indexador"
 #~ msgid "%s: no connection to tracker daemon"
 #~ msgstr "%s: sem conexÃ£o com o serviÃ§o tracker"
 
-#~ msgid "Ensure \"trackerd\" is running before launch this command."
+#~ msgid "Ensure \"tracker-store\" is running before launch this command."
 #~ msgstr ""
-#~ "Certifique-se de que o \"trackerd\" esteja sendo executado antes de "
+#~ "Certifique-se de que o \"tracker-store\" esteja sendo executado antes de "
 #~ "chamar este comando."
 
 #~ msgid "%s: internal tracker error: %s"
diff --git a/po/ru.po b/po/ru.po
index 7bfa84d..f5d4648 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -19,11 +19,11 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../trackerd.desktop.in.in.h:1
+#: ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr ""
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Ð¡Ð»Ñ?Ð¶Ð±Ð° Ð¿Ð¾Ð¸Ñ?ÐºÐ° Ð¸ Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Tracker"
 
@@ -294,9 +294,9 @@ msgstr "%s: Ð½ÐµÑ? Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ? Ñ? Ð´ÐµÐ¼Ð¾Ð½Ð¾Ð¼ tracker"
 
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
-msgid "Ensure \"trackerd\" is running before launch this command."
+msgid "Ensure \"tracker-store\" is running before launch this command."
 msgstr ""
-"Ð?Ñ?ÐµÐ¶Ð´Ðµ, Ñ?ÐµÐ¼ Ð²Ñ?Ð¿Ð¾Ð»Ð½Ñ?Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ?, Ñ?Ð±ÐµÐ´Ð¸Ñ?ÐµÑ?Ñ?, Ñ?Ñ?Ð¾ Ð·Ð°Ð¿Ñ?Ñ?ÐµÐ½ Â«trackerdÂ»."
+"Ð?Ñ?ÐµÐ¶Ð´Ðµ, Ñ?ÐµÐ¼ Ð²Ñ?Ð¿Ð¾Ð»Ð½Ñ?Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ?, Ñ?Ð±ÐµÐ´Ð¸Ñ?ÐµÑ?Ñ?, Ñ?Ñ?Ð¾ Ð·Ð°Ð¿Ñ?Ñ?ÐµÐ½ Â«tracker-storeÂ»."
 
 #: ../src/libtracker/tracker-search.c:147
 msgid "Service not recognized, searching in Other Files...\n"
@@ -377,29 +377,29 @@ msgstr "%s: Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ñ?"
 msgid "%s: file %s not found"
 msgstr "%s: Ñ?Ð°Ð¹Ð» %s Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid "Directory to exclude from indexing"
 msgstr "Ð?Ð°Ñ?Ð°Ð»Ð¾Ð³ Ð´Ð»Ñ? Ð¸Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¸Ð· Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../src/trackerd/trackerd.c:158 ../src/trackerd/trackerd.c:159
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:158 ../src/tracker-store/tracker-store.c:159
+#: ../src/tracker-store/tracker-store.c:160
 msgid "/PATH/DIR"
 msgstr "/Ð?Ð£Ð¢Ð¬/Ð?Ð?Ð¢"
 
-#: ../src/trackerd/trackerd.c:159
+#: ../src/tracker-store/tracker-store.c:159
 msgid "Directory to include in indexing"
 msgstr "Ð?Ð°Ñ?Ð°Ð»Ð¾Ð³ Ð´Ð»Ñ? Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð² Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:160
 #, fuzzy
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Ð?Ð°Ñ?Ð°Ð»Ð¾Ð³ Ð´Ð»Ñ? Ð¸Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¸Ð· Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../src/trackerd/trackerd.c:161
+#: ../src/tracker-store/tracker-store.c:161
 msgid "Disable any indexing or watching taking place"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð²Ñ?Ñ? Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¸ Ð½Ð°Ð±Ð»Ñ?Ð´ÐµÐ½Ð¸Ðµ"
 
-#: ../src/trackerd/trackerd.c:162
+#: ../src/tracker-store/tracker-store.c:162
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -407,11 +407,11 @@ msgstr ""
 "Ð?Ð½Ð°Ñ?ÐµÐ½Ð¸Ðµ, Ñ?ÐºÐ°Ð·Ñ?Ð²Ð°Ñ?Ñ?ÐµÐµ Ñ?Ñ?Ð¾Ð²ÐµÐ½Ñ? Ð¿Ð¾Ð´Ñ?Ð¾Ð±Ð½Ð¾Ñ?Ñ?Ð¸ Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?. Ð?Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ðµ "
 "Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ?: 0 (Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»Ñ?Ð½Ð¾, Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?), 1 (Ð¿Ð¾Ð´Ñ?Ð¾Ð±Ð½Ð¾) Ð¸ 2 (Ð´Ð»Ñ? Ð¾Ñ?Ð»Ð°Ð´ÐºÐ¸)"
 
-#: ../src/trackerd/trackerd.c:162 ../src/trackerd/trackerd.c:163
+#: ../src/tracker-store/tracker-store.c:162 ../src/tracker-store/tracker-store.c:163
 msgid "VALUE"
 msgstr "Ð?Ð?Ð?Ð§Ð?Ð?Ð?Ð?"
 
-#: ../src/trackerd/trackerd.c:163
+#: ../src/tracker-store/tracker-store.c:163
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-20 (default "
 "0) with lower values increasing indexing speed"
@@ -419,40 +419,40 @@ msgstr ""
 "Ð?Ð³Ñ?Ð°Ð½Ð¸Ñ?ÐµÐ½Ð¸Ðµ Ñ?ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ð¸ Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?. Ð?Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ?Ñ?Ñ? Ð² Ð¸Ð½Ñ?ÐµÑ?Ð²Ð°Ð»Ðµ 0â??20 (Ð¿Ð¾ "
 "Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? â?? 0); Ñ?ÐµÐ¼ Ð¼ÐµÐ½Ñ?Ñ?Ðµ Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ðµ, Ñ?ÐµÐ¼ Ð²Ñ?Ñ?Ðµ Ñ?ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ñ? Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../src/trackerd/trackerd.c:164
+#: ../src/tracker-store/tracker-store.c:164
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Ð£Ð¼ÐµÐ½Ñ?Ñ?Ð°ÐµÑ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð°Ð¼Ñ?Ñ?Ð¸, Ð½Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð·Ð°Ð¼ÐµÐ´Ð»Ð¸Ñ?Ñ? Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
-#: ../src/trackerd/trackerd.c:165
+#: ../src/tracker-store/tracker-store.c:165
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "Ð?Ð°Ñ?Ð·Ð° Ð¿ÐµÑ?ÐµÐ´ Ð½Ð°Ñ?Ð°Ð»Ð¾Ð¼ Ð¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?, Ð² Ñ?ÐµÐºÑ?Ð½Ð´Ð°Ñ?"
 
-#: ../src/trackerd/trackerd.c:166
+#: ../src/tracker-store/tracker-store.c:166
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 "Ð¯Ð·Ñ?Ðº Ð´Ð»Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð² ÐºÐ¾Ñ?Ð½ÐµÐ¹ Ð¸ Ñ?Ñ?Ð¾Ð¿Ð¾Ð²Ñ?Ñ? Ñ?Ð»Ð¾Ð² (Ð´Ð²Ñ?Ñ?Ð±Ñ?ÐºÐ²ÐµÐ½Ð½Ñ?Ð¹ ÐºÐ¾Ð´ Ñ?Ð¾Ð³Ð»Ð°Ñ?Ð½Ð¾ ISO 639-"
 "1)"
 
-#: ../src/trackerd/trackerd.c:166
+#: ../src/tracker-store/tracker-store.c:166
 msgid "LANG"
 msgstr "Ð¯Ð?Ð«Ð?"
 
-#: ../src/trackerd/trackerd.c:167
+#: ../src/tracker-store/tracker-store.c:167
 msgid "Force a re-index of all content"
 msgstr "Ð?Ñ?Ð¸Ð½Ñ?Ð´Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾ Ð¿ÐµÑ?ÐµÐ¸Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð²Ñ?Ñ?"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2047
+#: ../src/tracker-store/tracker-store.c:2047
 msgid "- start the tracker daemon"
 msgstr "- Ð·Ð°Ð¿Ñ?Ñ?Ðº Ð´ÐµÐ¼Ð¾Ð½Ð° Tracker"
 
-#: ../src/trackerd/trackerd.c:2048 ../src/trackerd/trackerd.c:2049
+#: ../src/tracker-store/tracker-store.c:2048 ../src/tracker-store/tracker-store.c:2049
 msgid "DIRECTORY"
 msgstr "Ð?Ð?Ð¢Ð?Ð?Ð?Ð?"
 
-#: ../src/trackerd/trackerd.c:2056
+#: ../src/tracker-store/tracker-store.c:2056
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
diff --git a/po/sk.po b/po/sk.po
index fb1b0aa..9ccdc0e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2183
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "SluÅ¾ba Tracker na hÄ¾adanie a indexovanie"
 
@@ -695,7 +695,7 @@ msgstr "%s: nesprÃ¡vne parametre"
 msgid " - Reading filename/mime-type pairs from STDIN"
 msgstr ""
 
-#: ../src/tracker-indexer/tracker-main.c:75 ../src/trackerd/tracker-main.c:127
+#: ../src/tracker-indexer/tracker-main.c:75 ../src/tracker-store/tracker-main.c:127
 msgid ""
 "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
 "0)"
@@ -1751,44 +1751,44 @@ msgstr ""
 msgid "Fields are missing"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:132
+#: ../src/tracker-store/tracker-main.c:132
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:136
+#: ../src/tracker-store/tracker-main.c:136
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimalizuje vyuÅ¾itie pamÃ¤te, ale mÃ´Å¾e spomaliÅ¥ indexovanie"
 
-#: ../src/trackerd/tracker-main.c:140
+#: ../src/tracker-store/tracker-main.c:140
 msgid ""
 "Directories to exclude for file change monitoring (you can do -e <path> -e "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:144
+#: ../src/tracker-store/tracker-main.c:144
 msgid ""
 "Directories to include for file change monitoring (you can do -i <path> -i "
 "<path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:148
+#: ../src/tracker-store/tracker-main.c:148
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:152
+#: ../src/tracker-store/tracker-main.c:152
 msgid ""
 "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr ""
 
-#: ../src/trackerd/tracker-main.c:160
+#: ../src/tracker-store/tracker-main.c:160
 msgid "Force a re-index of all content"
 msgstr "VynÃºtiÅ¥ preindexovanie vÅ¡etkÃ©ho obsahu"
 
-#: ../src/trackerd/tracker-main.c:164
+#: ../src/tracker-store/tracker-main.c:164
 msgid "Disable any indexing and monitoring"
 msgstr "ZakÃ¡zaÅ¥ akÃ©koÄ¾vek indexovanie a sledovanie"
 
-#: ../src/trackerd/tracker-main.c:167
+#: ../src/tracker-store/tracker-main.c:167
 msgid ""
 "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr ""
@@ -1796,23 +1796,23 @@ msgstr ""
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:906
+#: ../src/tracker-store/tracker-main.c:906
 msgid "- start the tracker daemon"
 msgstr "- spustiÅ¥ tracker daemon"
 
-#: ../src/trackerd/tracker-main.c:910
+#: ../src/tracker-store/tracker-main.c:910
 msgid "Daemon Options"
 msgstr "Daemon voÄ¾by"
 
-#: ../src/trackerd/tracker-main.c:911
+#: ../src/tracker-store/tracker-main.c:911
 msgid "Show daemon options"
 msgstr "ZobraziÅ¥ voÄ¾by deamon"
 
-#: ../src/trackerd/tracker-main.c:919
+#: ../src/tracker-store/tracker-main.c:919
 msgid "Indexer Options"
 msgstr "Nastavenia indexovania"
 
-#: ../src/trackerd/tracker-main.c:920
+#: ../src/tracker-store/tracker-main.c:920
 msgid "Show indexer options"
 msgstr "ZobraziÅ¥ voÄ¾by indexovania"
 
@@ -1884,8 +1884,8 @@ msgstr "ZobraziÅ¥ voÄ¾by indexovania"
 #~ msgid "%s: no connection to tracker daemon"
 #~ msgstr "%s: Å¾iadne pripojenie k tracker daemon"
 
-#~ msgid "Ensure \"trackerd\" is running before launch this command."
-#~ msgstr "Zaistite pred spustenÃm tohto prÃkazu Ä?i beÅ¾Ã \"trackerd\"."
+#~ msgid "Ensure \"tracker-store\" is running before launch this command."
+#~ msgstr "Zaistite pred spustenÃm tohto prÃkazu Ä?i beÅ¾Ã \"tracker-store\"."
 
 #~ msgid "%s: internal tracker error: %s"
 #~ msgstr "%s: vnÃºtornÃ¡ tracker chyba: %s"
diff --git a/po/sl.po b/po/sl.po
index cc228d4..6b8f991 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -19,11 +19,11 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 "X-Poedit-Language: Slovenian\n"
 
-#: ../trackerd.desktop.in.in.h:1
+#: ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr ""
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr ""
 
@@ -291,8 +291,8 @@ msgstr "%s: ni povezave z demonom tracker"
 
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "Pred zagonom tega ukaza poskrbite, da \"trackerd\" teÄ?e."
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "Pred zagonom tega ukaza poskrbite, da \"tracker-store\" teÄ?e."
 
 #: ../src/libtracker/tracker-search.c:147
 msgid "Service not recognized, searching in Other Files...\n"
@@ -373,29 +373,29 @@ msgstr "%s: neveljavni argumenti"
 msgid "%s: file %s not found"
 msgstr "%s: datoteka %s ni bila najdena"
 
-#: ../src/trackerd/trackerd.c:158
+#: ../src/tracker-store/tracker-store.c:158
 msgid "Directory to exclude from indexing"
 msgstr "Imeniki, izloÄ?eni iz indeksiranja"
 
-#: ../src/trackerd/trackerd.c:158 ../src/trackerd/trackerd.c:159
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:158 ../src/tracker-store/tracker-store.c:159
+#: ../src/tracker-store/tracker-store.c:160
 msgid "/PATH/DIR"
 msgstr "/POT/IMENIK"
 
-#: ../src/trackerd/trackerd.c:159
+#: ../src/tracker-store/tracker-store.c:159
 msgid "Directory to include in indexing"
 msgstr "Imenik, ki naj se vkljuÄ?i v indeksiranje"
 
-#: ../src/trackerd/trackerd.c:160
+#: ../src/tracker-store/tracker-store.c:160
 #, fuzzy
 msgid "Directory to crawl for indexing at start up only"
 msgstr "Imeniki, izloÄ?eni iz indeksiranja"
 
-#: ../src/trackerd/trackerd.c:161
+#: ../src/tracker-store/tracker-store.c:161
 msgid "Disable any indexing or watching taking place"
 msgstr "OnemogoÄ?i kakrÅ¡nokoli indeksiranje ali opazovanje"
 
-#: ../src/trackerd/trackerd.c:162
+#: ../src/tracker-store/tracker-store.c:162
 #, fuzzy
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
@@ -404,11 +404,11 @@ msgstr ""
 "Vrednost, ki nadzoruje stopnjo beleÅ¾enja. Veljavne vrednosti so 0 (privzeto "
 "najmanj), 1 (podrobno) in 2 (razhroÅ¡Ä?evanje)"
 
-#: ../src/trackerd/trackerd.c:162 ../src/trackerd/trackerd.c:163
+#: ../src/tracker-store/tracker-store.c:162 ../src/tracker-store/tracker-store.c:163
 msgid "VALUE"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:163
+#: ../src/tracker-store/tracker-store.c:163
 #, fuzzy
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-20 (default "
@@ -417,38 +417,38 @@ msgstr ""
 "Vrednost za oslabljenje indeksiranja. Vrednost mora biti v rangu 0-20 "
 "(privzeto 0), kjer manjÅ¡e vrednosti pomenijo veÄ?jo hitrost indeksiranja."
 
-#: ../src/trackerd/trackerd.c:164
+#: ../src/tracker-store/tracker-store.c:164
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "ZmanjÅ¡a porabo pomnilnika, vendar lahko upoÄ?asni indeksiranje"
 
-#: ../src/trackerd/trackerd.c:165
+#: ../src/tracker-store/tracker-store.c:165
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:166
+#: ../src/tracker-store/tracker-store.c:166
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr ""
 
-#: ../src/trackerd/trackerd.c:166
+#: ../src/tracker-store/tracker-store.c:166
 msgid "LANG"
 msgstr "JEZIK"
 
-#: ../src/trackerd/trackerd.c:167
+#: ../src/tracker-store/tracker-store.c:167
 msgid "Force a re-index of all content"
 msgstr ""
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:2047
+#: ../src/tracker-store/tracker-store.c:2047
 msgid "- start the tracker daemon"
 msgstr "- zaÅ¾ene demona tracker"
 
-#: ../src/trackerd/trackerd.c:2048 ../src/trackerd/trackerd.c:2049
+#: ../src/tracker-store/tracker-store.c:2048 ../src/tracker-store/tracker-store.c:2049
 msgid "DIRECTORY"
 msgstr "IMENIK"
 
-#: ../src/trackerd/trackerd.c:2056
+#: ../src/tracker-store/tracker-store.c:2056
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
diff --git a/po/sv.po b/po/sv.po
index 550715d..be6a988 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
 #: ../src/tracker-applet/tracker-applet.c:2327
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../data/trackerd.desktop.in.in.h:2
+#: ../data/tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "SÃ¶k- och indexeringstjÃ¤nsten Tracker"
 
@@ -727,13 +727,13 @@ msgstr "Styr och Ã¶vervaka sÃ¶k- och indexeringstjÃ¤nsten Tracker"
 
 #: ../src/tracker-extract/tracker-main.c:81
 #: ../src/tracker-indexer/tracker-main.c:85
-#: ../src/trackerd/tracker-main.c:138
+#: ../src/tracker-store/tracker-main.c:138
 msgid "Displays version information"
 msgstr "Visar versionsinformation"
 
 #: ../src/tracker-extract/tracker-main.c:85
 #: ../src/tracker-indexer/tracker-main.c:89
-#: ../src/trackerd/tracker-main.c:142
+#: ../src/tracker-store/tracker-main.c:142
 msgid "Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = 0)"
 msgstr "Loggning, 0 = endast fel, 1 = minimalt, 2 = detaljerat samt 3 = felsÃ¶kning (standard = 0)"
 
@@ -1752,46 +1752,46 @@ msgstr "Kunde inte sÃ¶ka i taggar"
 msgid "NOTE: Limit was reached, there are more items in the database not listed here"
 msgstr "OBSERVERA: GrÃ¤ns nÃ¥ddes, det finns fler objekt i databasen som inte listas hÃ¤r"
 
-#: ../src/trackerd/tracker-main.c:147
+#: ../src/tracker-store/tracker-main.c:147
 msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
 msgstr "Sekunder att vÃ¤nta innan en insamling eller indexering (standard = 45)"
 
-#: ../src/trackerd/tracker-main.c:151
+#: ../src/tracker-store/tracker-main.c:151
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "Minimerar minnesanvÃ¤ndningen men kan gÃ¶ra indexeringen lÃ¥ngsammare"
 
-#: ../src/trackerd/tracker-main.c:155
+#: ../src/tracker-store/tracker-main.c:155
 msgid "Directories to exclude for file change monitoring (you can do -e <path> -e <path>)"
 msgstr "Kataloger att undanta fÃ¶r filÃ¤ndringsÃ¶vervakning (du kan anvÃ¤nda -e <sÃ¶kvÃ¤g> -e <sÃ¶kvÃ¤g>)"
 
-#: ../src/trackerd/tracker-main.c:159
+#: ../src/tracker-store/tracker-main.c:159
 msgid "Directories to include for file change monitoring (you can do -i <path> -i <path>)"
 msgstr "Kataloger att inkludera fÃ¶r filÃ¤ndringsÃ¶vervakning (du kan anvÃ¤nda -i <sÃ¶kvÃ¤g> -i <sÃ¶kvÃ¤g>)"
 
-#: ../src/trackerd/tracker-main.c:163
+#: ../src/tracker-store/tracker-main.c:163
 msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
 msgstr "Kataloger att genomsÃ¶ka fÃ¶r indexering (du kan anvÃ¤nda -c <sÃ¶kvÃ¤g> -c <sÃ¶kvÃ¤g>)"
 
-#: ../src/trackerd/tracker-main.c:167
+#: ../src/tracker-store/tracker-main.c:167
 msgid "Disable modules from being processed (you can do -d <module> -d <module>)"
 msgstr "Inaktivera moduler frÃ¥n att behandlas (du kan anvÃ¤nda -d <modul> -d <modul>)"
 
-#: ../src/trackerd/tracker-main.c:173
+#: ../src/tracker-store/tracker-main.c:173
 msgid "Force a re-index of all content"
 msgstr "Tvinga igenom en omindexering av samtligt innehÃ¥ll"
 
-#: ../src/trackerd/tracker-main.c:177
+#: ../src/tracker-store/tracker-main.c:177
 msgid "Disable any indexing and monitoring"
 msgstr "Inaktivera all indexering eller Ã¶vervakning"
 
-#: ../src/trackerd/tracker-main.c:180
+#: ../src/tracker-store/tracker-main.c:180
 msgid "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
 msgstr "SprÃ¥k att anvÃ¤nda fÃ¶r bildande av ordstam och stoppord (tvÃ¥bokstavskod enligt ISO 639-1)"
 
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/trackerd/tracker-main.c:857
+#: ../src/tracker-store/tracker-main.c:857
 msgid "- start the tracker daemon"
 msgstr "- starta tracker-demonen"
 
@@ -2010,9 +2010,9 @@ msgstr "- starta tracker-demonen"
 #~ msgstr "Prova \"%s --help\" fÃ¶r mer information."
 #~ msgid "%s: no connection to tracker daemon"
 #~ msgstr "%s: ingen anslutning till tracker-demonen"
-#~ msgid "Ensure \"trackerd\" is running before launch this command."
+#~ msgid "Ensure \"tracker-store\" is running before launch this command."
 #~ msgstr ""
-#~ "Kontrollera att \"trackerd\" har startats innan du kÃ¶r det hÃ¤r kommandot."
+#~ "Kontrollera att \"tracker-store\" har startats innan du kÃ¶r det hÃ¤r kommandot."
 #~ msgid "%s: internal tracker error: %s"
 #~ msgstr "%s: internt tracker-fel: %s"
 #~ msgid "fetching index stats"
diff --git a/po/th.po b/po/th.po
index b4d8fe3..b6df41d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -436,8 +436,8 @@ msgstr "%s: à¹?à¸¡à¹?à¸¡à¸µà¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¸¢à¸±à¸?
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "à¸?à¸£à¸§à¸?à¸ªà¸à¸?à¹?à¸«à¹?à¹?à¸?à¹?à¸?à¸±à¸?à¸§à¹?à¸² \"trackerd\" à¸?à¸³à¸?à¸²à¸?à¸à¸¢à¸¹à¹? à¸?à¹?à¸à¸?à¹?à¸£à¸µà¸¢à¸?à¹?à¸?à¹?à¸?à¸³à¸ªà¸±à¹?à¸?à¸?à¸µà¹?"
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "à¸?à¸£à¸§à¸?à¸ªà¸à¸?à¹?à¸«à¹?à¹?à¸?à¹?à¸?à¸±à¸?à¸§à¹?à¸² \"tracker-store\" à¸?à¸³à¸?à¸²à¸?à¸à¸¢à¸¹à¹? à¸?à¹?à¸à¸?à¹?à¸£à¸µà¸¢à¸?à¹?à¸?à¹?à¸?à¸³à¸ªà¸±à¹?à¸?à¸?à¸µà¹?"
 
 #: ../src/libtracker/tracker-search.c:147
 #, c-format
@@ -519,28 +519,28 @@ msgstr "%s: à¸à¸²à¸?à¸´à¸§à¹?à¸¡à¸?à¸?à¹?à¹?à¸¡à¹?à¸?à¸¹à¸?à¸?à¹?à¸à¸?"
 msgid "%s: file %s not found"
 msgstr "%s: à¹?à¸¡à¹?à¸?à¸?à¹?à¸?à¹?à¸¡ %s"
 
-#: ../src/trackerd/trackerd.c:120
+#: ../src/tracker-store/tracker-store.c:120
 msgid "Directory to exclude from indexing"
 msgstr "à¹?à¸?à¹?à¸£à¸?à¸?à¸à¸£à¸µà¸?à¸µà¹?à¸?à¸°à¹?à¸¡à¹?à¸?à¸³à¸?à¸±à¸?à¸?à¸µ"
 
-#: ../src/trackerd/trackerd.c:120 ../src/trackerd/trackerd.c:121
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:120 ../src/tracker-store/tracker-store.c:121
+#: ../src/tracker-store/tracker-store.c:122
 msgid "/PATH/DIR"
 msgstr "/PATH/DIR"
 
-#: ../src/trackerd/trackerd.c:121
+#: ../src/tracker-store/tracker-store.c:121
 msgid "Directory to include in indexing"
 msgstr "à¹?à¸?à¹?à¸£à¸?à¸?à¸à¸£à¸µà¸?à¸µà¹?à¸?à¸°à¸?à¸±à¸?à¸£à¸§à¸¡à¹?à¸?à¸?à¸²à¸£à¸?à¸³à¸?à¸±à¸?à¸?à¸µ"
 
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:122
 msgid "Directory to crawl for indexing at start up only"
 msgstr "à¹?à¸?à¹?à¸£à¸?à¸?à¸à¸£à¸µà¸?à¸µà¹?à¸?à¸°à¸?à¸³à¸?à¸±à¸?à¸?à¸µà¹?à¸¡à¸·à¹?à¸à¹?à¸£à¸´à¹?à¸¡à¸?à¹?à¸?à¹?à¸?à¹?à¸²à¸?à¸±à¹?à¸?"
 
-#: ../src/trackerd/trackerd.c:123
+#: ../src/tracker-store/tracker-store.c:123
 msgid "Disable any indexing or watching taking place"
 msgstr "à¸?à¸´à¸?à¸?à¸²à¸£à¸?à¸³à¸?à¸±à¸?à¸?à¸µà¸«à¸£à¸·à¸à¸?à¸²à¸£à¹?à¸?à¹?à¸²à¸ªà¸±à¸?à¹?à¸?à¸?à¹?à¸?à¹?"
 
-#: ../src/trackerd/trackerd.c:124
+#: ../src/tracker-store/tracker-store.c:124
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
@@ -548,11 +548,11 @@ msgstr ""
 "à¸?à¹?à¸²à¸£à¸°à¸?à¸±à¸?à¸?à¸²à¸£à¸?à¸±à¸?à¸?à¸¶à¸?à¸?à¸¹à¸¡ à¸?à¹?à¸²à¸?à¸µà¹?à¹?à¸?à¹?à¹?à¸?à¹?à¸?à¸·à¸ 0(à¹?à¸ªà¸?à¸?/à¸?à¸±à¸?à¸?à¸¶à¸?à¹?à¸?à¸?à¸²à¸°à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?), 1 (à¸?à¹?à¸à¸¢à¸?à¸µà¹?à¸ªà¸¸à¸?), 2 (à¸¥à¸°à¹?à¸à¸µà¸¢à¸?) "
 "à¹?à¸¥à¸° 3 (à¸?à¸µà¸?à¸±à¹?à¸?)"
 
-#: ../src/trackerd/trackerd.c:124 ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:124 ../src/tracker-store/tracker-store.c:125
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:125
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
@@ -560,42 +560,42 @@ msgstr ""
 "à¸?à¹?à¸²à¸?à¸µà¹?à¹?à¸?à¹?à¹?à¸?à¸?à¸²à¸£à¸?à¹?à¸à¸?à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸³à¸?à¸±à¸?à¸?à¸µ à¸?à¹?à¸²à¸?à¹?à¸à¸?à¸à¸¢à¸¹à¹?à¹?à¸?à¸?à¹?à¸§à¸? 0-99 (à¸?à¹?à¸²à¸?à¸£à¸´à¸¢à¸²à¸¢à¸?à¸·à¸ 0) "
 "à¹?à¸?à¸¢à¸?à¹?à¸²à¸?à¸µà¹?à¸?à¹?à¸³à¸?à¸°à¹?à¸?à¸´à¹?à¸¡à¸?à¸§à¸²à¸¡à¹?à¸£à¹?à¸§à¸?à¸²à¸£à¸?à¸³à¸?à¸±à¸?à¸?à¸µà¸±"
 
-#: ../src/trackerd/trackerd.c:126
+#: ../src/tracker-store/tracker-store.c:126
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "à¸¥à¸?à¸?à¸²à¸£à¹?à¸?à¹?à¸«à¸?à¹?à¸§à¸¢à¸?à¸§à¸²à¸¡à¸?à¸³ à¹?à¸?à¹?à¸à¸²à¸?à¸?à¸³à¹?à¸«à¹?à¸?à¸³à¸?à¸±à¸?à¸?à¸µà¸?à¹?à¸²à¸¥à¸?"
 
-#: ../src/trackerd/trackerd.c:127
+#: ../src/tracker-store/tracker-store.c:127
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "à¹?à¸§à¸¥à¸²à¸?à¸±à¸?à¹?à¸£à¸´à¹?à¸¡à¸?à¹?à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸³à¸?à¸±à¸?à¸?à¸µ (à¹?à¸?à¹?à¸?à¸§à¸´à¸?à¸²à¸?à¸µ)"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr "à¸ à¸²à¸©à¸²à¸?à¸µà¹?à¸?à¸°à¹?à¸«à¸¥à¸?à¸£à¸²à¸¢à¸?à¸²à¸£à¸?à¸³à¸ªà¸³à¸«à¸£à¸±à¸?à¹?à¸¢à¸?à¸?à¸³ (à¹?à¸?à¹?à¸?à¸£à¸«à¸±à¸ª ISO 639-1 à¹?à¸?à¸? 2 à¸à¸±à¸?à¸?à¸£à¸°)"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid "LANG"
 msgstr "LANG"
 
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:129
 msgid "Force a re-index of all content"
 msgstr "à¸?à¸±à¸?à¸?à¸±à¸?à¹?à¸«à¹?à¸?à¸³à¸?à¸±à¸?à¸?à¸µà¹?à¸?à¸·à¹?à¸à¸«à¸²à¹?à¸«à¸¡à¹?à¸?à¸±à¹?à¸?à¸«à¸¡à¸?"
 
-#: ../src/trackerd/trackerd.c:130
+#: ../src/tracker-store/tracker-store.c:130
 msgid "Make tracker errors fatal"
 msgstr "à¹?à¸«à¹?à¸?à¸·à¸à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸à¸? tracker à¹?à¸?à¹?à¸?à¸?à¸§à¸²à¸¡à¹?à¸£à¸·à¹?à¸à¸?à¸£à¹?à¸²à¸¢à¹?à¸£à¸?"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:664
+#: ../src/tracker-store/tracker-store.c:664
 msgid "- start the tracker daemon"
 msgstr "- à¹?à¸£à¸´à¹?à¸¡à¸?à¸µà¸¡à¸à¸? tracker"
 
-#: ../src/trackerd/trackerd.c:665 ../src/trackerd/trackerd.c:666
+#: ../src/tracker-store/tracker-store.c:665 ../src/tracker-store/tracker-store.c:666
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#: ../src/trackerd/trackerd.c:673
+#: ../src/tracker-store/tracker-store.c:673
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -755,7 +755,7 @@ msgstr "à¹?_à¸?à¸µà¹?à¸¢à¸§à¸?à¸±à¸?"
 msgid "_Quit"
 msgstr "_à¸à¸à¸?"
 
-#: ../src/tracker-applet/tracker-applet.c:1997 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1997 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1461,6 +1461,6 @@ msgstr "à¸¥à¸´à¸?à¸?à¹? (à¹?à¸ªà¸µà¸¢)"
 msgid "link to %s"
 msgstr "à¸¥à¸´à¸?à¸?à¹?à¹?à¸?à¸¢à¸±à¸? %s"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "à¸?à¸£à¸´à¸?à¸²à¸£à¸ªà¸·à¸?à¸?à¹?à¸?à¹?à¸¥à¸°à¸?à¸³à¸?à¸±à¸?à¸?à¸µ Tracker"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5269164..94b5aa3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -433,8 +433,8 @@ msgstr "%sï¼?æ²¡æ??å?° tracker å®?æ?¤è¿?ç¨?ç??è¿?æ?¥"
 #: ../src/libtracker/tracker-search.c:135 ../src/libtracker/tracker-stats.c:92
 #: ../src/libtracker/tracker-status.c:48 ../src/libtracker/tracker-tag.c:134
 #, c-format
-msgid "Ensure \"trackerd\" is running before launch this command."
-msgstr "è¿?è¡?æ¤å?½ä»¤å??è¯·ç¡®ä¿?â??trackerdâ??æ£å?¨è¿?è¡?ã??"
+msgid "Ensure \"tracker-store\" is running before launch this command."
+msgstr "è¿?è¡?æ¤å?½ä»¤å??è¯·ç¡®ä¿?â??tracker-storeâ??æ£å?¨è¿?è¡?ã??"
 
 #: ../src/libtracker/tracker-search.c:147
 #, c-format
@@ -516,79 +516,79 @@ msgstr "%sï¼?é??æ³?ç??å??æ?°"
 msgid "%s: file %s not found"
 msgstr "%sï¼?æ??ä»¶ %s æ?ªæ?¾å?°"
 
-#: ../src/trackerd/trackerd.c:120
+#: ../src/tracker-store/tracker-store.c:120
 msgid "Directory to exclude from indexing"
 msgstr "è¢«æ??é?¤è??æ? é??ç´¢å¼?ç??ç?®å½?"
 
-#: ../src/trackerd/trackerd.c:120 ../src/trackerd/trackerd.c:121
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:120 ../src/tracker-store/tracker-store.c:121
+#: ../src/tracker-store/tracker-store.c:122
 msgid "/PATH/DIR"
 msgstr "/è·¯å¾?/ç?®å½?"
 
-#: ../src/trackerd/trackerd.c:121
+#: ../src/tracker-store/tracker-store.c:121
 msgid "Directory to include in indexing"
 msgstr "ç´¢å¼?æ?¶å??å?«ç??ç?®å½?"
 
-#: ../src/trackerd/trackerd.c:122
+#: ../src/tracker-store/tracker-store.c:122
 msgid "Directory to crawl for indexing at start up only"
 msgstr "ä»?å?¨å?¯å?¨æ?¶ç´¢å¼?ç??ç?®å½?"
 
-#: ../src/trackerd/trackerd.c:123
+#: ../src/tracker-store/tracker-store.c:123
 msgid "Disable any indexing or watching taking place"
 msgstr "ç¦?ç?¨æ??æ??ç´¢å¼?å??ç??è§?"
 
-#: ../src/trackerd/trackerd.c:124
+#: ../src/tracker-store/tracker-store.c:124
 msgid ""
 "Value that controls the level of logging. Valid values are 0 (displays/logs "
 "only errors), 1 (minimal), 2 (detailed), and 3 (debug)"
 msgstr "ç?¨äº?æ?§å?¶æ?¥å¿?çº§å?«ç??å?¼ã??å?¯ç?¨ç??å?¼ä¸ºï¼?0ï¼?å?ªæ?¾ç¤º/è®°å½?é??è¯¯ï¼?1ï¼?æ??å°?ï¼?2ï¼?è¯¦ç»?ï¼?3ï¼?è°?è¯?"
 
-#: ../src/trackerd/trackerd.c:124 ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:124 ../src/tracker-store/tracker-store.c:125
 msgid "VALUE"
 msgstr "å?¼"
 
-#: ../src/trackerd/trackerd.c:125
+#: ../src/tracker-store/tracker-store.c:125
 msgid ""
 "Value to use for throttling indexing. Value must be in range 0-99 (default "
 "0) with lower values increasing indexing speed"
 msgstr "è°?è??ç´¢å¼?ç??å?¼ã??æ¤å?¼å¿?é¡»å?¨0ï¼?99ä¹?é?´(é»?è®¤0)ï¼?å?¼è¶?ä½?ç´¢å¼?é??åº¦è¶?å¿«"
 
-#: ../src/trackerd/trackerd.c:126
+#: ../src/tracker-store/tracker-store.c:126
 msgid "Minimizes the use of memory but may slow indexing down"
 msgstr "æ??å°?å??å??å?å? ç?¨ï¼?ä½?å?¯è?½ä¼?é??ä½?ç´¢å¼?é??åº¦"
 
-#: ../src/trackerd/trackerd.c:127
+#: ../src/tracker-store/tracker-store.c:127
 msgid "Initial sleep time, just before indexing, in seconds"
 msgstr "å?¨å¼?å§?ç´¢å¼?å??ç??å??å§?ç?¡ç? æ?¶é?´ï¼?ä»¥ç§?è®¡"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid ""
 "Language to use for stemmer and stop words list (ISO 639-1 2 characters code)"
 msgstr "ç?¨ä»¥å??å?²å??å??é¡¿å??è¯?å??è¡¨ç??è¯è¨?(ISO 639-1 2å?è??ä»£ç ?)"
 
-#: ../src/trackerd/trackerd.c:128
+#: ../src/tracker-store/tracker-store.c:128
 msgid "LANG"
 msgstr "è¯è¨?"
 
-#: ../src/trackerd/trackerd.c:129
+#: ../src/tracker-store/tracker-store.c:129
 msgid "Force a re-index of all content"
 msgstr "å¼ºå?¶é??æ?°ç´¢å¼?æ??æ??å??å®¹"
 
-#: ../src/trackerd/trackerd.c:130
+#: ../src/tracker-store/tracker-store.c:130
 msgid "Make tracker errors fatal"
 msgstr "è§? tracker é??è¯¯ä¸ºè?´å?½é??è¯¯"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND <THIS_MESSAGE>
-#: ../src/trackerd/trackerd.c:664
+#: ../src/tracker-store/tracker-store.c:664
 msgid "- start the tracker daemon"
 msgstr "- å?¯å?¨ tracker å®?æ?¤è¿?ç¨?"
 
-#: ../src/trackerd/trackerd.c:665 ../src/trackerd/trackerd.c:666
+#: ../src/tracker-store/tracker-store.c:665 ../src/tracker-store/tracker-store.c:666
 msgid "DIRECTORY"
 msgstr "ç?®å½?"
 
-#: ../src/trackerd/trackerd.c:673
+#: ../src/tracker-store/tracker-store.c:673
 msgid ""
 "To include or exclude multiple directories at the same time, join multiple "
 "options like:"
@@ -737,7 +737,7 @@ msgstr "å?³äº?(_A)"
 msgid "_Quit"
 msgstr "é??å?º(_Q)"
 
-#: ../src/tracker-applet/tracker-applet.c:1997 ../trackerd.desktop.in.in.h:1
+#: ../src/tracker-applet/tracker-applet.c:1997 ../tracker-store.desktop.in.in.h:1
 msgid "Tracker"
 msgstr "Tracker"
 
@@ -1438,7 +1438,7 @@ msgstr "å·²æ??å??ç??é?¾æ?¥"
 msgid "link to %s"
 msgstr "å?° %s ç??é?¾æ?¥"
 
-#: ../trackerd.desktop.in.in.h:2
+#: ../tracker-store.desktop.in.in.h:2
 msgid "Tracker search and indexing service"
 msgstr "Tracker æ??ç´¢ä¸?ç´¢å¼?æ??å?¡"
 
diff --git a/python/deskbar-handler/tracker-handler.py b/python/deskbar-handler/tracker-handler.py
index e1fc4e0..f10678c 100644
--- a/python/deskbar-handler/tracker-handler.py
+++ b/python/deskbar-handler/tracker-handler.py
@@ -303,7 +303,7 @@ class TrackerLiveSearchHandler(deskbar.Handler.SignallingHandler):
 			except: self.tracker = None # reconnect
 		if not self.tracker:
 			try:
-				print "Connecting to Tracker (first search or trackerd restarted)"
+				print "Connecting to Tracker (first search or tracker-store restarted)"
 				import dbus
 				bus = dbus.SessionBus()
 				self.tracker = bus.get_object('org.freedesktop.Tracker','/org/freedesktop/tracker')
diff --git a/python/deskbar-handler/tracker-module.py b/python/deskbar-handler/tracker-module.py
index a320521..772f2ec 100644
--- a/python/deskbar-handler/tracker-module.py
+++ b/python/deskbar-handler/tracker-module.py
@@ -444,7 +444,7 @@ class TrackerLiveSearchHandler(deskbar.interfaces.Module):
 			except: self.tracker = None # reconnect
 		if not self.tracker:
 			try:
-				print "Connecting to Tracker (first search or trackerd restarted)"
+				print "Connecting to Tracker (first search or tracker-store restarted)"
 				import dbus
 				bus = dbus.SessionBus()
 				self.tracker = bus.get_object('org.freedesktop.Tracker', '/org/freedesktop/Tracker')
diff --git a/src/Makefile.am b/src/Makefile.am
index 1cdbf90..79678cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ SUBDIRS = 					\
 	libtracker				\
 	tracker-fts				\
 	plugins					\
-	trackerd				\
+	tracker-store				\
 	tracker-utils				\
 	tracker-extract				\
 	tracker-indexer				\
@@ -48,7 +48,7 @@ DIST_SUBDIRS = 					\
 	libtracker-data				\
 	libtracker				\
 	tracker-fts				\
-	trackerd				\
+	tracker-store				\
 	tracker-utils				\
 	tracker-extract				\
 	tracker-indexer				\
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 16f7ef0..d7a05c7 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -567,7 +567,7 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
 		break;
 	}
 
-	/* TODO: When we refactor to having writes in trackerd, we can use 
+	/* TODO: When we refactor to having writes in tracker-store, we can use 
 	 * TEMPORARY tables instead of deleting and storing physically */
 
 	if (transient || tracker_property_get_multiple_values (*property)) {
@@ -725,7 +725,7 @@ create_decomposed_transient_metadata_tables (TrackerDBInterface *iface)
 			domain = tracker_property_get_domain (*property);
 			service_name = tracker_class_get_name (domain);
 
-			/* TODO: When we refactor to having writes in trackerd, we can use 
+			/* TODO: When we refactor to having writes in tracker-store, we can use 
 	 		 * TEMPORARY tables instead of deleting and storing physically 
 
 			 * create_decomposed_metadata_property_table (iface, property,
diff --git a/src/plugins/evolution/tracker-evolution-registrar.c b/src/plugins/evolution/tracker-evolution-registrar.c
index fe654f7..8dc72c7 100644
--- a/src/plugins/evolution/tracker-evolution-registrar.c
+++ b/src/plugins/evolution/tracker-evolution-registrar.c
@@ -33,7 +33,7 @@
 #include <libtracker-data/tracker-data-query.h>
 #include <libtracker-common/tracker-ontology.h>
 
-#include <trackerd/tracker-push-registrar.h>
+#include <tracker-store/tracker-push-registrar.h>
 
 #define __TRACKER_EVOLUTION_REGISTRAR_C__
 
diff --git a/src/plugins/evolution/tracker-evolution-registrar.h b/src/plugins/evolution/tracker-evolution-registrar.h
index cefa980..1635c69 100644
--- a/src/plugins/evolution/tracker-evolution-registrar.h
+++ b/src/plugins/evolution/tracker-evolution-registrar.h
@@ -30,7 +30,7 @@
 
 #include <dbus/dbus-glib-bindings.h>
 
-#include <trackerd/tracker-push.h>
+#include <tracker-store/tracker-push.h>
 #include "tracker-evolution-common.h"
 
 G_BEGIN_DECLS
diff --git a/src/plugins/kmail/tracker-kmail-registrar.c b/src/plugins/kmail/tracker-kmail-registrar.c
index e65892c..3aeaff3 100644
--- a/src/plugins/kmail/tracker-kmail-registrar.c
+++ b/src/plugins/kmail/tracker-kmail-registrar.c
@@ -32,7 +32,7 @@
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-query.h>
 
-#include <trackerd/tracker-push-registrar.h>
+#include <tracker-store/tracker-push-registrar.h>
 
 #define __TRACKER_KMAIL_REGISTRAR_C__
 
diff --git a/src/plugins/kmail/tracker-kmail-registrar.h b/src/plugins/kmail/tracker-kmail-registrar.h
index 1c294a7..f69724e 100644
--- a/src/plugins/kmail/tracker-kmail-registrar.h
+++ b/src/plugins/kmail/tracker-kmail-registrar.h
@@ -30,7 +30,7 @@
 
 #include <dbus/dbus-glib-bindings.h>
 
-#include <trackerd/tracker-push.h>
+#include <tracker-store/tracker-push.h>
 #include "tracker-kmail-common.h"
 
 G_BEGIN_DECLS
diff --git a/src/plugins/rss/tracker-rss-registrar.c b/src/plugins/rss/tracker-rss-registrar.c
index 0e3984a..1d2273f 100644
--- a/src/plugins/rss/tracker-rss-registrar.c
+++ b/src/plugins/rss/tracker-rss-registrar.c
@@ -30,7 +30,7 @@
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-query.h>
 
-#include <trackerd/tracker-push-registrar.h>
+#include <tracker-store/tracker-push-registrar.h>
 
 #define __TRACKER_RSS_REGISTRAR_C__
 
diff --git a/src/plugins/rss/tracker-rss-registrar.h b/src/plugins/rss/tracker-rss-registrar.h
index 563b002..de2e0ca 100644
--- a/src/plugins/rss/tracker-rss-registrar.h
+++ b/src/plugins/rss/tracker-rss-registrar.h
@@ -30,7 +30,7 @@
 
 #include <dbus/dbus-glib-bindings.h>
 
-#include <trackerd/tracker-push.h>
+#include <tracker-store/tracker-push.h>
 #include "tracker-rss-common.h"
 
 G_BEGIN_DECLS
diff --git a/src/tracker-applet/tracker-applet.c b/src/tracker-applet/tracker-applet.c
index 97a8297..ef6389f 100644
--- a/src/tracker-applet/tracker-applet.c
+++ b/src/tracker-applet/tracker-applet.c
@@ -1799,7 +1799,7 @@ name_owner_changed (DBusGProxy	*proxy,
 		priv = TRAY_ICON_GET_PRIVATE (data);
 
 		/* Tracker has exited so reset status and make
-		 * invisible until trackerd relaunched.
+		 * invisible until tracker-store relaunched.
 		 */
 		index_state_changed (proxy,
 				     "Idle",
@@ -1822,7 +1822,7 @@ name_owner_changed (DBusGProxy	*proxy,
 			GError *error = NULL;
 			const gchar *command;
 
-			command = g_build_filename (TRACKER_LIBEXECDIR, "trackerd", NULL);
+			command = g_build_filename (TRACKER_LIBEXECDIR, "tracker-store", NULL);
 
 			priv->reindex = FALSE;
 
diff --git a/src/tracker-indexer/Makefile.am b/src/tracker-indexer/Makefile.am
index 5964201..201dd01 100644
--- a/src/tracker-indexer/Makefile.am
+++ b/src/tracker-indexer/Makefile.am
@@ -61,7 +61,7 @@ tracker_indexer_LDADD =							\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libstemmer/libstemmer.la	 		\
-	$(trackerd_win_libs)						\
+	$(tracker_store_win_libs)						\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
diff --git a/src/tracker-indexer/tracker-main.c b/src/tracker-indexer/tracker-main.c
index 8c7fc04..398610b 100644
--- a/src/tracker-indexer/tracker-main.c
+++ b/src/tracker-indexer/tracker-main.c
@@ -396,7 +396,7 @@ main (gint argc, gchar *argv[])
 		return EXIT_FAILURE;
 	}
 
-        /* Listen for changes in trackerd availability */
+        /* Listen for changes in tracker-store availability */
         tracker_dbus_add_name_monitor (TRACKER_DAEMON_SERVICE,
                                        daemon_availability_changed_cb,
                                        indexer, NULL);
diff --git a/src/tracker-preferences/tracker-preferences.c b/src/tracker-preferences/tracker-preferences.c
index ddf5b95..9362135 100644
--- a/src/tracker-preferences/tracker-preferences.c
+++ b/src/tracker-preferences/tracker-preferences.c
@@ -174,7 +174,7 @@ name_owner_changed (DBusGProxy  *proxy,
 		/* Tracker has exited */
 		gchar *command;
 
-                command = g_build_filename (TRACKER_LIBEXECDIR, "trackerd", NULL);
+                command = g_build_filename (TRACKER_LIBEXECDIR, "tracker-store", NULL);
 
                 if (!g_spawn_command_line_async (command, NULL)) {
 			g_warning ("Unable to execute command: %s", command);
@@ -210,7 +210,7 @@ str_slist_equal (GSList *a,
 }
 
 static gboolean
-if_trackerd_start (TrackerPreferencesPrivate *priv)
+if_tracker_store_start (TrackerPreferencesPrivate *priv)
 {
 	TrackerClient *client;
 	gchar *status;
@@ -632,7 +632,7 @@ cmd_apply (GtkWidget *widget,
 	/* save config to distk */
 	tracker_config_save (priv->config);
 
-	if (priv->should_restart && if_trackerd_start (priv)) {
+	if (priv->should_restart && if_tracker_store_start (priv)) {
 		GtkWidget *dialog;
 		gchar *primary;
 		gchar *secondary;
diff --git a/src/tracker-store/.gitignore b/src/tracker-store/.gitignore
new file mode 100644
index 0000000..5b17e28
--- /dev/null
+++ b/src/tracker-store/.gitignore
@@ -0,0 +1 @@
+tracker-store
diff --git a/src/trackerd/Makefile.am b/src/tracker-store/Makefile.am
similarity index 94%
rename from src/trackerd/Makefile.am
rename to src/tracker-store/Makefile.am
index 53902d9..8005bf1 100644
--- a/src/trackerd/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -28,9 +28,9 @@ endif
 #
 # Daemon sources
 #
-libexec_PROGRAMS = trackerd
+libexec_PROGRAMS = tracker-store
 
-trackerd_SOURCES =							\
+tracker_store_SOURCES =							\
 	tracker-backup.h						\
 	tracker-backup.c						\
 	tracker-crawler.c						\
@@ -66,10 +66,10 @@ trackerd_SOURCES =							\
 	tracker-resource-class.h
 
 if OS_WIN32
-trackerd_win_libs = -lws2_32 -lkernel32
+tracker_store_win_libs = -lws2_32 -lkernel32
 endif
 
-trackerd_LDADD =							\
+tracker_store_LDADD =							\
 	$(plugin_libs)							\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
@@ -87,7 +87,7 @@ trackerd_LDADD =							\
 	$(GLIB2_LIBS)							\
 	$(RAPTOR_LIBS)							\
 	$(GCOV_LIBS)							\
-	$(trackerd_win_libs)						\
+	$(tracker_store_win_libs)						\
 	-lz								\
 	-lm
 
diff --git a/src/trackerd/mingw-compat.h b/src/tracker-store/mingw-compat.h
similarity index 100%
rename from src/trackerd/mingw-compat.h
rename to src/tracker-store/mingw-compat.h
diff --git a/src/trackerd/tracker-backup.c b/src/tracker-store/tracker-backup.c
similarity index 100%
rename from src/trackerd/tracker-backup.c
rename to src/tracker-store/tracker-backup.c
diff --git a/src/trackerd/tracker-backup.h b/src/tracker-store/tracker-backup.h
similarity index 100%
rename from src/trackerd/tracker-backup.h
rename to src/tracker-store/tracker-backup.h
diff --git a/src/trackerd/tracker-crawler.c b/src/tracker-store/tracker-crawler.c
similarity index 100%
rename from src/trackerd/tracker-crawler.c
rename to src/tracker-store/tracker-crawler.c
diff --git a/src/trackerd/tracker-crawler.h b/src/tracker-store/tracker-crawler.h
similarity index 100%
rename from src/trackerd/tracker-crawler.h
rename to src/tracker-store/tracker-crawler.h
diff --git a/src/trackerd/tracker-daemon.c b/src/tracker-store/tracker-daemon.c
similarity index 100%
rename from src/trackerd/tracker-daemon.c
rename to src/tracker-store/tracker-daemon.c
diff --git a/src/trackerd/tracker-daemon.h b/src/tracker-store/tracker-daemon.h
similarity index 100%
rename from src/trackerd/tracker-daemon.h
rename to src/tracker-store/tracker-daemon.h
diff --git a/src/trackerd/tracker-dbus.c b/src/tracker-store/tracker-dbus.c
similarity index 100%
rename from src/trackerd/tracker-dbus.c
rename to src/tracker-store/tracker-dbus.c
diff --git a/src/trackerd/tracker-dbus.h b/src/tracker-store/tracker-dbus.h
similarity index 100%
rename from src/trackerd/tracker-dbus.h
rename to src/tracker-store/tracker-dbus.h
diff --git a/src/trackerd/tracker-events.c b/src/tracker-store/tracker-events.c
similarity index 98%
rename from src/trackerd/tracker-events.c
rename to src/tracker-store/tracker-events.c
index 1c2df13..c086780 100644
--- a/src/trackerd/tracker-events.c
+++ b/src/tracker-store/tracker-events.c
@@ -125,7 +125,7 @@ tracker_events_insert (const gchar *uri,
 
 	if (rdf_types && type == TRACKER_DBUS_EVENTS_TYPE_UPDATE) {
 		/* object is not very important for updates (we don't expose
-		 * the value being set to the user's DBus API in trackerd) */
+		 * the value being set to the user's DBus API in tracker-store) */
 		g_ptr_array_foreach (rdf_types, prepare_event_for_rdf_types, &info);
 	} else if (type == TRACKER_DBUS_EVENTS_TYPE_UPDATE) {
 		/* In this case we had an INSERT for a resource that didn't exist 
diff --git a/src/trackerd/tracker-events.h b/src/tracker-store/tracker-events.h
similarity index 100%
rename from src/trackerd/tracker-events.h
rename to src/tracker-store/tracker-events.h
diff --git a/src/trackerd/tracker-main.c b/src/tracker-store/tracker-main.c
similarity index 99%
rename from src/trackerd/tracker-main.c
rename to src/tracker-store/tracker-main.c
index 7a61edb..3a46ac6 100644
--- a/src/trackerd/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -554,7 +554,7 @@ initialize_locations (void)
 	private->log_filename =
 		g_build_filename (g_get_user_data_dir (),
 				  "tracker",
-				  "trackerd.log",
+				  "tracker-store.log",
 				  NULL);
 }
 
@@ -892,7 +892,7 @@ main (gint argc, gchar *argv[])
 		return EXIT_SUCCESS;
 	}
 
-	g_print ("Initializing trackerd...\n");
+	g_print ("Initializing tracker-store...\n");
 
 	initialize_signal_handler ();
 
diff --git a/src/trackerd/tracker-main.h b/src/tracker-store/tracker-main.h
similarity index 100%
rename from src/trackerd/tracker-main.h
rename to src/tracker-store/tracker-main.h
diff --git a/src/trackerd/tracker-marshal-main.c b/src/tracker-store/tracker-marshal-main.c
similarity index 100%
rename from src/trackerd/tracker-marshal-main.c
rename to src/tracker-store/tracker-marshal-main.c
diff --git a/src/trackerd/tracker-marshal.list b/src/tracker-store/tracker-marshal.list
similarity index 100%
rename from src/trackerd/tracker-marshal.list
rename to src/tracker-store/tracker-marshal.list
diff --git a/src/trackerd/tracker-monitor.c b/src/tracker-store/tracker-monitor.c
similarity index 100%
rename from src/trackerd/tracker-monitor.c
rename to src/tracker-store/tracker-monitor.c
diff --git a/src/trackerd/tracker-monitor.h b/src/tracker-store/tracker-monitor.h
similarity index 100%
rename from src/trackerd/tracker-monitor.h
rename to src/tracker-store/tracker-monitor.h
diff --git a/src/trackerd/tracker-processor.c b/src/tracker-store/tracker-processor.c
similarity index 100%
rename from src/trackerd/tracker-processor.c
rename to src/tracker-store/tracker-processor.c
diff --git a/src/trackerd/tracker-processor.h b/src/tracker-store/tracker-processor.h
similarity index 100%
rename from src/trackerd/tracker-processor.h
rename to src/tracker-store/tracker-processor.h
diff --git a/src/trackerd/tracker-push-registrar.c b/src/tracker-store/tracker-push-registrar.c
similarity index 100%
rename from src/trackerd/tracker-push-registrar.c
rename to src/tracker-store/tracker-push-registrar.c
diff --git a/src/trackerd/tracker-push-registrar.h b/src/tracker-store/tracker-push-registrar.h
similarity index 100%
rename from src/trackerd/tracker-push-registrar.h
rename to src/tracker-store/tracker-push-registrar.h
diff --git a/src/trackerd/tracker-push.c b/src/tracker-store/tracker-push.c
similarity index 100%
rename from src/trackerd/tracker-push.c
rename to src/tracker-store/tracker-push.c
diff --git a/src/trackerd/tracker-push.h b/src/tracker-store/tracker-push.h
similarity index 100%
rename from src/trackerd/tracker-push.h
rename to src/tracker-store/tracker-push.h
diff --git a/src/trackerd/tracker-resource-class.c b/src/tracker-store/tracker-resource-class.c
similarity index 100%
rename from src/trackerd/tracker-resource-class.c
rename to src/tracker-store/tracker-resource-class.c
diff --git a/src/trackerd/tracker-resource-class.h b/src/tracker-store/tracker-resource-class.h
similarity index 100%
rename from src/trackerd/tracker-resource-class.h
rename to src/tracker-store/tracker-resource-class.h
diff --git a/src/trackerd/tracker-resources.c b/src/tracker-store/tracker-resources.c
similarity index 100%
rename from src/trackerd/tracker-resources.c
rename to src/tracker-store/tracker-resources.c
diff --git a/src/trackerd/tracker-resources.h b/src/tracker-store/tracker-resources.h
similarity index 100%
rename from src/trackerd/tracker-resources.h
rename to src/tracker-store/tracker-resources.h
diff --git a/src/trackerd/tracker-search.c b/src/tracker-store/tracker-search.c
similarity index 100%
rename from src/trackerd/tracker-search.c
rename to src/tracker-store/tracker-search.c
diff --git a/src/trackerd/tracker-search.h b/src/tracker-store/tracker-search.h
similarity index 100%
rename from src/trackerd/tracker-search.h
rename to src/tracker-store/tracker-search.h
diff --git a/src/trackerd/tracker-status.c b/src/tracker-store/tracker-status.c
similarity index 100%
rename from src/trackerd/tracker-status.c
rename to src/tracker-store/tracker-status.c
diff --git a/src/trackerd/tracker-status.h b/src/tracker-store/tracker-status.h
similarity index 100%
rename from src/trackerd/tracker-status.h
rename to src/tracker-store/tracker-status.h
diff --git a/src/trackerd/tracker-utils.c b/src/tracker-store/tracker-utils.c
similarity index 100%
rename from src/trackerd/tracker-utils.c
rename to src/tracker-store/tracker-utils.c
diff --git a/src/trackerd/tracker-utils.h b/src/tracker-store/tracker-utils.h
similarity index 100%
rename from src/trackerd/tracker-utils.h
rename to src/tracker-store/tracker-utils.h
diff --git a/src/trackerd/tracker-volume-cleanup.c b/src/tracker-store/tracker-volume-cleanup.c
similarity index 100%
rename from src/trackerd/tracker-volume-cleanup.c
rename to src/tracker-store/tracker-volume-cleanup.c
diff --git a/src/trackerd/tracker-volume-cleanup.h b/src/tracker-store/tracker-volume-cleanup.h
similarity index 100%
rename from src/trackerd/tracker-volume-cleanup.h
rename to src/tracker-store/tracker-volume-cleanup.h
diff --git a/src/tracker-utils/tracker-sparql.c b/src/tracker-utils/tracker-sparql.c
index a3c6214..efca6e3 100644
--- a/src/tracker-utils/tracker-sparql.c
+++ b/src/tracker-utils/tracker-sparql.c
@@ -32,7 +32,7 @@
 #include <libtracker/tracker.h>
 
 #ifdef G_OS_WIN32
-#include <trackerd/mingw-compat.h>
+#include <tracker-store/mingw-compat.h>
 #endif /* G_OS_WIN32 */
 
 static gchar	     *path;
diff --git a/src/tracker-utils/tracker-tag.c b/src/tracker-utils/tracker-tag.c
index 870244d..614eaf0 100644
--- a/src/tracker-utils/tracker-tag.c
+++ b/src/tracker-utils/tracker-tag.c
@@ -33,7 +33,7 @@
 #include <libtracker-common/tracker-common.h>
 
 #ifdef G_OS_WIN32
-#include <trackerd/mingw-compat.h>
+#include <tracker-store/mingw-compat.h>
 #endif /* G_OS_WIN32 */
 
 static gint	     limit = 512;
diff --git a/src/trackerd/.gitignore b/src/trackerd/.gitignore
deleted file mode 100644
index 30b0693..0000000
--- a/src/trackerd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-trackerd
diff --git a/tests/tracker-indexer/Makefile.am b/tests/tracker-indexer/Makefile.am
index d2f684e..50c7dcd 100644
--- a/tests/tracker-indexer/Makefile.am
+++ b/tests/tracker-indexer/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = 									\
 	-DTRACKER_COMPILATION							\
 	-I$(top_srcdir)/src							\
 	-I$(top_srcdir)/tests/common						\
-	-I$(top_builddir)/src/trackerd						\
+	-I$(top_builddir)/src/tracker-store						\
 	-I$(top_builddir)/src/tracker-indexer					\
 	$(WARN_CFLAGS)								\
 	$(GLIB2_CFLAGS)								\
@@ -27,7 +27,7 @@ INCLUDES = 									\
 
 tracker_metadata_utils_SOURCES = 						\
 	$(top_srcdir)/src/tracker-indexer/tracker-dbus.c			\
-	$(top_srcdir)/src/trackerd/tracker-events.c			\
+	$(top_srcdir)/src/tracker-store/tracker-events.c			\
 	$(top_srcdir)/src/tracker-indexer/tracker-indexer.c			\
 	$(top_srcdir)/src/tracker-indexer/tracker-indexer-module.c		\
 	$(top_srcdir)/src/tracker-indexer/tracker-marshal-main.c		\
@@ -56,7 +56,7 @@ tracker_metadata_utils_LDADD =	                                        	\
 
 tracker_events_SOURCES = 							\
 	tracker-events-test.c							\
-	$(top_srcdir)/src/trackerd/tracker-events.c
+	$(top_srcdir)/src/tracker-store/tracker-events.c
 
 tracker_events_LDADD = 								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 		\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]