Updated Norwegian bokmål translation

1 files changed, 675 insertions, 526 deletions

diff --git a/po/nb.po b/po/nb.po
index 8d3e669f3..e3e411fd8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tracker 0.7.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-23 11:09+0100\n"
-"PO-Revision-Date: 2010-02-23 11:12+0100\n"
+"Project-Id-Version: tracker 0.8.x\n"
+"Report-Msgid-Bugs-To:\n"
+"POT-Creation-Date: 2010-05-11 20:47+0200\n"
+"PO-Revision-Date: 2010-05-11 20:52+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/miners/tracker-miner-applications.desktop.in.h:1
-#: ../src/tracker-search-bar/tracker-results-window.c:653
-#: ../src/tracker-search-tool/tracker-category-view.gs:74
+#: ../src/tracker-search-bar/tracker-results-window.c:666
+#: ../src/tracker-search-tool/tracker-category-view.gs:79
 msgid "Applications"
 msgstr "Programmer"
 
@@ -27,6 +27,14 @@ msgstr "Programmer"
 msgid "Applications data miner"
 msgstr "Programmer"
 
+#: ../data/miners/tracker-miner-evolution.desktop.in.h:1
+msgid "Emails"
+msgstr "E-post"
+
+#: ../data/miners/tracker-miner-evolution.desktop.in.h:2
+msgid "Evolution Email miner"
+msgstr ""
+
 #: ../data/miners/tracker-miner-files.desktop.in.h:1
 msgid "File System"
 msgstr "Filsystem"
@@ -35,6 +43,31 @@ msgstr "Filsystem"
 msgid "File system data miner"
 msgstr ""
 
+#: ../data/miners/tracker-miner-flickr.desktop.in.h:1
+msgid "Flickr"
+msgstr "Flickr"
+
+#: ../data/miners/tracker-miner-flickr.desktop.in.h:2
+msgid "Index your Flickr photo albums"
+msgstr ""
+
+#: ../data/miners/tracker-miner-rss.desktop.in.h:1
+msgid "Fetch RSS/ATOM Feeds"
+msgstr ""
+
+#: ../data/miners/tracker-miner-rss.desktop.in.h:2
+msgid "RSS/ATOM Feeds"
+msgstr ""
+
+#: ../data/tracker-miner-flickr.desktop.in.in.h:1
+msgid "Processes images and albums on Flickr"
+msgstr ""
+
+#: ../data/tracker-miner-flickr.desktop.in.in.h:2
+#, fuzzy
+msgid "Tracker Miner for Flickr"
+msgstr "Tracker søkeverktøy"
+
 #: ../data/tracker-miner-fs.desktop.in.in.h:1
 msgid "Crawls and processes files on the file system"
 msgstr ""
@@ -43,6 +76,14 @@ msgstr ""
 msgid "Tracker File System Miner"
 msgstr ""
 
+#: ../data/tracker-miner-rss.desktop.in.in.h:1
+msgid "Fetch RSS/ATOM feeds"
+msgstr ""
+
+#: ../data/tracker-miner-rss.desktop.in.in.h:2
+msgid "Tracker RSS/ATOM Feeds Miner"
+msgstr ""
+
 #: ../data/tracker-status-icon.desktop.in.in.h:1
 msgid "Tracker Status Icon"
 msgstr "Statusikon for Tracker"
@@ -56,9 +97,8 @@ msgid "Metadata database store and lookup manager"
 msgstr ""
 
 #: ../data/tracker-store.desktop.in.in.h:2
-#, fuzzy
 msgid "Tracker Store"
-msgstr "Tracker søk"
+msgstr "Tracker lager"
 
 #: ../examples/rss-reader/rss_viewer.ui.h:1
 msgid "All posts"
@@ -68,13 +108,13 @@ msgstr "Alle innlegg"
 msgid "By usage"
 msgstr "Etter bruk"
 
-#: ../src/plugins/nautilus/tracker-tags-view.c:282
-#: ../src/plugins/nautilus/tracker-tags-view.c:432
-#: ../src/plugins/nautilus/tracker-tags-view.c:466
+#: ../src/plugins/nautilus/tracker-tags-view.c:284
+#: ../src/plugins/nautilus/tracker-tags-view.c:417
+#: ../src/plugins/nautilus/tracker-tags-view.c:451
 msgid "No error was given"
 msgstr "Ingen feil ble gitt"
 
-#: ../src/plugins/nautilus/tracker-tags-view.c:759
+#: ../src/plugins/nautilus/tracker-tags-view.c:815
 #, c-format
 msgid "_Set the tags you want to associate with the %d selected item:"
 msgid_plural "_Set the tags you want to associate with the %d selected items:"
@@ -83,391 +123,309 @@ msgstr[1] ""
 
 #: ../src/plugins/nautilus/tracker-tags-extension.c:124
 #: ../src/plugins/nautilus/tracker-tags-extension.c:233
-#: ../src/tracker-search-bar/tracker-results-window.c:650
-#, fuzzy
+#: ../src/tracker-search-bar/tracker-results-window.c:663
 msgid "Tags"
-msgstr "Bilder"
+msgstr "Tagger"
 
 #: ../src/plugins/nautilus/tracker-tags-extension.c:171
 #: ../src/plugins/nautilus/tracker-tags-extension.c:198
 msgid "Tags..."
-msgstr ""
+msgstr "Tagger..."
 
 #: ../src/plugins/nautilus/tracker-tags-extension.c:172
 #: ../src/plugins/nautilus/tracker-tags-extension.c:199
 msgid "Tag one or more files"
-msgstr ""
+msgstr "Tagg en eller flere filer"
 
 #: ../src/libtracker-common/tracker-dbus.c:589
 msgid "No error given"
 msgstr "Ingen feil oppgitt"
 
-#: ../src/libtracker-common/tracker-utils.c:137
-#: ../src/libtracker-common/tracker-utils.c:144
+#: ../src/libtracker-common/tracker-utils.c:68
+#: ../src/libtracker-common/tracker-utils.c:75
 msgid "unknown time"
 msgstr "ukjent tid"
 
-#: ../src/libtracker-common/tracker-utils.c:162
-#: ../src/libtracker-common/tracker-utils.c:213
+#: ../src/libtracker-common/tracker-utils.c:93
+#: ../src/libtracker-common/tracker-utils.c:144
 msgid "less than one second"
-msgstr ""
+msgstr "mindre enn ett sekund"
 
 #. Translators: this is %d days
-#: ../src/libtracker-common/tracker-utils.c:177
+#: ../src/libtracker-common/tracker-utils.c:108
 #, c-format
 msgid " %dd"
-msgstr ""
+msgstr "%dd"
 
 #. Translators: this is %2.2d hours
-#: ../src/libtracker-common/tracker-utils.c:181
+#: ../src/libtracker-common/tracker-utils.c:112
 #, c-format
 msgid " %2.2dh"
-msgstr ""
+msgstr "%2.2dt"
 
 #. Translators: this is %2.2d minutes
-#: ../src/libtracker-common/tracker-utils.c:185
+#: ../src/libtracker-common/tracker-utils.c:116
 #, c-format
 msgid " %2.2dm"
-msgstr ""
+msgstr "%2.2dm"
 
 #. Translators: this is %2.2d seconds
-#: ../src/libtracker-common/tracker-utils.c:189
+#: ../src/libtracker-common/tracker-utils.c:120
 #, c-format
 msgid " %2.2ds"
-msgstr ""
+msgstr "%2.2ds"
 
-#: ../src/libtracker-common/tracker-utils.c:193
+#: ../src/libtracker-common/tracker-utils.c:124
 #, c-format
 msgid " %d day"
 msgid_plural " %d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d dag"
+msgstr[1] "%d dager"
 
-#: ../src/libtracker-common/tracker-utils.c:197
+#: ../src/libtracker-common/tracker-utils.c:128
 #, c-format
 msgid " %2.2d hour"
 msgid_plural " %2.2d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%2.2d time"
+msgstr[1] "%2.2d timer"
 
-#: ../src/libtracker-common/tracker-utils.c:201
+#: ../src/libtracker-common/tracker-utils.c:132
 #, c-format
 msgid " %2.2d minute"
 msgid_plural " %2.2d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%2.2d minutt"
+msgstr[1] "%2.2d minutter"
 
-#: ../src/libtracker-common/tracker-utils.c:205
+#: ../src/libtracker-common/tracker-utils.c:136
 #, c-format
 msgid " %2.2d second"
 msgid_plural " %2.2d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%2.2d sekund"
+msgstr[1] "%2.2d sekunder"
 
