GNOME.org
 

[tracker] Fixes bug 592400, String translation issues

commit 89a3b37c9c0f5d9eae485d54b1856540bf5e337a
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Sep 21 10:35:47 2009 +0100

    Fixes bug 592400, String translation issues

 data/tracker-miner-fs.desktop.in.in                |    2 +-
 python/gtk-sparql/gtk-sparql.ui                    |    4 ++++
 src/libtracker-common/tracker-power-hal.c          |    2 +-
 src/libtracker-common/tracker-storage-hal.c        |    2 +-
 src/libtracker-miner/tracker-miner-manager.c       |    8 ++++----
 src/libtracker-miner/tracker-miner.c               |   10 +++++-----
 src/plugins/evolution/tracker-evolution-plugin.c   |    8 ++++----
 .../evolution/tracker-evolution-registrar.c        |   12 ++++++------
 src/plugins/kmail/tracker-kmail-registrar.c        |   12 ++++++------
 src/tracker-extract/tracker-albumart.c             |    4 ++--
 src/tracker-extract/tracker-dbus.c                 |   10 +++++-----
 src/tracker-extract/tracker-extract.c              |    4 ++--
 src/tracker-miner-fs/tracker-dbus.c                |   14 +++++++-------
 src/tracker-miner-fs/tracker-main.c                |    4 ++--
 src/tracker-miner-fs/tracker-miner-files.c         |    2 +-
 src/tracker-miner-fs/tracker-thumbnailer.c         |    2 +-
 src/tracker-store/tracker-backup.c                 |    4 ++--
 src/tracker-store/tracker-dbus.c                   |   14 +++++++-------
 src/tracker-store/tracker-main.c                   |    2 +-
 src/tracker-store/tracker-push.c                   |    2 +-
 src/tracker-store/tracker-resources.c              |   14 +++++++-------
 src/tracker-utils/tracker-import.c                 |    2 +-
 src/tracker-utils/tracker-info.c                   |    6 +++---
 src/tracker-utils/tracker-processes.c              |    8 +++++++-
 src/tracker-utils/tracker-sparql.c                 |    2 +-
 src/tracker-utils/tracker-stats.c                  |    2 +-
 src/tracker-utils/tracker-status.c                 |    4 ++--
 src/tracker-utils/tracker-tag.c                    |    2 +-
 28 files changed, 86 insertions(+), 76 deletions(-)
---
diff --git a/data/tracker-miner-fs.desktop.in.in b/data/tracker-miner-fs.desktop.in.in
index 267cced..52c4c6d 100644
--- a/data/tracker-miner-fs.desktop.in.in
+++ b/data/tracker-miner-fs.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Tracker File System Miner 
+_Name=Tracker File System Miner
 _Comment=Crawls and processes files on the file system
 Icon=
 Exec= libexecdir@/tracker-miner-fs
diff --git a/python/gtk-sparql/gtk-sparql.ui b/python/gtk-sparql/gtk-sparql.ui
index 6c1ec28..71c6b53 100644
--- a/python/gtk-sparql/gtk-sparql.ui
+++ b/python/gtk-sparql/gtk-sparql.ui
@@ -15,6 +15,7 @@
         <child>
           <object class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
@@ -78,6 +79,7 @@
                 <child>
                   <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
+                    <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="save_button">
                         <property name="label">gtk-save</property>
@@ -98,6 +100,7 @@
                         <property name="orientation">vertical</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -135,6 +138,7 @@
                         <property name="orientation">vertical</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="position">4</property>
                       </packing>
                     </child>
