Do not translate warning messages

Completes d6aeb7d65acf6e41738c78b9d137fab3502d1c58.

3 files changed, 17 insertions, 20 deletions

diff --git a/tumblerd/main.c b/tumblerd/main.c
index 9c3be3f..eaf6658 100644
--- a/tumblerd/main.c
+++ b/tumblerd/main.c
@@ -90,7 +90,7 @@ on_dbus_name_lost (GDBusConnection *connection,
 {
   GMainLoop *main_loop;
 
-  g_critical (_("Name %s lost on the message dbus, exiting."),name);
+  g_critical ("Name %s lost on the message dbus, exiting.",name);
   main_loop = (GMainLoop*)user_data;
   g_main_loop_quit(main_loop);
 }
@@ -126,7 +126,7 @@ main (int    argc,
 
 #ifdef G_OS_UNIX
   if (nice (19) != 19)
-    g_warning (_("Couldn't change nice value of process."));
+    g_warning ("Couldn't change nice value of process.");
 #endif
 
 #ifdef DEBUG
@@ -135,7 +135,7 @@ main (int    argc,
 #endif
 
   /* set the application name. Translators: Don't translate "Tumbler". */
-  g_set_application_name (_("Tumbler Thumbnailing Service"));
+  g_set_application_name ("Tumbler Thumbnailing Service");
 
   connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
   
@@ -228,7 +228,7 @@ main (int    argc,
   /* try to load specialized thumbnailers and exit if that fails */
   if (!tumbler_registry_load (registry, &error))
     {
-      g_warning (_("Failed to load specialized thumbnailers into the registry: %s"),
+      g_warning ("Failed to load specialized thumbnailers into the registry: %s",
                  error->message);
       g_error_free (error);
 
diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c
index a7d7982..54e8c3e 100644
--- a/tumblerd/tumbler-manager.c
+++ b/tumblerd/tumbler-manager.c
@@ -43,6 +43,7 @@
 #include <tumblerd/tumbler-specialized-thumbnailer.h>
 #include <tumblerd/tumbler-utils.h>
 
+#define WARNING_MALFORMED_SECTION "Malformed section \"%s\" in file \"%s\": %s"
 
 /* Property identifiers */
 enum
@@ -544,7 +545,7 @@ tumbler_manager_parse_overrides (TumblerManager *manager,
   /* try to load the key file from the overrides file */
   if (!g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, &error))
     {
-      g_warning (_("Failed to load the file \"%s\": %s"), filename, error->message);
+      g_warning (TUMBLER_WARNING_LOAD_FILE_FAILED, filename, error->message);
       g_clear_error (&error);
       g_key_file_free (key_file);
       g_free (filename);
@@ -562,8 +563,7 @@ tumbler_manager_parse_overrides (TumblerManager *manager,
       info->name = g_key_file_get_string (key_file, sections[n], "Name", &error);
       if (info->name == NULL)
         {
-          g_warning (_("Malformed section \"%s\" in file \"%s\": %s"),
-                     sections[n], filename, error->message);
+          g_warning (WARNING_MALFORMED_SECTION, sections[n], filename, error->message);
           g_clear_error (&error);
 
           override_info_free (info);
@@ -576,8 +576,7 @@ tumbler_manager_parse_overrides (TumblerManager *manager,
                                                 "UriScheme", &error);
       if (info->uri_scheme == NULL)
         {
-          g_warning (_("Malformed section \"%s\" in file \"%s\": %s"),
-                     sections[n], filename, error->message);
+          g_warning (WARNING_MALFORMED_SECTION, sections[n], filename, error->message);
           g_clear_error (&error);
 
           override_info_free (info);
@@ -590,8 +589,7 @@ tumbler_manager_parse_overrides (TumblerManager *manager,
                                                "MimeType", &error);
       if (info->mime_type == NULL)
         {
-          g_warning (_("Malformed section \"%s\" in file \"%s\": %s"),
-                     sections[n], filename, error->message);
+          g_warning (WARNING_MALFORMED_SECTION, sections[n], filename, error->message);
           g_clear_error (&error);
 
           override_info_free (info);
@@ -603,9 +601,8 @@ tumbler_manager_parse_overrides (TumblerManager *manager,
       uri_type = g_strdup_printf ("%s-%s", info->uri_scheme, info->mime_type);
       if (g_strcmp0 (sections[n], uri_type) != 0)
         {
-          g_warning (_("Malformed section \"%s\" in file \"%s\": "
-                       "Mismatch between section name and UriScheme/MimeType"),
-                     sections[n], filename);
+          g_warning (WARNING_MALFORMED_SECTION, sections[n], filename,
+                     "Mismatch between section name and UriScheme/MimeType");
 
           g_free (uri_type);
           override_info_free (info);
@@ -950,7 +947,7 @@ tumbler_manager_load_thumbnailer (TumblerManager *manager,
   /* try to load the key file data from the input file */
   if (!g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, &error))
     {
-      g_warning (_("Failed to load the file \"%s\": %s"), filename, error->message);
+      g_warning (TUMBLER_WARNING_LOAD_FILE_FAILED, filename, error->message);
       g_clear_error (&error);
 
       g_key_file_free (key_file);
@@ -963,7 +960,7 @@ tumbler_manager_load_thumbnailer (TumblerManager *manager,
   name = g_key_file_get_string (key_file, "Specialized Thumbnailer", "Name", &error);
   if (name == NULL)
     {
-      g_warning (_("Malformed file \"%s\": %s"), filename, error->message);
+      g_warning (TUMBLER_WARNING_MALFORMED_FILE, filename, error->message);
       g_clear_error (&error);
 
       g_key_file_free (key_file);
@@ -977,7 +974,7 @@ tumbler_manager_load_thumbnailer (TumblerManager *manager,
                                        "ObjectPath", &error);
   if (object_path == NULL)
     {
-      g_warning (_("Malformed file \"%s\": %s"), filename, error->message);
+      g_warning (TUMBLER_WARNING_MALFORMED_FILE, filename, error->message);
       g_clear_error (&error);
 
       g_key_file_free (key_file);
@@ -991,7 +988,7 @@ tumbler_manager_load_thumbnailer (TumblerManager *manager,
                                            "MimeTypes", NULL, &error);
   if (mime_types == NULL)
     {
-      g_warning (_("Malformed file \"%s\": %s"), filename, error->message);
+      g_warning (TUMBLER_WARNING_MALFORMED_FILE, filename, error->message);
       g_clear_error (&error);
 
       g_free (object_path);
@@ -1017,7 +1014,7 @@ tumbler_manager_load_thumbnailer (TumblerManager *manager,
   /* determine the time the file was last modified */
   if (g_stat (filename, &file_stat) != 0)
     {
-      g_warning (_("Failed to determine last modified time of \"%s\""), filename); 
+      g_warning ("Failed to determine last modified time of \"%s\"", filename);
 
       g_strfreev (uri_schemes);
       g_strfreev (mime_types);
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index f9c9118..ca72c10 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -765,7 +765,7 @@ tumbler_service_queue_cb (TumblerExportedService  *skeleton,
       /* emit an error signal */
       tumbler_service_scheduler_error (scheduler, handle, uris, 
                                        TUMBLER_ERROR_UNSUPPORTED_FLAVOR, 
-                                       _("Unsupported thumbnail flavor requested"),
+                                       TUMBLER_ERROR_MESSAGE_UNSUPPORTED_FLAVOR,
                                        scheduler_request->origin,
                                        service);