-#: ../src/libtracker-miner/tracker-miner.c:600
+#: ../src/libtracker-miner/tracker-miner-object.c:460
 msgid "Data store is not available"
 msgstr ""
 
-#: ../src/libtracker-miner/tracker-miner.c:1268
+#: ../src/libtracker-miner/tracker-miner-object.c:1019
 msgid "Pause application and reason match an already existing pause request"
 msgstr ""
 
-#: ../src/libtracker-miner/tracker-miner.c:1340
+#: ../src/libtracker-miner/tracker-miner-object.c:1091
 msgid "Cookie not recognized to resume paused miner"
 msgstr ""
 
-#: ../src/libtracker-miner/tracker-miner-fs.c:707
-#: ../src/plugins/evolution/tracker-evolution-plugin.c:2339
-msgid "Initializing"
-msgstr ""
-
-#: ../src/libtracker-miner/tracker-miner-fs.c:718
-#: ../src/libtracker-miner/tracker-miner-fs.c:860
-msgid "Idle"
+#: ../src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml.h:1
+msgid "Push data to Tracker to make it queryable."
 msgstr ""
 
-#: ../src/libtracker-miner/tracker-miner-fs.c:1913
-#: ../src/libtracker-miner/tracker-miner-fs.c:1916
-msgid "Processing files"
-msgstr ""
+#: ../src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml.h:2
+msgid "Tracker"
+msgstr "Tracker"
 
-#: ../src/libtracker-miner/tracker-miner-fs.c:2448
-#, c-format
-msgid "Crawling recursively directory '%s'"
+#: ../src/plugins/evolution/tracker-evolution-plugin.c:2456
+#: ../src/tracker-utils/tracker-status.c:70
+msgid "Processing…"
 msgstr ""
 
-#: ../src/libtracker-miner/tracker-miner-fs.c:2450
-#, c-format
-msgid "Crawling single directory '%s'"
+#: ../src/tracker-explorer/tracker-explorer.ui.h:1
+msgid "Properties"
 msgstr ""
 
-#: ../src/plugins/deskbar/tracker-handler.py:37
-#: ../src/plugins/deskbar/tracker-module.py:100
-#, python-format
-msgid "Launch %s (%s)"
-msgstr "Start %s (%s)"
+#: ../src/tracker-explorer/tracker-explorer.ui.h:2
+#: ../src/tracker-search-tool/tst.ui.h:2
+msgid "_Search:"
+msgstr "_Søk:"
 
-#: ../src/plugins/deskbar/tracker-handler.py:42
-#: ../src/plugins/deskbar/tracker-module.py:105
-#, python-format
-msgid ""
-"See %s conversation\n"
-"%s %s\n"
-"from %s"
-msgstr ""
-"Se samtaler i %s\n"
-"%s %s\n"
-"fra %s"
-
-#: ../src/plugins/deskbar/tracker-handler.py:48
-#: ../src/plugins/deskbar/tracker-module.py:110
-#, python-format
-msgid "Email from %s"
-msgstr "E-post fra %s"
-
-#: ../src/plugins/deskbar/tracker-handler.py:61
-#: ../src/plugins/deskbar/tracker-module.py:122
-#, python-format
-msgid ""
-"Listen to music %s\n"
-"in %s"
+#: ../src/tracker-explorer/tracker-explorer.ui.h:3
+msgid "_URN:"
 msgstr ""
-"Lytt til musikk %s\n"
-"i %s"
 
-#: ../src/plugins/deskbar/tracker-handler.py:66
-#: ../src/plugins/deskbar/tracker-module.py:128
-#, python-format
+#: ../src/tracker-extract/tracker-main.c:84
+#: ../src/tracker-store/tracker-main.c:99
 msgid ""
-"See document %s\n"
-"in %s"
-msgstr ""
-"Se dokument %s\n"
-"i %s"
-
-#: ../src/plugins/deskbar/tracker-handler.py:71
-#: ../src/plugins/deskbar/tracker-handler.py:88
-#: ../src/plugins/deskbar/tracker-handler.py:125
-#: ../src/plugins/deskbar/tracker-module.py:133
-#: ../src/plugins/deskbar/tracker-module.py:155
-#: ../src/plugins/deskbar/tracker-module.py:207
-#: ../src/plugins/deskbar/tracker-module.py:243
-#, python-format
-msgid ""
-"Open file %s\n"
-"in %s"
+"Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
+"0)"
 msgstr ""
-"Åpne fil %s\n"
-"i %s"
 
-#: ../src/plugins/deskbar/tracker-handler.py:76
-#: ../src/plugins/deskbar/tracker-module.py:138
-#, python-format
-msgid ""
-"View image %s\n"
-"in %s"
+#: ../src/tracker-extract/tracker-main.c:89
+msgid "File to extract metadata for"
 msgstr ""
-"Vis bilde %s\n"
-"i %s"
 
-#: ../src/plugins/deskbar/tracker-handler.py:82
-#: ../src/plugins/deskbar/tracker-module.py:144
-#, python-format
-msgid ""
-"Watch video  %s\n"
-"in %s"
-msgstr ""
-"Se på video %s\n"
-"i %s"
+#: ../src/tracker-extract/tracker-main.c:90 ../src/miners/fs/tracker-main.c:90
+#: ../src/miners/fs/tracker-main.c:94 ../src/tracker-utils/tracker-import.c:55
+#: ../src/tracker-utils/tracker-import.c:56
+#: ../src/tracker-utils/tracker-info.c:58
+#: ../src/tracker-utils/tracker-info.c:59
+#: ../src/tracker-utils/tracker-sparql.c:62
+msgid "FILE"
+msgstr "FIL"
 
-#: ../src/plugins/deskbar/tracker-handler.py:93
-#: ../src/plugins/deskbar/tracker-module.py:150
-#, python-format
-msgid ""
-"Open folder %s\n"
-"%s"
+#: ../src/tracker-extract/tracker-main.c:93
+msgid "MIME type for file (if not provided, this will be guessed)"
 msgstr ""
-"Åpne mappe %s\n"
-"%s"
-
-#: ../src/plugins/deskbar/tracker-handler.py:211
-#: ../src/plugins/deskbar/tracker-module.py:351
-msgid "with"
-msgstr "med"
-
-#: ../src/plugins/deskbar/tracker-handler.py:219
-#: ../src/plugins/deskbar/tracker-module.py:359
-msgid "in channel"
-msgstr "i kanal"
 
-#: ../src/plugins/deskbar/tracker-handler.py:386
-msgid "Search all of your documents, <b>as you type</b>"
-msgstr "Søk i alle dine dokumenter, <b>etter hvert som du skriver</b>"
+#: ../src/tracker-extract/tracker-main.c:94
+#: ../src/tracker-control/tracker-control.c:97
+msgid "MIME"
+msgstr "MIME"
 
-#: ../src/plugins/deskbar/tracker-handler.py:390
-#: ../src/plugins/deskbar/tracker-module.py:295
-msgid "Development Files"
-msgstr "Utviklingsfiler"
+#: ../src/tracker-extract/tracker-main.c:99
+msgid "Disable shutting down after 30 seconds of inactivity"
+msgstr ""
 
-#: ../src/plugins/deskbar/tracker-handler.py:393
-#: ../src/plugins/deskbar/tracker-module.py:298
-#: ../src/tracker-search-tool/tracker-category-view.gs:66
-msgid "Music"
-msgstr "Musikk"
+#: ../src/tracker-extract/tracker-main.c:103
+msgid "Force internal extractors over 3rd parties like libstreamanalyzer"
+msgstr ""
 
-#: ../src/plugins/deskbar/tracker-handler.py:396
-#: ../src/plugins/deskbar/tracker-module.py:301
-#: ../src/tracker-search-bar/tracker-results-window.c:654
-#: ../src/tracker-search-tool/tracker-category-view.gs:62
-msgid "Images"
-msgstr "Bilder"
+#: ../src/tracker-extract/tracker-main.c:107
+msgid "Force a module to be used for extraction (e.g. \"foo\" for \"foo.so\")"
+msgstr ""
 
-#: ../src/plugins/deskbar/tracker-handler.py:399
-#: ../src/plugins/deskbar/tracker-module.py:304
-#: ../src/tracker-search-bar/tracker-results-window.c:658
-#: ../src/tracker-search-tool/tracker-category-view.gs:70
-msgid "Videos"
-msgstr "Videoer"
+#: ../src/tracker-extract/tracker-main.c:108
+msgid "MODULE"
+msgstr ""
 