diff --git a/src/libtracker-common/tracker-power-hal.c b/src/libtracker-common/tracker-power-hal.c
index 17a28f5..f16a385 100644
--- a/src/libtracker-common/tracker-power-hal.c
+++ b/src/libtracker-common/tracker-power-hal.c
@@ -143,7 +143,7 @@ tracker_power_init (TrackerPower *power)
 
 	priv->connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
 	if (dbus_error_is_set (&error)) {
-		g_critical ("Could not get the system DBus connection, %s",
+		g_critical ("Could not get the system D-Bus connection, %s",
 			    error.message);
 		dbus_error_free (&error);
 		return;
diff --git a/src/libtracker-common/tracker-storage-hal.c b/src/libtracker-common/tracker-storage-hal.c
index d57459d..30023d7 100644
--- a/src/libtracker-common/tracker-storage-hal.c
+++ b/src/libtracker-common/tracker-storage-hal.c
@@ -165,7 +165,7 @@ tracker_storage_init (TrackerStorage *storage)
 
 	priv->connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
 	if (dbus_error_is_set (&error)) {
-		g_critical ("Could not get the system DBus connection, %s",
+		g_critical ("Could not get the system D-Bus connection, %s",
 			    error.message);
 		dbus_error_free (&error);
 		return;
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index 36d1e13..bfa515e 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -213,7 +213,7 @@ tracker_miner_manager_init (TrackerMinerManager *manager)
 	priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
 	if (!priv->connection) {
-		g_critical ("Could not connect to the DBus session bus, %s",
+		g_critical ("Could not connect to the D-Bus session bus, %s",
 			    error ? error->message : "no error given.");
 		g_clear_error (&error);
 	}
@@ -224,7 +224,7 @@ tracker_miner_manager_init (TrackerMinerManager *manager)
 						 DBUS_INTERFACE_DBUS);
 
 	if (!priv->proxy) {
-		g_critical ("Could not get proxy for DBus service");
+		g_critical ("Could not get proxy for D-Bus service");
 	}
 
 	priv->miner_proxies = g_hash_table_new_full (NULL, NULL,
@@ -443,7 +443,7 @@ tracker_miner_manager_pause (TrackerMinerManager *manager,
 	proxy = find_miner_proxy (manager, miner);
 
 	if (!proxy) {
-		g_critical ("No DBus proxy found for miner '%s'", miner);
+		g_critical ("No D-Bus proxy found for miner '%s'", miner);
 		return FALSE;
 	}
 
@@ -482,7 +482,7 @@ tracker_miner_manager_resume (TrackerMinerManager *manager,
 	proxy = find_miner_proxy (manager, miner);
 
 	if (!proxy) {
-		g_critical ("No DBus proxy found for miner '%s'", miner);
+		g_critical ("No D-Bus proxy found for miner '%s'", miner);
 		return FALSE;
 	}
 
diff --git a/src/libtracker-miner/tracker-miner.c b/src/libtracker-miner/tracker-miner.c
index 4ce5e4e..7a3edf3 100644
--- a/src/libtracker-miner/tracker-miner.c
+++ b/src/libtracker-miner/tracker-miner.c
@@ -352,7 +352,7 @@ miner_constructed (GObject *object)
 	}
 
 	if (G_UNLIKELY (!data)) {
-		g_critical ("Miner could not register object on DBus session");
+		g_critical ("Miner could not register object on D-Bus session");
 		exit (EXIT_FAILURE);
 		return;
 	}
@@ -376,7 +376,7 @@ dbus_register_service (DBusGProxy  *proxy,
 	GError *error = NULL;
 	guint	result;
 
-	g_message ("Registering DBus service...\n"
+	g_message ("Registering D-Bus service...\n"
 		   "  Name:'%s'",
 		   name);
 
@@ -393,7 +393,7 @@ dbus_register_service (DBusGProxy  *proxy,
 	}
 
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_critical ("DBus service name:'%s' is already taken, "
+		g_critical ("D-Bus service name:'%s' is already taken, "
 			    "perhaps the application is already running?",
 			    name);
 		return FALSE;
@@ -409,7 +409,7 @@ dbus_register_object (GObject		    *object,
 		      const DBusGObjectInfo *info,
 		      const gchar	    *path)
 {
-	g_message ("Registering DBus object...");
+	g_message ("Registering D-Bus object...");
 	g_message ("  Path:'%s'", path);
 	g_message ("  Object Type:'%s'", G_OBJECT_TYPE_NAME (object));
 
@@ -454,7 +454,7 @@ dbus_data_create (TrackerMiner *miner,
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
 	if (!connection) {
-		g_critical ("Could not connect to the DBus session bus, %s",
+		g_critical ("Could not connect to the D-Bus session bus, %s",
 			    error ? error->message : "no error given.");
 		g_error_free (error);
 		return NULL;
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index 5ea9a8a..c3a84fb 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -1746,7 +1746,7 @@ disable_plugin (void)
 			dbus_proxy = NULL;
 		}
 	} else {
-		g_warning ("Could not setup DBus, ReleaseName of %s: %s\n", 
+		g_warning ("Could not setup D-Bus, ReleaseName of %s: %s\n", 
 			   TRACKER_EVOLUTION_MANAGER_SERVICE, error->message);
 
 		g_error_free (error);
@@ -1783,7 +1783,7 @@ enable_plugin (void)
 						DBUS_NAME_FLAG_DO_NOT_QUEUE,
 						&result, &error)) {
 
-		g_warning ("Could not setup DBus, failed at RequestName for %s\n", 
+		g_warning ("Could not setup D-Bus, failed at RequestName for %s\n", 
 			   TRACKER_EVOLUTION_MANAGER_SERVICE);
 
 		goto error_handler;
@@ -1791,7 +1791,7 @@ enable_plugin (void)
 
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 
-		g_warning ("Could not setup DBus, can't become primary owner of %s\n", 
+		g_warning ("Could not setup D-Bus, can't become primary owner of %s\n", 
 			   TRACKER_EVOLUTION_MANAGER_SERVICE);
 
 		goto error_handler;
@@ -1813,7 +1813,7 @@ enable_plugin (void)
 	error_handler:
 
 	if (error) {
-		g_warning ("Could not setup DBus, %s\n", error->message);
+		g_warning ("Could not setup D-Bus, %s\n", error->message);
 		disable_plugin();
 		g_error_free (error);
 	}
diff --git a/src/plugins/evolution/tracker-evolution-registrar.c b/src/plugins/evolution/tracker-evolution-registrar.c
index 4b7ee3f..1a95554 100644
--- a/src/plugins/evolution/tracker-evolution-registrar.c
+++ b/src/plugins/evolution/tracker-evolution-registrar.c
@@ -639,7 +639,7 @@ tracker_evolution_registrar_set (TrackerEvolutionRegistrar *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to set one: 'Evolution' ");
+				  "D-Bus request to set one: 'Evolution' ");
 
 	dbus_async_return_if_fail (subject != NULL, context);
 
@@ -683,7 +683,7 @@ tracker_evolution_registrar_set_many (TrackerEvolutionRegistrar *object,
 	dbus_async_return_if_fail (len == values->len, context);
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to set many: 'Evolution' "
+				  "D-Bus request to set many: 'Evolution' "
 				  "'%d'", len);
 
 	while (subjects[i] != NULL) {
@@ -718,7 +718,7 @@ tracker_evolution_registrar_unset_many (TrackerEvolutionRegistrar *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to unset many: 'Evolution' "
+				  "D-Bus request to unset many: 'Evolution' "
 				  "'%d'", g_strv_length (subjects));
 
 	dbus_async_return_if_fail (subjects != NULL, context);
@@ -747,7 +747,7 @@ tracker_evolution_registrar_unset (TrackerEvolutionRegistrar *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to unset one: 'Evolution'");
+				  "D-Bus request to unset one: 'Evolution'");
 
 	dbus_async_return_if_fail (subject != NULL, context);
 
@@ -771,7 +771,7 @@ tracker_evolution_registrar_cleanup (TrackerEvolutionRegistrar *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to cleanup: 'Evolution'");
+				  "D-Bus request to cleanup: 'Evolution'");
 
 	perform_cleanup (object);
 
@@ -814,7 +814,7 @@ tracker_evolution_push_registrar_enable (TrackerPushRegistrar *registrar,
 						DBUS_NAME_FLAG_DO_NOT_QUEUE,
 						&result, &nerror)) {
 
-		g_critical ("Could not setup DBus, %s in use\n", 
+		g_critical ("Could not setup D-Bus, %s in use\n", 
 			    TRACKER_EVOLUTION_REGISTRAR_SERVICE);
 
 		if (nerror) {
diff --git a/src/plugins/kmail/tracker-kmail-registrar.c b/src/plugins/kmail/tracker-kmail-registrar.c
index 3705987..8e656f6 100644
--- a/src/plugins/kmail/tracker-kmail-registrar.c
+++ b/src/plugins/kmail/tracker-kmail-registrar.c
@@ -400,7 +400,7 @@ tracker_kmail_registrar_set (TrackerKMailRegistrar *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to set one: 'KMail' ");
+				  "D-Bus request to set one: 'KMail' ");
 
 	dbus_async_return_if_fail (subject != NULL, context);
 
@@ -445,7 +445,7 @@ tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
 	dbus_async_return_if_fail (len == values->len, context);
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to set many: 'KMail' "
+				  "D-Bus request to set many: 'KMail' "
 				  "'%d'", len);
 
 	while (subjects[i] != NULL) {
@@ -479,7 +479,7 @@ tracker_kmail_registrar_unset_many (TrackerKMailRegistrar *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to unset many: 'KMail' "
+				  "D-Bus request to unset many: 'KMail' "
 				  "'%d'", g_strv_length (subjects));
 
 	dbus_async_return_if_fail (subjects != NULL, context);
@@ -508,7 +508,7 @@ tracker_kmail_registrar_unset (TrackerKMailRegistrar *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to unset one: 'KMail'");
+				  "D-Bus request to unset one: 'KMail'");
 
 	dbus_async_return_if_fail (subject != NULL, context);
 
@@ -532,7 +532,7 @@ tracker_kmail_registrar_cleanup (TrackerKMailRegistrar *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to cleanup: 'KMail'");
+				  "D-Bus request to cleanup: 'KMail'");
 
 	perform_cleanup (object);
 
@@ -577,7 +577,7 @@ tracker_kmail_push_registrar_enable (TrackerPushRegistrar *registrar,
 						DBUS_NAME_FLAG_DO_NOT_QUEUE,
 						&result, &nerror)) {
 
-		g_critical ("Could not setup DBus, %s in use\n", 
+		g_critical ("Could not setup D-Bus, %s in use\n", 
 			    TRACKER_KMAIL_REGISTRAR_SERVICE);
 
 		if (nerror) {
diff --git a/src/tracker-extract/tracker-albumart.c b/src/tracker-extract/tracker-albumart.c
index 1515a85..57808d6 100644
--- a/src/tracker-extract/tracker-albumart.c
+++ b/src/tracker-extract/tracker-albumart.c
@@ -869,7 +869,7 @@ albumart_queue_cb (DBusGProxy     *proxy,
 
 		uri = g_filename_to_uri (info->art_path, NULL, NULL);
 
-		g_debug ("Downloaded album art using DBus service for uri:'%s'", 
+		g_debug ("Downloaded album art using D-Bus service for uri:'%s'", 
 			 uri);
 
 		albumart_signal_queue_thumbnail (uri, "image/jpeg");
@@ -914,7 +914,7 @@ tracker_albumart_init (void)
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
 	if (!connection) {
-		g_critical ("Could not connect to the DBus session bus, %s",
+		g_critical ("Could not connect to the D-Bus session bus, %s",
 			    error ? error->message : "no error given.");
 		g_clear_error (&error);
 		return FALSE;
diff --git a/src/tracker-extract/tracker-dbus.c b/src/tracker-extract/tracker-dbus.c
index 8785f3a..042f1b6 100644
--- a/src/tracker-extract/tracker-dbus.c
+++ b/src/tracker-extract/tracker-dbus.c
@@ -38,7 +38,7 @@ dbus_register_service (DBusGProxy  *proxy,
 	GError *error = NULL;
 	guint	result;
 
-	g_message ("Registering DBus service...\n"
+	g_message ("Registering D-Bus service...\n"
 		   "  Name:'%s'",
 		   name);
 
@@ -55,7 +55,7 @@ dbus_register_service (DBusGProxy  *proxy,
 	}
 
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_critical ("DBus service name:'%s' is already taken, "
+		g_critical ("D-Bus service name:'%s' is already taken, "
 			    "perhaps the daemon is already running?",
 			    name);
 		return FALSE;
@@ -71,7 +71,7 @@ dbus_register_object (DBusGConnection	    *lconnection,
 		      const DBusGObjectInfo *info,
 		      const gchar	    *path)
 {
-	g_message ("Registering DBus object...");
+	g_message ("Registering D-Bus object...");
 	g_message ("  Path:'%s'", path);
 	g_message ("  Type:'%s'", G_OBJECT_TYPE_NAME (object));
 
@@ -97,7 +97,7 @@ dbus_register_names (void)
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
 	if (!connection) {
-		g_critical ("Could not connect to the DBus session bus, %s",
+		g_critical ("Could not connect to the D-Bus session bus, %s",
 			    error ? error->message : "no error given.");
 		g_clear_error (&error);
 		return FALSE;
@@ -158,7 +158,7 @@ tracker_dbus_register_objects (void)
 	gpointer object;
 
 	if (!connection || !gproxy) {
-		g_critical ("DBus support must be initialized before registering objects!");
+		g_critical ("D-Bus support must be initialized before registering objects!");
 		return FALSE;
 	}
 
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index 9a5ba84..0d9fb17 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -416,7 +416,7 @@ tracker_extract_get_pid (TrackerExtract	        *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to get PID");
+				  "D-Bus request to get PID");
 	
 	value = getpid ();
 	tracker_dbus_request_debug (request_id,
@@ -442,7 +442,7 @@ tracker_extract_get_metadata (TrackerExtract	     *object,
 	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to extract metadata, "
+				  "D-Bus request to extract metadata, "
 				  "uri:'%s', mime:%s",
 				  uri,
 				  mime);
diff --git a/src/tracker-miner-fs/tracker-dbus.c b/src/tracker-miner-fs/tracker-dbus.c
index 93753b2..8fad69a 100644
--- a/src/tracker-miner-fs/tracker-dbus.c
+++ b/src/tracker-miner-fs/tracker-dbus.c
@@ -44,7 +44,7 @@ dbus_register_service (DBusGProxy  *proxy,
 	GError *error = NULL;
 	guint	result;
 
-	g_message ("Registering DBus service...\n"
+	g_message ("Registering D-Bus service...\n"
 		   "  Name:'%s'",
 		   name);
 
@@ -61,7 +61,7 @@ dbus_register_service (DBusGProxy  *proxy,
 	}
 
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_critical ("DBus service name:'%s' is already taken, "
+		g_critical ("D-Bus service name:'%s' is already taken, "
 			    "perhaps the application is already running?",
 			    name);
 		return FALSE;
@@ -96,7 +96,7 @@ dbus_register_object (GObject		    *object,
 		      const DBusGObjectInfo *info,
 		      const gchar	    *path)
 {
-	g_message ("Registering DBus object...");
+	g_message ("Registering D-Bus object...");
 	g_message ("  Path:'%s'", path);
 	g_message ("  Object Type:'%s'", G_OBJECT_TYPE_NAME (object));
 
@@ -131,7 +131,7 @@ dbus_register_names (void)
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
 	if (!connection) {
-		g_critical ("Could not connect to the DBus session bus, %s",
+		g_critical ("Could not connect to the D-Bus session bus, %s",
 			    error ? error->message : "no error given.");
 		g_clear_error (&error);
 		return FALSE;
@@ -218,7 +218,7 @@ tracker_dbus_register_object (GObject               *object,
 			      const gchar	    *path)
 {
 	if (!connection || !gproxy) {
-		g_critical ("DBus support must be initialized before registering objects!");
+		g_critical ("D-Bus support must be initialized before registering objects!");
 		return FALSE;
 	}
 
@@ -239,7 +239,7 @@ tracker_dbus_add_name_monitor (const gchar                *name,
 	g_return_if_fail (func != NULL);
 
 	if (!name_monitors) {
-		g_critical ("DBus support must be initialized before adding name monitors!");
+		g_critical ("D-Bus support must be initialized before adding name monitors!");
 		return;
 	}
 
@@ -259,7 +259,7 @@ tracker_dbus_remove_name_monitor (const gchar *name)
 	g_return_if_fail (name != NULL);
 
 	if (!name_monitors) {
-		g_critical ("DBus support must be initialized before removing name monitors!");
+		g_critical ("D-Bus support must be initialized before removing name monitors!");
 		return;
 	}
 
diff --git a/src/tracker-miner-fs/tracker-main.c b/src/tracker-miner-fs/tracker-main.c
index 063aaf3..80f4824 100644
--- a/src/tracker-miner-fs/tracker-main.c
+++ b/src/tracker-miner-fs/tracker-main.c
@@ -76,12 +76,12 @@ static GOptionEntry  entries[] = {
 	{ "verbosity", 'v', 0,
 	  G_OPTION_ARG_INT, &verbosity,
 	  N_("Logging, 0 = errors only, "
-	     "1 = minimal, 2 = detailed and 3 = debug (default = config)"),
+	     "1 = minimal, 2 = detailed and 3 = debug (default=0)"),
 	  NULL },
 	{ "initial-sleep", 's', 0,
 	  G_OPTION_ARG_INT, &initial_sleep,
 	  N_("Initial sleep time in seconds, "
-	     "0->1000 (default = config)"),
+	     "0->1000 (default=15)"),
 	  NULL },
 	{ NULL }
 };
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index 60fdcf0..84a634f 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -788,7 +788,7 @@ create_extractor_proxy (void)
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
 	if (!connection) {
-		g_critical ("Could not connect to the DBus session bus, %s",
+		g_critical ("Could not connect to the D-Bus session bus, %s",
 			    error ? error->message : "no error given.");
 		g_clear_error (&error);
 		return FALSE;
diff --git a/src/tracker-miner-fs/tracker-thumbnailer.c b/src/tracker-miner-fs/tracker-thumbnailer.c
index bcde185..2036c79 100644
--- a/src/tracker-miner-fs/tracker-thumbnailer.c
+++ b/src/tracker-miner-fs/tracker-thumbnailer.c
@@ -119,7 +119,7 @@ tracker_thumbnailer_init (void)
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
 	if (!connection) {
-		g_critical ("Could not connect to the DBus session bus, %s",
+		g_critical ("Could not connect to the D-Bus session bus, %s",
 			    error ? error->message : "no error given.");
 		g_clear_error (&error);
 
diff --git a/src/tracker-store/tracker-backup.c b/src/tracker-store/tracker-backup.c
index 50d7f67..f63c971 100644
--- a/src/tracker-store/tracker-backup.c
+++ b/src/tracker-store/tracker-backup.c
@@ -122,7 +122,7 @@ tracker_backup_save (TrackerBackup          *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-	                          "DBus request to save backup into '%s'",
+	                          "D-Bus request to save backup into '%s'",
 	                          destination_uri);
 
 	info = g_new0 (TrackerDBusMethodInfo, 1);
@@ -155,7 +155,7 @@ tracker_backup_restore (TrackerBackup          *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-	                          "DBus request to restore backup from '%s'",
+	                          "D-Bus request to restore backup from '%s'",
 	                          backup_uri);
 
 	destination = g_file_new_for_uri (backup_uri);
diff --git a/src/tracker-store/tracker-dbus.c b/src/tracker-store/tracker-dbus.c
index 61966c3..47c88f4 100644
--- a/src/tracker-store/tracker-dbus.c
+++ b/src/tracker-store/tracker-dbus.c
@@ -55,7 +55,7 @@ dbus_register_service (DBusGProxy  *proxy,
 	GError *error = NULL;
 	guint	result;
 
-	g_message ("Registering DBus service...\n"
+	g_message ("Registering D-Bus service...\n"
 		   "  Name:'%s'",
 		   name);
 
@@ -72,7 +72,7 @@ dbus_register_service (DBusGProxy  *proxy,
 	}
 
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_critical ("DBus service name:'%s' is already taken, "
+		g_critical ("D-Bus service name:'%s' is already taken, "
 			    "perhaps the daemon is already running?",
 			    name);
 		return FALSE;
@@ -88,7 +88,7 @@ dbus_register_object (DBusGConnection	    *lconnection,
 		      const DBusGObjectInfo *info,
 		      const gchar	    *path)
 {
-	g_message ("Registering DBus object...");
+	g_message ("Registering D-Bus object...");
 	g_message ("  Path:'%s'", path);
 	g_message ("  Type:'%s'", G_OBJECT_TYPE_NAME (object));
 
@@ -114,7 +114,7 @@ dbus_register_names (void)
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
 	if (!connection) {
-		g_critical ("Could not connect to the DBus session bus, %s",
+		g_critical ("Could not connect to the D-Bus session bus, %s",
 			    error ? error->message : "no error given.");
 		g_clear_error (&error);
 		return FALSE;
@@ -178,7 +178,7 @@ tracker_dbus_register_objects (void)
 	gpointer object, resources;
 
 	if (!connection || !gproxy) {
-		g_critical ("DBus support must be initialized before registering objects!");
+		g_critical ("D-Bus support must be initialized before registering objects!");
 		return FALSE;
 	}
 
@@ -230,7 +230,7 @@ tracker_dbus_register_objects (void)
 	result_set = tracker_data_query_sparql ("SELECT ?class WHERE { ?class tracker:notify true }", NULL);
 
 	if (!result_set) {
-		g_message ("No Nepomuk classes to register on DBus");
+		g_message ("No Nepomuk classes to register on D-Bus");
 		return TRUE;
 	}
 
@@ -238,7 +238,7 @@ tracker_dbus_register_objects (void)
 	g_object_unref (result_set);
 	
 	if (!classes) {
-		g_message ("No Nepomuk classes to register on DBus");
+		g_message ("No Nepomuk classes to register on D-Bus");
 		return TRUE;
 	}
 		
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index 7288c2a..f3a897b 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -786,7 +786,7 @@ main (gint argc, gchar *argv[])
 	tracker_events_init (tracker_daemon_get_notifiable_classes);
 	tracker_push_init ();
 
-	g_message ("Waiting for DBus requests...");
+	g_message ("Waiting for D-Bus requests...");
 
 	/* Set our status as running, if this is FALSE, threads stop
 	 * doing what they do and shutdown.
diff --git a/src/tracker-store/tracker-push.c b/src/tracker-store/tracker-push.c
index ce02c05..fe84f6a 100644
--- a/src/tracker-store/tracker-push.c
+++ b/src/tracker-store/tracker-push.c
@@ -316,7 +316,7 @@ tracker_push_init (void)
 					 G_TYPE_INVALID);
 
 	} else {
-		g_critical ("Could not setup DBus, %s\n", error->message);
+		g_critical ("Could not setup D-Bus, %s\n", error->message);
 		g_error_free (error);
 	}
 }
diff --git a/src/tracker-store/tracker-resources.c b/src/tracker-store/tracker-resources.c
index ebe985d..22f31d7 100644
--- a/src/tracker-store/tracker-resources.c
+++ b/src/tracker-store/tracker-resources.c
@@ -137,7 +137,7 @@ tracker_resources_insert (TrackerResources	     *self,
 	tracker_dbus_async_return_if_fail (object != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to insert statement: "
+				  "D-Bus request to insert statement: "
 				  "'%s' '%s' '%s'",
 				  subject, predicate, object);
 
@@ -165,7 +165,7 @@ tracker_resources_delete (TrackerResources	     *self,
 	tracker_dbus_async_return_if_fail (object != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to delete statement: "
+				  "D-Bus request to delete statement: "
 				  "'%s' '%s' '%s'",
 				  subject, predicate, object);
 
@@ -209,7 +209,7 @@ tracker_resources_load (TrackerResources	 *object,
 	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request to load turtle file "
+				  "D-Bus request to load turtle file "
 				  "'%s'",
 				  uri);
 
@@ -242,7 +242,7 @@ tracker_resources_sparql_query (TrackerResources	 *self,
 	tracker_dbus_async_return_if_fail (query != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request for SPARQL Query, "
+				  "D-Bus request for SPARQL Query, "
 				  "query:'%s'",
 				  query);
 
@@ -287,7 +287,7 @@ tracker_resources_sparql_update (TrackerResources	 *self,
 	tracker_dbus_async_return_if_fail (update != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request for SPARQL Update, "
+				  "D-Bus request for SPARQL Update, "
 				  "update:'%s'",
 				  update);
 
@@ -342,7 +342,7 @@ tracker_resources_batch_sparql_update (TrackerResources          *self,
 	tracker_dbus_async_return_if_fail (update != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request for batch SPARQL Update, "
+				  "D-Bus request for batch SPARQL Update, "
 				  "update:'%s'",
 				  update);
 
@@ -379,7 +379,7 @@ tracker_resources_batch_commit (TrackerResources	 *self,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "DBus request for batch commit");
+				  "D-Bus request for batch commit");
 
 	info = g_slice_new (TrackerDBusMethodInfo);
 
diff --git a/src/tracker-utils/tracker-import.c b/src/tracker-utils/tracker-import.c
index cb8bf58..2612118 100644
--- a/src/tracker-utils/tracker-import.c
+++ b/src/tracker-utils/tracker-import.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a DBus connection to Tracker"));
+			    _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
diff --git a/src/tracker-utils/tracker-info.c b/src/tracker-utils/tracker-info.c
index fbbcf1b..6b2bdf0 100644
--- a/src/tracker-utils/tracker-info.c
+++ b/src/tracker-utils/tracker-info.c
@@ -111,7 +111,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a DBus connection to Tracker"));
+			    _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
@@ -145,7 +145,7 @@ main (int argc, char **argv)
 
 		if (error) {
 			g_printerr ("  %s, %s\n",
-				    _("Unable to retrieve data for uri"),
+				    _("Unable to retrieve data for URI"),
 				    error->message);
 			
 			g_error_free (error);
@@ -154,7 +154,7 @@ main (int argc, char **argv)
 		
 		if (!results) {
 			g_print ("  %s\n",
-				 _("No metadata available for that uri"));
+				 _("No metadata available for that URI"));
 		} else {
 			gint length;
 			
diff --git a/src/tracker-utils/tracker-processes.c b/src/tracker-utils/tracker-processes.c
index 3401fa8..fddfc16 100644
--- a/src/tracker-utils/tracker-processes.c
+++ b/src/tracker-utils/tracker-processes.c
@@ -33,6 +33,8 @@
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
 
+#include <libtracker-common/tracker-common.h>
+
 #include <libtracker-db/tracker-db-manager.h>
 
 static gboolean     should_kill;
@@ -159,7 +161,11 @@ main (int argc, char **argv)
 	}
 
 	pids = get_pids ();
-	str = g_strdup_printf (_("Found %d pidsâ?¦"), g_slist_length (pids));
+	str = g_strdup_printf (tracker_dngettext (NULL,
+						  _("Found %d PIDâ?¦"), 
+						  _("Found %d PIDsâ?¦"),
+						  g_slist_length (pids)),
+			       g_slist_length (pids));
 	g_print ("%s\n", str);
 	g_free (str);
 
diff --git a/src/tracker-utils/tracker-sparql.c b/src/tracker-utils/tracker-sparql.c
index a1085df..e78860d 100644
--- a/src/tracker-utils/tracker-sparql.c
+++ b/src/tracker-utils/tracker-sparql.c
@@ -183,7 +183,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a DBus connection to Tracker"));
+			    _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
diff --git a/src/tracker-utils/tracker-stats.c b/src/tracker-utils/tracker-stats.c
index 7dbb51e..1bc1092 100644
--- a/src/tracker-utils/tracker-stats.c
+++ b/src/tracker-utils/tracker-stats.c
@@ -75,7 +75,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a DBus connection to Tracker"));
+			    _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
diff --git a/src/tracker-utils/tracker-status.c b/src/tracker-utils/tracker-status.c
index f6e574f..367f8ef 100644
--- a/src/tracker-utils/tracker-status.c
+++ b/src/tracker-utils/tracker-status.c
@@ -187,7 +187,7 @@ get_dbus_proxy (const gchar *name)
 	
 	if (!connection) {
 		g_printerr ("%s. %s\n",
-			    _("Could not connect to the DBus session bus"),
+			    _("Could not connect to the D-Bus session bus"),
 			    error ? error->message : _("No error given"));
 		g_clear_error (&error);
 		return NULL;
@@ -570,7 +570,7 @@ main (gint argc, gchar *argv[])
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a DBus connection to Tracker"));
+			    _("Could not establish a D-Bus connection to Tracker"));
 
 		return EXIT_FAILURE;
 	}
diff --git a/src/tracker-utils/tracker-tag.c b/src/tracker-utils/tracker-tag.c
index 6058d2c..1a0e805 100644
--- a/src/tracker-utils/tracker-tag.c
+++ b/src/tracker-utils/tracker-tag.c
@@ -176,7 +176,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a DBus connection to Tracker"));
+			    _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]