Make all g_warning and g_message untranslatable for better bug handling

diff --git a/src/merge-evolution.c b/src/merge-evolution.c
index 3542261d8a921949a88d5eb9b218b48767cac3f5..aea860193004b7ee5c94afadcb7ad200d34e017b 100644 (file)
--- a/src/merge-evolution.c
+++ b/src/merge-evolution.c
@@ -313,13 +313,13 @@ gl_merge_evolution_open (glMerge *merge)
 
         query = e_book_query_from_string(merge_evolution->priv->query);
         if (!query) {
-                g_warning (_("Couldn't construct query"));
+                g_warning ("Couldn't construct query");
                 return;
         }
 
         merge_evolution->priv->book = e_book_new_system_addressbook(&error);
         if (!merge_evolution->priv->book) {
-                g_warning (_("Couldn't open addressbook."));
+                g_warning ("Couldn't open addressbook.");
                 if (error)
                 {
                         g_warning ("e_book_new_system_addressbook: %s", error->message);
@@ -330,7 +330,7 @@ gl_merge_evolution_open (glMerge *merge)
         }
 
         if (!e_book_open(merge_evolution->priv->book, FALSE, &error)) {
-                g_warning (_("Couldn't open addressbook."));
+                g_warning ("Couldn't open addressbook.");
                 if (error)
                 {
                         g_warning ("e_book_open: %s", error->message);
@@ -345,7 +345,7 @@ gl_merge_evolution_open (glMerge *merge)
         /* fetch the list of fields supported by this address book */
         status = e_book_get_supported_fields(merge_evolution->priv->book, &fields, &error);
         if (status == FALSE) {
-                g_warning (_("Couldn't list available fields."));
+                g_warning ("Couldn't list available fields.");
                 if (error)
                 {
                         g_warning ("e_book_get_supported_fields: %s", error->message);
@@ -381,7 +381,7 @@ gl_merge_evolution_open (glMerge *merge)
                                       &merge_evolution->priv->contacts,
                                       &error);
         if (status == FALSE) {
-                g_warning (_("Couldn't get contacts."));
+                g_warning ("Couldn't get contacts.");
                 if (error)
                 {
                         g_warning ("e_book_get_contacts: %s", error->message);

diff --git a/src/xml-label-04.c b/src/xml-label-04.c
index fc42cd280afe012733a1f287b07397b657c0187c..6f907b2c725c9f5c78550f0ca846f0b961b571c8 100644 (file)
--- a/src/xml-label-04.c
+++ b/src/xml-label-04.c
@@ -73,7 +73,7 @@ glLabel      *gl_xml_label_04_parse      (xmlNodePtr       root,
        *status = XML_LABEL_OK;
 
        if (!xmlStrEqual (root->name, (xmlChar *)"Label")) {
-               g_message (_("Bad root node = \"%s\""), root->name);
+               g_message ("Bad root node = \"%s\"", root->name);
                *status = XML_LABEL_ERROR_OPEN_PARSE;
                return NULL;
        }
@@ -121,7 +121,7 @@ glLabel      *gl_xml_label_04_parse      (xmlNodePtr       root,
                        } else if (xmlStrEqual (node->name, (xmlChar *)"Merge_Properties")) {
                                xml04_parse_merge_properties (node, label);
                        } else {
-                               g_message (_("bad node =  \"%s\""), node->name);
+                               g_message ("bad node =  \"%s\"", node->name);
                        }
                }
        }

diff --git a/src/xml-label.c b/src/xml-label.c
index 04f7875582128ee74579a0b7c69e6d69bdf0923d..0e7e7716e71b669b7507deddde3ae22a10317d29 100644 (file)
--- a/src/xml-label.c
+++ b/src/xml-label.c
@@ -197,7 +197,7 @@ gl_xml_label_open (const gchar      *utf8_filename,
 
         doc = xmlReadFile (filename, NULL, XML_PARSE_HUGE);
        if (!doc) {
-               g_message (_("xmlParseFile error"));
+               g_message ("xmlParseFile error");
                *status = XML_LABEL_ERROR_OPEN_PARSE;
                return NULL;
        }
@@ -235,7 +235,7 @@ gl_xml_label_open_buffer (const gchar      *buffer,
 
         doc = xmlReadDoc ((xmlChar *) buffer, NULL, NULL, XML_PARSE_HUGE);
        if (!doc) {
-               g_message (_("xmlParseFile error"));
+               g_message ("xmlParseFile error");
                *status = XML_LABEL_ERROR_OPEN_PARSE;
                return NULL;
        }
@@ -272,7 +272,7 @@ xml_doc_to_label (xmlDocPtr         doc,
 
        root = xmlDocGetRootElement (doc);
        if (!root || !root->name) {
-               g_message (_("No document root"));
+               g_message ("No document root");
                *status = XML_LABEL_ERROR_OPEN_PARSE;
                return NULL;
        }
@@ -280,7 +280,7 @@ xml_doc_to_label (xmlDocPtr         doc,
         /* Try compatability mode 0.1 */
         if (xmlSearchNsByHref (doc, root, (xmlChar *)COMPAT01_NAME_SPACE))
        {
-                g_message (_("Importing from glabels 0.1 format"));
+                g_message ("Importing from glabels 0.1 format");
                 g_message ("TODO");
                 label = NULL; /* TODO */
                 return label;
@@ -289,7 +289,7 @@ xml_doc_to_label (xmlDocPtr         doc,
         /* Try compatability mode 0.4 */
         if (xmlSearchNsByHref (doc, root, (xmlChar *)COMPAT04_NAME_SPACE))
        {
-                g_message (_("Importing from glabels 0.4 format"));
+                g_message ("Importing from glabels 0.4 format");
                 label = gl_xml_label_04_parse (root, status);
                 return label;
         }
@@ -299,7 +299,7 @@ xml_doc_to_label (xmlDocPtr         doc,
              !xmlSearchNsByHref (doc, root, (xmlChar *)COMPAT22_NAME_SPACE) &&
              !xmlSearchNsByHref (doc, root, (xmlChar *)LGL_XML_NAME_SPACE) )
         {
-                g_message (_("Unknown glabels Namespace -- Using %s"),
+                g_message ("Unknown glabels Namespace -- Using %s",
                            LGL_XML_NAME_SPACE);
         }
 
@@ -331,7 +331,7 @@ xml_parse_label (xmlNodePtr        root,
        *status = XML_LABEL_OK;
 
        if (!lgl_xml_is_node (root, "Glabels-document")) {
-               g_message (_("Bad root node = \"%s\""), root->name);
+               g_message ("Bad root node = \"%s\"", root->name);
                *status = XML_LABEL_ERROR_OPEN_PARSE;
                return NULL;
        }
@@ -368,7 +368,7 @@ xml_parse_label (xmlNodePtr        root,
                        /* Handled in pass 1. */
                } else {
                        if (!xmlNodeIsText (child_node)) {
-                               g_message (_("bad node in Document node =  \"%s\""),
+                               g_message ("bad node in Document node =  \"%s\"",
                                           child_node->name);
                                g_object_unref (label);
                                *status = XML_LABEL_ERROR_OPEN_PARSE;
@@ -414,7 +414,7 @@ xml_parse_objects (xmlNodePtr  node,
                        xml_parse_object_barcode (child, label);
                } else {
                        if (!xmlNodeIsText (child)) {
-                               g_message (_("bad node =  \"%s\""), child->name);
+                               g_message ("bad node =  \"%s\"", child->name);
                                break;
                        }
                }
@@ -874,7 +874,7 @@ xml_parse_data (xmlNodePtr  node,
                        xml_parse_file_node (child, label);
                } else {
                        if (!xmlNodeIsText (child)) {
-                               g_message (_("bad node in Data node =  \"%s\""),
+                               g_message ("bad node in Data node =  \"%s\"",
                                           child->name);
                        }
                }
@@ -950,7 +950,7 @@ xml_parse_file_node (xmlNodePtr  node,
         }
         else
         {
-                g_message (_("Unknown embedded file format: \"%s\""), format);
+                g_message ("Unknown embedded file format: \"%s\"", format);
                 
         }
 
@@ -1156,14 +1156,14 @@ gl_xml_label_save (glLabel          *label,
 
        filename = g_filename_from_utf8 (utf8_filename, -1, NULL, NULL, NULL);
        if (!filename)
-               g_message (_("Utf8 conversion error."));
+               g_message ("Utf8 conversion error.");
        else {
                xmlSetDocCompressMode (doc, gl_label_get_compression (label));
                xml_ret = xmlSaveFormatFile (filename, doc, TRUE);
                xmlFreeDoc (doc);
                if (xml_ret == -1) {
 
-                       g_message (_("Problem saving xml file."));
+                       g_message ("Problem saving xml file.");
                        *status = XML_LABEL_ERROR_SAVE_FILE;
 
                } else {