-#: ../src/plugins/deskbar/tracker-handler-static.py:37
-#: ../src/plugins/deskbar/tracker-module.py:65
-#: ../src/plugins/deskbar/tracker-module.py:160
-#, python-format
-msgid "Search for %s with Tracker Search Tool"
-msgstr "Søk etter %s med Tracker søkeverktøy"
+#: ../src/tracker-extract/tracker-main.c:111
+#: ../src/miners/fs/tracker-main.c:97 ../src/tracker-store/tracker-main.c:95
+#: ../src/tracker-writeback/tracker-main.c:51
+msgid "Displays version information"
+msgstr ""
 
-#: ../src/plugins/deskbar/tracker-handler-static.py:68
-msgid "Search all of your documents with Tracker Search Tool"
+#. Translators: this message will appear immediately after the
+#. usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
+#: ../src/tracker-extract/tracker-main.c:349
+msgid "- Extract file meta data"
 msgstr ""
 
-#: ../src/plugins/deskbar/tracker-module.py:79
-msgid "Tracker Search"
-msgstr "Tracker søk"
+#: ../src/tracker-extract/tracker-main.c:358
+msgid "Filename and mime type must be provided together"
+msgstr ""
 
-#: ../src/plugins/deskbar/tracker-module.py:80
-msgid "Search with Tracker Search Tool"
+#: ../src/tracker-extract/tracker-main.c:372
+msgid ""
+"Options --force-internal-extractors and --force-module can't be used together"
 msgstr ""
 
-#: ../src/plugins/deskbar/tracker-module.py:290
-msgid "Tracker Live Search"
+#: ../src/miners/fs/tracker-main.c:79 ../src/miners/rss/tracker-main.c:37
+#: ../src/tracker-writeback/tracker-main.c:55
+msgid ""
+"Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default=0)"
 msgstr ""
 
-#: ../src/plugins/deskbar/tracker-module.py:291
-msgid "Search with Tracker, as you type"
+#: ../src/miners/fs/tracker-main.c:84
+msgid "Initial sleep time in seconds, 0->1000 (default=15)"
 msgstr ""
 
-#: ../src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml.h:1
-msgid "Push data to Tracker to make it queryable."
+#: ../src/miners/fs/tracker-main.c:89
+msgid "Checks if FILE is eligible for being mined based on configuration"
 msgstr ""
 
-#: ../src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml.h:2
-msgid "Tracker"
-msgstr "Tracker"
+#: ../src/miners/fs/tracker-main.c:93
+msgid "Forces the insertion of FILE into the store"
+msgstr ""
 
-#: ../src/plugins/evolution/tracker-evolution-plugin.c:2431
-msgid "Resuming"
+#: ../src/miners/fs/tracker-main.c:365
+#, c-format
+msgid "Data object '%s' currently exists"
 msgstr ""
 
-#: ../src/plugins/evolution/tracker-miner-emails.desktop.in.h:1
-msgid "Emails"
+#: ../src/miners/fs/tracker-main.c:366
+#, c-format
+msgid "Data object '%s' currently does not exist"
 msgstr ""
 
-#: ../src/plugins/evolution/tracker-miner-emails.desktop.in.h:2
-msgid "Evolution Email miner"
+#: ../src/miners/fs/tracker-main.c:381
+msgid "Directory is eligible to be mined (based on rules)"
 msgstr ""
 
-#: ../src/tracker-explorer/tracker-explorer.ui.h:1
-msgid "Properties"
+#: ../src/miners/fs/tracker-main.c:382
+msgid "Directory is NOT eligible to be mined (based on rules)"
 msgstr ""
 
-#: ../src/tracker-explorer/tracker-explorer.ui.h:2
-#: ../src/tracker-search-tool/tst.ui.h:2
-msgid "_Search:"
-msgstr "_Søk:"
+#: ../src/miners/fs/tracker-main.c:402
+msgid "Directory is eligible to be mined (based on contents)"
+msgstr ""
 
-#: ../src/tracker-explorer/tracker-explorer.ui.h:3
-msgid "_URN:"
+#: ../src/miners/fs/tracker-main.c:403
+msgid "Directory is NOT eligible to be mined (based on contents)"
 msgstr ""
 
-#: ../src/tracker-extract/tracker-main.c:83
-#: ../src/tracker-miner-fs/tracker-main.c:77
-#: ../src/tracker-store/tracker-main.c:102
-#: ../src/tracker-writeback/tracker-main.c:51
-msgid "Displays version information"
+#: ../src/miners/fs/tracker-main.c:450
+msgid "Directory is eligible to be monitored (based on config)"
 msgstr ""
 
-#: ../src/tracker-extract/tracker-main.c:87
-#: ../src/tracker-store/tracker-main.c:106
-msgid ""
-"Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
-"0)"
+#: ../src/miners/fs/tracker-main.c:451
+msgid "Directory is NOT eligible to be monitored (based on config)"
 msgstr ""
 
-#: ../src/tracker-extract/tracker-main.c:92
-msgid "File to extract metadata for"
+#: ../src/miners/fs/tracker-main.c:455
+msgid "File is eligible to be monitored (based on config)"
 msgstr ""
 
-#: ../src/tracker-extract/tracker-main.c:93
-#: ../src/tracker-utils/tracker-import.c:55
-#: ../src/tracker-utils/tracker-import.c:56
-#: ../src/tracker-utils/tracker-info.c:53
-#: ../src/tracker-utils/tracker-info.c:54
-#: ../src/tracker-utils/tracker-sparql.c:55
-msgid "FILE"
-msgstr "FIL"
+#: ../src/miners/fs/tracker-main.c:456
+msgid "File is NOT eligible to be monitored (based on config)"
+msgstr ""
 
-#: ../src/tracker-extract/tracker-main.c:96
-msgid "MIME type for file (if not provided, this will be guessed)"
+#: ../src/miners/fs/tracker-main.c:460
+msgid "File or Directory is eligible to be monitored (based on config)"
 msgstr ""
 
-#: ../src/tracker-extract/tracker-main.c:97
-#: ../src/tracker-control/tracker-control.c:85
-msgid "MIME"
-msgstr "MIME"
+#: ../src/miners/fs/tracker-main.c:461
+msgid "File or Directory is NOT eligible to be monitored (based on config)"
+msgstr ""
 
-#: ../src/tracker-extract/tracker-main.c:102
-msgid "Disable shutting down after 30 seconds of inactivity"
+#: ../src/miners/fs/tracker-main.c:476
+msgid "File is eligible to be mined (based on rules)"
 msgstr ""
 
-#: ../src/tracker-extract/tracker-main.c:106
-msgid "Force internal extractors over 3rd parties like libstreamanalyzer"
+#: ../src/miners/fs/tracker-main.c:477
+msgid "File is NOT eligible to be mined (based on rules)"
 msgstr ""
 
-#. Translators: this message will appear immediately after the
-#. usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
-#: ../src/tracker-extract/tracker-main.c:341
-msgid "- Extract file meta data"
+#: ../src/miners/fs/tracker-main.c:486
+msgid "Would be indexed"
 msgstr ""
 
-#: ../src/tracker-extract/tracker-main.c:350
-msgid "Filename and mime type must be provided together"
+#: ../src/miners/fs/tracker-main.c:487 ../src/miners/fs/tracker-main.c:489
+msgid "Yes"
 msgstr ""
 
-#: ../src/tracker-miner-fs/tracker-main.c:81
-#: ../src/tracker-writeback/tracker-main.c:55
-msgid ""
-"Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default=0)"
+#: ../src/miners/fs/tracker-main.c:487 ../src/miners/fs/tracker-main.c:489
+msgid "No"
 msgstr ""
 
-#: ../src/tracker-miner-fs/tracker-main.c:86
-msgid "Initial sleep time in seconds, 0->1000 (default=15)"
+#: ../src/miners/fs/tracker-main.c:488
+msgid "Would be monitored"
 msgstr ""
 
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/tracker-miner-fs/tracker-main.c:262
+#: ../src/miners/fs/tracker-main.c:529
 msgid "- start the tracker indexer"
 msgstr ""
 
-#: ../src/tracker-miner-fs/tracker-miner-files.c:847
+#: ../src/miners/fs/tracker-miner-files.c:906
 msgid "Low battery"
 msgstr ""
 
-#: ../src/tracker-miner-fs/tracker-miner-files.c:930
+#: ../src/miners/fs/tracker-miner-files.c:989
 msgid "Low disk space"
 msgstr ""
 
+#. Translators: this messagge will apper immediately after the
+#. * usage string - Usage: COMMAND <THIS_MESSAGE>
+#.
+#: ../src/miners/rss/tracker-main.c:64
+msgid "- start the feeds indexer"
+msgstr ""
+
+#: ../src/miners/rss/tracker-miner-rss.c:164
+#: ../src/tracker-utils/tracker-status.c:69
+msgid "Initializing"
+msgstr ""
+
 #: ../src/tracker-preferences/tracker-preferences.desktop.in.in.h:1
 msgid "Configure file indexing with Tracker"
 msgstr ""
@@ -476,36 +434,36 @@ msgstr ""
 msgid "Search and Indexing"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.vala:105
+#: ../src/tracker-preferences/tracker-preferences.vala:109
 msgid "Disabled"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.vala:108
+#: ../src/tracker-preferences/tracker-preferences.vala:112
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.vala:113
+#: ../src/tracker-preferences/tracker-preferences.vala:116
 #, c-format
 msgid "%d/20"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.vala:121
+#: ../src/tracker-preferences/tracker-preferences.vala:124
 msgid "Enter value"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.vala:150
+#: ../src/tracker-preferences/tracker-preferences.vala:155
 msgid "Select directory"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.vala:367
-#: ../src/tracker-preferences/tracker-preferences.vala:368
-#: ../src/tracker-preferences/tracker-preferences.vala:369
-#: ../src/tracker-preferences/tracker-preferences.vala:370
+#: ../src/tracker-preferences/tracker-preferences.vala:382
+#: ../src/tracker-preferences/tracker-preferences.vala:383
+#: ../src/tracker-preferences/tracker-preferences.vala:384
+#: ../src/tracker-preferences/tracker-preferences.vala:385
 msgid "Directory"
 msgstr "Katalog"
 
-#: ../src/tracker-preferences/tracker-preferences.vala:371
+#: ../src/tracker-preferences/tracker-preferences.vala:386
 msgid "File"
 msgstr "Fil"
 
@@ -530,117 +488,133 @@ msgid "Directories:"
 msgstr "Kataloger:"
 
 #: ../src/tracker-preferences/tracker-preferences.ui.h:6
-msgid "Enable _monitoring"
-msgstr ""
-
-#: ../src/tracker-preferences/tracker-preferences.ui.h:7
 msgid "Enable for _first time"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:8
+#: ../src/tracker-preferences/tracker-preferences.ui.h:7
 msgid "Enable when running on _battery"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:9
+#: ../src/tracker-preferences/tracker-preferences.ui.h:8
 msgid "Faster"
 msgstr "Raskere"
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:10
+#: ../src/tracker-preferences/tracker-preferences.ui.h:9
 msgid "Files"
 msgstr "Filer"
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:11
+#: ../src/tracker-preferences/tracker-preferences.ui.h:10
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:12
+#: ../src/tracker-preferences/tracker-preferences.ui.h:11
 msgid "Glob patterns to ignore:"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:13
+#: ../src/tracker-preferences/tracker-preferences.ui.h:12
 msgid ""
 "Globbing patterns can be used here, for example: \"*bar*\".\n"
 "Most commonly this is used to ignore directories like *~, *.o, *.la, etc"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:15
+#: ../src/tracker-preferences/tracker-preferences.ui.h:14
 msgid "Ignored Content"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:16
+#: ../src/tracker-preferences/tracker-preferences.ui.h:15
 msgid "Include _removable media"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:17
+#: ../src/tracker-preferences/tracker-preferences.ui.h:16
 msgid "Include mou_nted directories"
 msgstr ""
 
+#: ../src/tracker-preferences/tracker-preferences.ui.h:17
+msgid "Include optical di_scs"
+msgstr ""
+
 #: ../src/tracker-preferences/tracker-preferences.ui.h:18
 msgid "Indexing"
 msgstr "Indekserer"
 
 #: ../src/tracker-preferences/tracker-preferences.ui.h:19
+msgid "Indexing Preferences"
+msgstr "Brukervalg for indeksering"
+
+#: ../src/tracker-preferences/tracker-preferences.ui.h:20
+msgid "Indexing s_peed (faster consumes more resources):"
+msgstr "Indekserin_gshastighet (raskere bruker mer ressurser):"
+
+#: ../src/tracker-preferences/tracker-preferences.ui.h:21
 msgid "Limitations"
 msgstr "Begrensninger"
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:20
+#: ../src/tracker-preferences/tracker-preferences.ui.h:22
 msgid "Locations"
 msgstr "Lokasjoner"
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:21
+#: ../src/tracker-preferences/tracker-preferences.ui.h:23
 msgid "Non-Recursively Indexed"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:22
+#: ../src/tracker-preferences/tracker-preferences.ui.h:24
+msgid "Opens text entry for glob patterns"
+msgstr ""
+
+#: ../src/tracker-preferences/tracker-preferences.ui.h:25
+msgid "Opens the filechooser dialogue"
+msgstr ""
+
+#: ../src/tracker-preferences/tracker-preferences.ui.h:26
 msgid "Recursively Indexed"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:23
+#: ../src/tracker-preferences/tracker-preferences.ui.h:27
 msgid "Semantics"
 msgstr "Semantikk"
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:24
+#: ../src/tracker-preferences/tracker-preferences.ui.h:28
 msgid "Slower"
 msgstr "Tregere"
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:25
+#: ../src/tracker-preferences/tracker-preferences.ui.h:29
 msgid "Start up"
 msgstr "Oppstart"
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:26
-msgid "Thr_ottle:"
+#: ../src/tracker-preferences/tracker-preferences.ui.h:30
+msgid "Stop indexing when _disk space is below:"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:27
-msgid "Tracker Preferences"
-msgstr "Brukervalg for Tracker"
+#: ../src/tracker-preferences/tracker-preferences.ui.h:31
+msgid "This covers ALL removable media, memory cards, CDs, DVDs, etc."
+msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:28
+#: ../src/tracker-preferences/tracker-preferences.ui.h:32
 msgid ""
 "When toggled, this makes sure your home directory is included in the list."
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:29
+#: ../src/tracker-preferences/tracker-preferences.ui.h:33
 msgid "With specific files:"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:30
+#: ../src/tracker-preferences/tracker-preferences.ui.h:34
 msgid "_Delay"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:31
-msgid "_Disk space:"
+#: ../src/tracker-preferences/tracker-preferences.ui.h:35
+msgid "_Monitor file and directory changes"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:32
+#: ../src/tracker-preferences/tracker-preferences.ui.h:36
 msgid "_Never display icon"
 msgstr "_Aldri vis ikon"
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:33
+#: ../src/tracker-preferences/tracker-preferences.ui.h:37
 msgid "_Only display when indexing content"
 msgstr ""
 
-#: ../src/tracker-preferences/tracker-preferences.ui.h:34
+#: ../src/tracker-preferences/tracker-preferences.ui.h:38
 msgid "seconds"
 msgstr "sekunder"
 
@@ -675,56 +649,68 @@ msgstr "Søkefelt"
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:648
-#: ../src/tracker-search-bar/tracker-results-window.c:664
+#: ../src/tracker-search-bar/tracker-results-window.c:661
+#: ../src/tracker-search-bar/tracker-results-window.c:677
 msgid "Other"
 msgstr "Annet"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:649
+#: ../src/tracker-search-bar/tracker-results-window.c:662
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:651
+#: ../src/tracker-search-bar/tracker-results-window.c:664
 msgid "Email Addresses"
 msgstr "E-postadresser"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:652
+#: ../src/tracker-search-bar/tracker-results-window.c:665
+#: ../src/tracker-search-tool/tracker-category-view.gs:63
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:655
+#: ../src/tracker-search-bar/tracker-results-window.c:667
+#: ../src/tracker-search-tool/tracker-category-view.gs:67
+msgid "Images"
+msgstr "Bilder"
+
+#: ../src/tracker-search-bar/tracker-results-window.c:668
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:656
+#: ../src/tracker-search-bar/tracker-results-window.c:669
+#: ../src/tracker-search-tool/tracker-category-view.gs:59
 msgid "Folders"
 msgstr "Mapper"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:657
+#: ../src/tracker-search-bar/tracker-results-window.c:670
 msgid "Fonts"
 msgstr "Skrifter"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:659
+#: ../src/tracker-search-bar/tracker-results-window.c:671
+#: ../src/tracker-search-tool/tracker-category-view.gs:75
+msgid "Videos"
+msgstr "Videoer"
+
+#: ../src/tracker-search-bar/tracker-results-window.c:672
 msgid "Archives"
 msgstr "Arkiv"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:660
+#: ../src/tracker-search-bar/tracker-results-window.c:673
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:661
+#: ../src/tracker-search-bar/tracker-results-window.c:674
 msgid "Links"
 msgstr "Lenker"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:999
+#: ../src/tracker-search-bar/tracker-results-window.c:1048
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:1023
+#: ../src/tracker-search-bar/tracker-results-window.c:1076
 msgid "Title"
 msgstr "Tittel"
 
-#: ../src/tracker-search-bar/tracker-results-window.c:1087
+#: ../src/tracker-search-bar/tracker-results-window.c:1142
 #, c-format
 msgid "No results found for “%s”"
 msgstr "Ingen resultater funnet for «%s»"
@@ -755,70 +741,70 @@ msgid ""
 "Street, Fifth Floor, Boston, MA  02110-1301, USA."
 msgstr ""
 
-#: ../src/tracker-search-tool/tracker-category-view.gs:54
+#: ../src/tracker-search-tool/tracker-category-view.gs:55
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../src/tracker-search-tool/tracker-category-view.gs:58
-msgid "Office Documents"
-msgstr "Kontorstøttedokumenter"
+#: ../src/tracker-search-tool/tracker-category-view.gs:71
+msgid "Music"
+msgstr "Musikk"
 
 #: ../src/tracker-search-tool/tracker-entry.gs:39
 msgid "Clear the search text"
 msgstr "Fjern søketeksten"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:105
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:95
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:111
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:101
 msgid "Folder:"
 msgstr "Mappe:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:115
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:105
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:121
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:110
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:127
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:115
 msgid "Modified:"
 msgstr "Endret:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:316
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:342
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:313
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:339
 msgid "Height:"
 msgstr "Høyde:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:317
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:343
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:314
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:340
 msgid "Width:"
 msgstr "Bredde:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:329
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:355
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:325
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:353
 msgid "Title:"
 msgstr "Tittel:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:330
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:326
 msgid "Artist:"
 msgstr "Artist:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:331
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:327
 msgid "Album:"
 msgstr "Album:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:344
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:341
 msgid "Duration:"
 msgstr "Varighet:"
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:356
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:354
 msgid "Author:"
 msgstr ""
 
-#: ../src/tracker-search-tool/tracker-metadata-tile.gs:357
+#: ../src/tracker-search-tool/tracker-metadata-tile.gs:355
 msgid "Page count:"
 msgstr "Sideantall:"
 
@@ -842,14 +828,14 @@ msgstr ""
 "Klarte ikke å laste brukergrensesnitt\n"
 "%s"
 
-#: ../src/tracker-search-tool/tracker-utils.gs:97
+#: ../src/tracker-search-tool/tracker-utils.gs:96
 #, c-format
 msgid ""
 "Could not get application info for %s\n"
 "Error: %s\n"
 msgstr ""
 
-#: ../src/tracker-search-tool/tracker-utils.gs:111
+#: ../src/tracker-search-tool/tracker-utils.gs:104
 #, c-format
 msgid ""
 "Could not lauch %s\n"
@@ -859,14 +845,14 @@ msgstr ""
 "Feil: %s\n"
 
 #: ../src/tracker-status-icon/tracker-main.c:46
-#: ../src/tracker-control/tracker-control.c:87
+#: ../src/tracker-control/tracker-control.c:99
 #: ../src/tracker-utils/tracker-import.c:51
-#: ../src/tracker-utils/tracker-info.c:49
-#: ../src/tracker-utils/tracker-search.c:108
-#: ../src/tracker-utils/tracker-sparql.c:78
+#: ../src/tracker-utils/tracker-info.c:50
+#: ../src/tracker-utils/tracker-search.c:123
+#: ../src/tracker-utils/tracker-sparql.c:93
 #: ../src/tracker-utils/tracker-stats.c:47
-#: ../src/tracker-utils/tracker-status.c:99
-#: ../src/tracker-utils/tracker-tag.c:83
+#: ../src/tracker-utils/tracker-status.c:116
+#: ../src/tracker-utils/tracker-tag.c:88
 msgid "Print version"
 msgstr "Vis versjon"
 
@@ -938,143 +924,137 @@ msgstr ""
 msgid "Tracker Applet"
 msgstr ""
 
-#: ../src/tracker-store/tracker-main.c:111
-msgid "Minimizes the use of memory but may slow indexing down"
-msgstr ""
-
-#: ../src/tracker-store/tracker-main.c:117
+#: ../src/tracker-store/tracker-main.c:106
 msgid "Force a re-index of all content"
 msgstr ""
 
-#: ../src/tracker-store/tracker-main.c:121
+#: ../src/tracker-store/tracker-main.c:110
 msgid "Only allow read based actions on the database"
 msgstr ""
 
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.
-#: ../src/tracker-store/tracker-main.c:371
+#: ../src/tracker-store/tracker-main.c:362
 msgid "- start the tracker daemon"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:65
-msgid "Use SIGKILL to stop all tracker processes found - guarantees death :)"
+#: ../src/tracker-control/tracker-control.c:78
+msgid ""
+"Use SIGKILL to stop all matching processes, either \"store\", \"miners\" or "
+"\"all\" may be used, no parameter equals \"all\""
+msgstr ""
+
+#: ../src/tracker-control/tracker-control.c:79
+#: ../src/tracker-control/tracker-control.c:82
+msgid "APPS"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:68
-msgid "Use SIGTERM to stop all tracker processes found"
+#: ../src/tracker-control/tracker-control.c:81
+msgid ""
+"Use SIGTERM to stop all matrhing processes, either \"store\", \"miners\" or "
+"\"all\" may be used, no parameter equals \"all\""
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:72
+#: ../src/tracker-control/tracker-control.c:84
 msgid "Kill all Tracker processes and remove all databases"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:75
+#: ../src/tracker-control/tracker-control.c:87
 msgid ""
 "Same as --hard-reset but the backup & journal are restored after restart"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:78
+#: ../src/tracker-control/tracker-control.c:90
 msgid "Remove all configuration files so they are re-generated on next start"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:81
+#: ../src/tracker-control/tracker-control.c:93
 msgid "Starts miners (which indirectly starts tracker-store too)"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:84
+#: ../src/tracker-control/tracker-control.c:96
 msgid ""
 "Reindex files which match the mime type supplied (for new extractors), use -"
 "m MIME1 -m MIME2"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:103
+#: ../src/tracker-control/tracker-control.c:115
 msgid "Could not open /proc"
 msgstr "Kunne ikke åpne /proc"
 
-#: ../src/tracker-control/tracker-control.c:104
-#: ../src/tracker-control/tracker-control.c:272
-#: ../src/tracker-control/tracker-control.c:302
-#: ../src/tracker-control/tracker-control.c:316
+#: ../src/tracker-control/tracker-control.c:116
+#: ../src/tracker-control/tracker-control.c:320
+#: ../src/tracker-control/tracker-control.c:359
+#: ../src/tracker-control/tracker-control.c:380
 msgid "no error given"
 msgstr "ingen feil ble gitt"
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
-#: ../src/tracker-control/tracker-control.c:219
+#: ../src/tracker-control/tracker-control.c:266
 msgid " - Manage Tracker processes and data"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:231
+#: ../src/tracker-control/tracker-control.c:278
 msgid "You can not use the --kill and --terminate arguments together"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:235
+#: ../src/tracker-control/tracker-control.c:282
 msgid ""
 "You can not use the --terminate with --hard-reset or --soft-reset, --kill is "
 "implied"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:239
+#: ../src/tracker-control/tracker-control.c:286
 msgid "You can not use the --hard-reset and --soft-reset arguments together"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:269
+#: ../src/tracker-control/tracker-control.c:317
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke åpne «%s»"
 
-#: ../src/tracker-control/tracker-control.c:291
+#: ../src/tracker-control/tracker-control.c:341
 #, c-format
 msgid "Found process ID %d for '%s'"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:299
+#: ../src/tracker-control/tracker-control.c:356
 #, c-format
 msgid "Could not terminate process %d"
 msgstr "Kunne ikke terminere prosess %d"
 
-#: ../src/tracker-control/tracker-control.c:305
+#: ../src/tracker-control/tracker-control.c:362
 #, c-format
 msgid "Terminated process %d"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:313
-#, fuzzy, c-format
+#: ../src/tracker-control/tracker-control.c:377
+#, c-format
 msgid "Could not kill process %d"
-msgstr "Kunne ikke slette «%s»."
+msgstr "Kunne ikke terminere prosess %d"
 
-#: ../src/tracker-control/tracker-control.c:319
+#: ../src/tracker-control/tracker-control.c:383
 #, c-format
 msgid "Killed process %d"
-msgstr ""
+msgstr "Terminerte prosess %d"
 
-#: ../src/tracker-control/tracker-control.c:404
+#: ../src/tracker-control/tracker-control.c:468
 msgid "Removing configuration files…"
 msgstr "Fjerner konfigurasjonsfiler..."
 
-#: ../src/tracker-control/tracker-control.c:421
+#: ../src/tracker-control/tracker-control.c:485
 msgid "Waiting one second before starting miners…"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:427
+#: ../src/tracker-control/tracker-control.c:491
 msgid "Starting miners…"
 msgstr ""
 
-#: ../src/tracker-control/tracker-control.c:441
-msgid "Failed"
-msgstr "Feilet"
-
-#: ../src/tracker-control/tracker-control.c:443
-#, fuzzy
-msgid "Could not get miner status"
-msgstr "Kunne ikke slette «%s»."
-
-#: ../src/tracker-control/tracker-control.c:446
-#: ../src/tracker-utils/tracker-import.c:139
-#: ../src/tracker-utils/tracker-status.c:193
-msgid "Done"
-msgstr "Ferdig"
+#: ../src/tracker-control/tracker-control.c:506
+msgid "perhaps a disabled plugin?"
+msgstr ""
 
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
@@ -1083,16 +1063,16 @@ msgid "- Import data using Turtle files"
 msgstr ""
 
 #: ../src/tracker-utils/tracker-import.c:93
-#: ../src/tracker-utils/tracker-info.c:119
+#: ../src/tracker-utils/tracker-info.c:215
 msgid "One or more files have not been specified"
 msgstr ""
 
 #: ../src/tracker-utils/tracker-import.c:109
-#: ../src/tracker-utils/tracker-info.c:135
-#: ../src/tracker-utils/tracker-sparql.c:206
+#: ../src/tracker-utils/tracker-info.c:231
+#: ../src/tracker-utils/tracker-sparql.c:244
 #: ../src/tracker-utils/tracker-stats.c:106
-#: ../src/tracker-utils/tracker-status.c:419
-#: ../src/tracker-utils/tracker-tag.c:680
+#: ../src/tracker-utils/tracker-status.c:544
+#: ../src/tracker-utils/tracker-tag.c:898
 msgid "Could not establish a D-Bus connection to Tracker"
 msgstr ""
 
@@ -1104,271 +1084,351 @@ msgstr ""
 msgid "Unable to import Turtle file"
 msgstr ""
 
+#: ../src/tracker-utils/tracker-import.c:139
+#: ../src/tracker-utils/tracker-status.c:211
+msgid "Done"
+msgstr "Ferdig"
+
+#: ../src/tracker-utils/tracker-info.c:54
+msgid "Show full namespaces (i.e. don't use nie:title, use full URLs)"
+msgstr ""
+
 #. Translators: this messagge will apper immediately after the
 #. usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
-#: ../src/tracker-utils/tracker-info.c:101
+#: ../src/tracker-utils/tracker-info.c:197
 msgid "- Get all information about one or more files"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-info.c:147
+#: ../src/tracker-utils/tracker-info.c:245
 msgid "Querying information for entity"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-info.c:168
+#: ../src/tracker-utils/tracker-info.c:266
 msgid "Unable to retrieve URN for URI"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-info.c:199
+#: ../src/tracker-utils/tracker-info.c:297
 msgid "Unable to retrieve data for URI"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-info.c:208
+#: ../src/tracker-utils/tracker-info.c:306
 msgid "No metadata available for that URI"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:60
-#: ../src/tracker-utils/tracker-tag.c:55
+#: ../src/tracker-utils/tracker-search.c:63
+#: ../src/tracker-utils/tracker-tag.c:56
 msgid "Limit the number of results shown"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:61
-#: ../src/tracker-utils/tracker-tag.c:56
+#: ../src/tracker-utils/tracker-search.c:64
+#: ../src/tracker-utils/tracker-tag.c:57
 msgid "512"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:64
-#: ../src/tracker-utils/tracker-tag.c:59
+#: ../src/tracker-utils/tracker-search.c:67
+#: ../src/tracker-utils/tracker-tag.c:60
 msgid "Offset the results"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:65
-#: ../src/tracker-utils/tracker-tag.c:60
+#: ../src/tracker-utils/tracker-search.c:68
+#: ../src/tracker-utils/tracker-tag.c:61
 msgid "0"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:68
-#: ../src/tracker-utils/tracker-tag.c:63
+#: ../src/tracker-utils/tracker-search.c:71
+#: ../src/tracker-utils/tracker-tag.c:64
 msgid "Use OR for search terms instead of AND (the default)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:72
-msgid "Show more detailed results (only applies to general search)"
+#: ../src/tracker-utils/tracker-search.c:75
+msgid ""
+"Show URNs for results (doesn't apply to --music-albums, --music-artists)"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-search.c:79
+msgid "Return all non-existing matches too (i.e. include unmounted volumes)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:76
+#: ../src/tracker-utils/tracker-search.c:83
 msgid "Search for files"
 msgstr "Søk etter filer"
 
-#: ../src/tracker-utils/tracker-search.c:80
+#: ../src/tracker-utils/tracker-search.c:87
 msgid "Search for folders"
 msgstr "Søk etter mapper"
 
-#: ../src/tracker-utils/tracker-search.c:84
-msgid "Search for music albums (includes song count and duration sum)"
-msgstr ""
-
-#: ../src/tracker-utils/tracker-search.c:88
-msgid "Search for music artists"
-msgstr "Søk etter musikkartister"
-
-#: ../src/tracker-utils/tracker-search.c:92
+#: ../src/tracker-utils/tracker-search.c:91
 msgid "Search for music files"
 msgstr "Søk etter musikkfiler"
 
-#: ../src/tracker-utils/tracker-search.c:96
+#: ../src/tracker-utils/tracker-search.c:95
+msgid "Search for music albums (--all has no effect on this)"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-search.c:99
+msgid "Search for music artists (--all has no effect on this) "
+msgstr "Søk etter musikkartister (--all har ingen effekt) "
+
+#: ../src/tracker-utils/tracker-search.c:103
 msgid "Search for image files"
 msgstr "Søk etter bildefiler"
 
-#: ../src/tracker-utils/tracker-search.c:100
+#: ../src/tracker-utils/tracker-search.c:107
 msgid "Search for video files"
-msgstr ""
+msgstr "Søk etter videofiler"
 
-#: ../src/tracker-utils/tracker-search.c:104
+#: ../src/tracker-utils/tracker-search.c:111
 msgid "Search for document files"
 msgstr "Søk etter dokumentfiler"
 
-#: ../src/tracker-utils/tracker-search.c:113
+#: ../src/tracker-utils/tracker-search.c:115
+msgid "Search for emails"
+msgstr "Søk etter e-post"
+
+#: ../src/tracker-utils/tracker-search.c:119
+msgid "Search for contacts"
+msgstr "Søk etter kontakter"
+
+#: ../src/tracker-utils/tracker-search.c:128
 msgid "search terms"
-msgstr ""
+msgstr "søkebegreper"
 
-#: ../src/tracker-utils/tracker-search.c:114
+#: ../src/tracker-utils/tracker-search.c:129
 msgid "EXPRESSION"
 msgstr "UTTRYKK"
 
-#: ../src/tracker-utils/tracker-search.c:131
-#: ../src/tracker-utils/tracker-tag.c:106
+#: ../src/tracker-utils/tracker-search.c:146
+#: ../src/tracker-utils/tracker-tag.c:111
 msgid ""
 "NOTE: Limit was reached, there are more items in the database not listed here"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:191
-#: ../src/tracker-utils/tracker-search.c:456
-#: ../src/tracker-utils/tracker-search.c:563
-#: ../src/tracker-utils/tracker-search.c:745
+#: ../src/tracker-utils/tracker-search.c:209
+#: ../src/tracker-utils/tracker-search.c:318
+#: ../src/tracker-utils/tracker-search.c:433
+#: ../src/tracker-utils/tracker-search.c:730
+#: ../src/tracker-utils/tracker-search.c:808
+#: ../src/tracker-utils/tracker-search.c:1056
 msgid "Could not get search results"
 msgstr "Kunne ikke hente søkeresultater"
 
-#: ../src/tracker-utils/tracker-search.c:200
+#: ../src/tracker-utils/tracker-search.c:218
+msgid "No contacts were found"
+msgstr "Ingen kontakter ble funnet"
+
+#: ../src/tracker-utils/tracker-search.c:327
+msgid "No emails were found"
+msgstr "Ingen e-post ble funnet"
+
+#: ../src/tracker-utils/tracker-search.c:442
 msgid "No files were found"
 msgstr "Ingen filer ble funnet"
 
-#: ../src/tracker-utils/tracker-search.c:465
+#: ../src/tracker-utils/tracker-search.c:739
 msgid "No artists were found"
 msgstr "Ingen artister ble funnet"
 
-#: ../src/tracker-utils/tracker-search.c:572
+#: ../src/tracker-utils/tracker-search.c:817
 msgid "No music was found"
 msgstr "Ingen musikk ble funnet"
 
-#: ../src/tracker-utils/tracker-search.c:754
+#: ../src/tracker-utils/tracker-search.c:1065
 msgid "No results were found matching your query"
 msgstr ""
 
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
 #.
-#: ../src/tracker-utils/tracker-search.c:794
+#: ../src/tracker-utils/tracker-search.c:1105
 msgid "- Search for terms in all data"
 msgstr ""
 
 #. Translators: this message will appear after the usage string
 #. * and before the list of options.
 #.
-#: ../src/tracker-utils/tracker-search.c:799
+#: ../src/tracker-utils/tracker-search.c:1110
 msgid ""
 "Applies an AND operator to all terms separated by a space (see --or-operator)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:803
+#: ../src/tracker-utils/tracker-search.c:1114
 msgid ""
 "This means if you search for 'foo' and 'bar', they must BOTH exist (unless "
 "you use --or-operator)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:828
+#: ../src/tracker-utils/tracker-search.c:1141
 msgid "Search terms are missing"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:866
+#: ../src/tracker-utils/tracker-search.c:1179
 #, c-format
 msgid "Search term '%s' is a stop word."
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:869
+#: ../src/tracker-utils/tracker-search.c:1182
 #, c-format
 msgid ""
 "Stop words are common words which are ignored during the indexing process."
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:872
+#: ../src/tracker-utils/tracker-search.c:1185
 #, c-format
 msgid ""
 "This means this search term will never be found when matching FTS entries."
 msgstr ""
 
-#: ../src/tracker-utils/tracker-search.c:891
+#: ../src/tracker-utils/tracker-search.c:1204
 msgid "Could not establish a DBus connection to Tracker"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:54
+#: ../src/tracker-utils/tracker-sparql.c:61
 msgid "Path to use to run a query or update from file"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:58
+#: ../src/tracker-utils/tracker-sparql.c:65
 msgid "SPARQL query"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:59
+#: ../src/tracker-utils/tracker-sparql.c:66
 msgid "SPARQL"
 msgstr "SPARQL"
 
-#: ../src/tracker-utils/tracker-sparql.c:62
+#: ../src/tracker-utils/tracker-sparql.c:69
 msgid "This is used with --query and for database updates only."
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:66
+#: ../src/tracker-utils/tracker-sparql.c:73
 msgid "Retrieve classes"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:70
+#: ../src/tracker-utils/tracker-sparql.c:77
 msgid "Retrieve class prefixes"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:74
+#: ../src/tracker-utils/tracker-sparql.c:81
 msgid ""
 "Retrieve properties for a class, prefixes can be used too (e.g. rdfs:"
 "Resource)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:75
+#: ../src/tracker-utils/tracker-sparql.c:82
+#: ../src/tracker-utils/tracker-sparql.c:86
 msgid "CLASS"
 msgstr "KLASSE"
 
-#: ../src/tracker-utils/tracker-sparql.c:105
+#: ../src/tracker-utils/tracker-sparql.c:85
+msgid ""
+"Retrieve classes which notify changes in the database (CLASS is optional)"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-sparql.c:89
+msgid ""
+"Search for a class or property and display more information (e.g. Document)"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-sparql.c:90
+msgid "CLASS/PROPERTY"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-sparql.c:120
 #, fuzzy
 msgid "Could not get namespace prefixes"
 msgstr "Kunne ikke åpne mappe «%s»."
 
-#: ../src/tracker-utils/tracker-sparql.c:114
+#: ../src/tracker-utils/tracker-sparql.c:129
 msgid "No namespace prefixes were found"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:173
+#: ../src/tracker-utils/tracker-sparql.c:204
 msgid "- Query or update using SPARQL"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:190
-msgid "Either a file or query needs to be specified"
+#: ../src/tracker-utils/tracker-sparql.c:218
+msgid "An argument must be supplied"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-sparql.c:220
+msgid "File and query can not be used together"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:219
+#: ../src/tracker-utils/tracker-sparql.c:256
 #, fuzzy
 msgid "Could not list classes"
 msgstr "Kunne ikke lagre dokument."
 
-#: ../src/tracker-utils/tracker-sparql.c:229
+#: ../src/tracker-utils/tracker-sparql.c:266
 msgid "No classes were found"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:257
+#: ../src/tracker-utils/tracker-sparql.c:294
 #, fuzzy
 msgid "Could not list class prefixes"
 msgstr "Kunne ikke åpne mappe «%s»."
 
-#: ../src/tracker-utils/tracker-sparql.c:267
+#: ../src/tracker-utils/tracker-sparql.c:304
 msgid "No class prefixes were found"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:299
+#: ../src/tracker-utils/tracker-sparql.c:336
 msgid ""
 "Could not find property for class prefix, e.g. :Resource in 'rdfs:Resource'"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:336
+#: ../src/tracker-utils/tracker-sparql.c:375
 msgid "Could not list properties"
 msgstr "Kunne ikke vise egenskaper"
 
-#: ../src/tracker-utils/tracker-sparql.c:346
+#: ../src/tracker-utils/tracker-sparql.c:385
 msgid "No properties were found"
 msgstr "Ingen egenskaper ble funnet"
 
-#: ../src/tracker-utils/tracker-sparql.c:368
+#: ../src/tracker-utils/tracker-sparql.c:425
+#, fuzzy
+msgid "Could not find notify classes"
+msgstr "Kunne ikke lagre dokument."
+
+#: ../src/tracker-utils/tracker-sparql.c:431
+#, fuzzy
+msgid "No notifies were found"
+msgstr "Ingen filer ble funnet"
+
+#: ../src/tracker-utils/tracker-sparql.c:462
+#, fuzzy
+msgid "Could not search classes"
+msgstr "Kunne ikke lagre dokument."
+
+#: ../src/tracker-utils/tracker-sparql.c:468
+msgid "No classes were found to match search term"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-sparql.c:496
+#, fuzzy
+msgid "Could not search properties"
+msgstr "Kunne ikke vise egenskaper"
+
+#: ../src/tracker-utils/tracker-sparql.c:502
+#, fuzzy
+msgid "No properties were found to match search term"
+msgstr "Ingen egenskaper ble funnet"
+
+#: ../src/tracker-utils/tracker-sparql.c:525
 msgid "Could not get UTF-8 path from path"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-sparql.c:380
+#: ../src/tracker-utils/tracker-sparql.c:537
 msgid "Could not read file"
 msgstr "Kunne ikke lese fil"
 
-#: ../src/tracker-utils/tracker-sparql.c:399
+#: ../src/tracker-utils/tracker-sparql.c:556
 msgid "Could not run update"
 msgstr "Kunne ikke kjøre oppdatering"
 
-#: ../src/tracker-utils/tracker-sparql.c:434
+#: ../src/tracker-utils/tracker-sparql.c:594
 msgid "Could not run query"
 msgstr "Kunne ikke kjøre spørring"
 
-#: ../src/tracker-utils/tracker-sparql.c:443
+#: ../src/tracker-utils/tracker-sparql.c:603
 msgid "No results found matching your query"
 msgstr ""
 
@@ -1390,223 +1450,312 @@ msgstr "Ingen statistikk tilgjengelig"
 msgid "Statistics:"
 msgstr "Statistikk:"
 
-#: ../src/tracker-utils/tracker-status.c:67
+#: ../src/tracker-utils/tracker-status.c:71
+msgid "Fetching…"
+msgstr ""
+
+#. miner/rss
+#: ../src/tracker-utils/tracker-status.c:72
+#, c-format
+msgid "Crawling single directory '%s'"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-status.c:73
+#, c-format
+msgid "Crawling recursively directory '%s'"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-status.c:74
+msgid "Paused"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-status.c:75
+msgid "Idle"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-status.c:80
 msgid "Follow status changes as they happen"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:71
+#: ../src/tracker-utils/tracker-status.c:84
 msgid "Include details with state updates (only applies to --follow)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:75
+#: ../src/tracker-utils/tracker-status.c:88
+msgid "List common statuses for miners and the store"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-status.c:92
 msgid "List all miners currently running"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:79
+#: ../src/tracker-utils/tracker-status.c:96
 msgid "List all miners installed"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:83
+#: ../src/tracker-utils/tracker-status.c:100
 msgid "List pause reasons and applications for a miner"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:87
+#: ../src/tracker-utils/tracker-status.c:104
 msgid ""
 "Miner to use with other commands (you can use suffixes, e.g. FS or "
 "Applications)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:88
+#: ../src/tracker-utils/tracker-status.c:105
 msgid "MINER"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:91
+#: ../src/tracker-utils/tracker-status.c:108
 msgid "Pause a miner (you must use this with --miner)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:92
+#: ../src/tracker-utils/tracker-status.c:109
 msgid "REASON"
 msgstr "ÅRSAK"
 
-#: ../src/tracker-utils/tracker-status.c:95
+#: ../src/tracker-utils/tracker-status.c:112
 msgid "Resume a miner (you must use this with --miner)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:96
+#: ../src/tracker-utils/tracker-status.c:113
 msgid "COOKIE"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:156
+#: ../src/tracker-utils/tracker-status.c:174
 #, c-format
 msgid "Attempting to pause miner '%s' with reason '%s'"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:163
+#: ../src/tracker-utils/tracker-status.c:181
 #, fuzzy, c-format
 msgid "Could not pause miner: %s"
 msgstr "Kunne ikke åpne mappe «%s»."
 
-#: ../src/tracker-utils/tracker-status.c:168
+#: ../src/tracker-utils/tracker-status.c:186
 #, c-format
 msgid "Cookie is %d"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:182
+#: ../src/tracker-utils/tracker-status.c:200
 #, c-format
 msgid "Attempting to resume miner %s with cookie %d"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:189
+#: ../src/tracker-utils/tracker-status.c:207
 #, fuzzy, c-format
 msgid "Could not resume miner: %s"
 msgstr "Kunne ikke flytte «%s» til papirkurven."
 
-#: ../src/tracker-utils/tracker-status.c:209
+#: ../src/tracker-utils/tracker-status.c:227
 #, fuzzy, c-format
 msgid "Could not get status from miner: %s"
 msgstr "Kunne ikke åpne mappe «%s»."
 
-#: ../src/tracker-utils/tracker-status.c:252
+#. Work out lengths for output spacing
+#: ../src/tracker-utils/tracker-status.c:285
+#: ../src/tracker-utils/tracker-status.c:684
 msgid "PAUSED"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:354
+#: ../src/tracker-utils/tracker-status.c:299
+msgid "Not running or is a disabled plugin"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-status.c:355
+msgid "Journal replay"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-status.c:479
 msgid "- Monitor and control status"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:369
+#: ../src/tracker-utils/tracker-status.c:494
 msgid "You can not use miner pause and resume switches together"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:383
+#: ../src/tracker-utils/tracker-status.c:508
 msgid "You must provide the miner for pause or resume commands"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:397
+#: ../src/tracker-utils/tracker-status.c:522
 msgid "You must provide a pause or resume command for the miner"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:431
+#: ../src/tracker-utils/tracker-status.c:556
+msgid "Common statuses include"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-status.c:568
 #, c-format
 msgid "Found %d miners installed"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:443
+#: ../src/tracker-utils/tracker-status.c:580
 #, c-format
 msgid "Found %d miners running"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:476
+#: ../src/tracker-utils/tracker-status.c:613
 msgid "No miners are running"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:516
-#: ../src/tracker-utils/tracker-status.c:546
+#: ../src/tracker-utils/tracker-status.c:653
+#: ../src/tracker-utils/tracker-status.c:700
 msgid "Miners"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-status.c:523
+#: ../src/tracker-utils/tracker-status.c:660
 msgid "Application"
 msgstr "Program"
 
-#: ../src/tracker-utils/tracker-status.c:525
+#: ../src/tracker-utils/tracker-status.c:662
 msgid "Reason"
 msgstr "Årsak"
 
-#: ../src/tracker-utils/tracker-status.c:534
+#: ../src/tracker-utils/tracker-status.c:671
 msgid "No miners are paused"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:67
+#. Display states
+#: ../src/tracker-utils/tracker-status.c:694
+msgid "Store"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-tag.c:68
 msgid "List all tags (using FILTER if specified)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:71
+#: ../src/tracker-utils/tracker-tag.c:72
 msgid "Show files associated with each tag (this is only used with --list)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:75
+#: ../src/tracker-utils/tracker-tag.c:76
 msgid "Add a tag (if FILEs are omitted, TAG is not associated with any files)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:76 ../src/tracker-utils/tracker-tag.c:80
+#: ../src/tracker-utils/tracker-tag.c:77 ../src/tracker-utils/tracker-tag.c:81
 msgid "TAG"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:79
+#: ../src/tracker-utils/tracker-tag.c:80
 msgid "Delete a tag (if FILEs are omitted, TAG is removed for all files)"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:89
+#: ../src/tracker-utils/tracker-tag.c:84
+msgid "Description for a tag (this is only used with --add)"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-tag.c:85
+msgid "STRING"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-tag.c:94
 msgid "FILE…"
 msgstr "FIL..."
 
-#: ../src/tracker-utils/tracker-tag.c:90
+#: ../src/tracker-utils/tracker-tag.c:95
 msgid "FILE [FILE…]"
 msgstr "FIL [FIL...]"
 
-#: ../src/tracker-utils/tracker-tag.c:290
+#: ../src/tracker-utils/tracker-tag.c:299
+#, fuzzy
+msgid "Could not get file URNs"
+msgstr "Kunne ikke lese fil"
+
+#: ../src/tracker-utils/tracker-tag.c:390
 #, fuzzy
 msgid "Could not get files related to tag"
 msgstr "Kunne ikke slette «%s»."
 
-#: ../src/tracker-utils/tracker-tag.c:363
-#: ../src/tracker-utils/tracker-tag.c:600
+#: ../src/tracker-utils/tracker-tag.c:463
+#: ../src/tracker-utils/tracker-tag.c:816
 #, fuzzy
 msgid "Could not get all tags"
 msgstr "Kunne ikke slette «%s»."
 
-#: ../src/tracker-utils/tracker-tag.c:372
-#: ../src/tracker-utils/tracker-tag.c:609
+#: ../src/tracker-utils/tracker-tag.c:472
+#: ../src/tracker-utils/tracker-tag.c:825
 msgid "No tags were found"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:462
+#: ../src/tracker-utils/tracker-tag.c:586
 #, fuzzy
 msgid "Could not add tag"
 msgstr "Kunne ikke lagre dokument."
 
-#: ../src/tracker-utils/tracker-tag.c:470
+#: ../src/tracker-utils/tracker-tag.c:595
 msgid "Tag was added successfully"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:504
+#: ../src/tracker-utils/tracker-tag.c:636
+#, fuzzy
+msgid "Could not add tag to files"
+msgstr "Kunne ikke lagre dokument."
+
+#: ../src/tracker-utils/tracker-tag.c:647
+#, fuzzy
+msgid "Tagged"
+msgstr "Bilder"
+
+#: ../src/tracker-utils/tracker-tag.c:648
+msgid "Not tagged, file is not indexed"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-tag.c:693
 #, fuzzy
 msgid "Could not get tag by label"
 msgstr "Kunne ikke slette «%s»."
 
-#: ../src/tracker-utils/tracker-tag.c:514
+#: ../src/tracker-utils/tracker-tag.c:704
 msgid "No tags were found by that name"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:555
+#: ../src/tracker-utils/tracker-tag.c:717
+msgid "None of the files had this tag set"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-tag.c:759
 #, fuzzy
 msgid "Could not remove tag"
 msgstr "Kunne ikke flytte «%s» til papirkurven."
 
-#: ../src/tracker-utils/tracker-tag.c:563
+#: ../src/tracker-utils/tracker-tag.c:768
 msgid "Tag was removed successfully"
 msgstr ""
 
+#: ../src/tracker-utils/tracker-tag.c:772
+msgid "Untagged"
+msgstr ""
+
+#: ../src/tracker-utils/tracker-tag.c:773
+msgid "File not indexed or already untagged"
+msgstr ""
+
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
 #.
-#: ../src/tracker-utils/tracker-tag.c:638
+#: ../src/tracker-utils/tracker-tag.c:854
 msgid "Add, remove or list tags"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:654
+#: ../src/tracker-utils/tracker-tag.c:870
 msgid "The --list option is required for --show-files"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:656
+#: ../src/tracker-utils/tracker-tag.c:872
 msgid "Add and delete actions can not be used together"
 msgstr ""
 
-#: ../src/tracker-utils/tracker-tag.c:658
+#: ../src/tracker-utils/tracker-tag.c:874
 msgid "No arguments were provided"
 msgstr ""
 
+#: ../src/tracker-utils/tracker-tag.c:876
+msgid "The --description option can only be used with --add"
+msgstr ""
+
 #. Translators: this messagge will apper immediately after the
 #. * usage string - Usage: COMMAND <THIS_MESSAGE>
 #.