Bug #655414 - Need translation comments

diff --git a/calendar/libecal/e-cal-util.c b/calendar/libecal/e-cal-util.c
index 1ffbb90..b1b1f72 100644 (file)
--- a/calendar/libecal/e-cal-util.c
+++ b/calendar/libecal/e-cal-util.c
@@ -674,11 +674,11 @@ e_cal_util_priority_to_string (gint priority)
        if (priority <= 0)
                retval = "";
        else if (priority <= 4)
-               retval = _("High");
+               retval = C_("Priority", "High");
        else if (priority == 5)
-               retval = _("Normal");
+               retval = C_("Priority", "Normal");
        else if (priority <= 9)
-               retval = _("Low");
+               retval = C_("Priority", "Low");
        else
                retval = "";
 
@@ -699,13 +699,13 @@ e_cal_util_priority_from_string (const gchar *string)
        gint priority;
 
        /* An empty string is the same as 'None'. */
-       if (!string || !string[0] || !e_util_utf8_strcasecmp (string, _("Undefined")))
+       if (!string || !string[0] || !e_util_utf8_strcasecmp (string, C_("Priority", "Undefined")))
                priority = 0;
-       else if (!e_util_utf8_strcasecmp (string, _("High")))
+       else if (!e_util_utf8_strcasecmp (string, C_("Priority", "High")))
                priority = 3;
-       else if (!e_util_utf8_strcasecmp (string, _("Normal")))
+       else if (!e_util_utf8_strcasecmp (string, C_("Priority", "Normal")))
                priority = 5;
-       else if (!e_util_utf8_strcasecmp (string, _("Low")))
+       else if (!e_util_utf8_strcasecmp (string, C_("Priority", "Low")))
                priority = 7;
        else
                priority = -1;

diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 3b0cb30..65f79d8 100644 (file)
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -840,6 +840,7 @@ search_match_all (struct _ESExp *f, gint argc, struct _ESExpTerm **argv, CamelFo
                                r->value.boolean = r1->value.boolean;
                        } else {
                                g_warning("invalid syntax, matches require a single bool result");
+                               /* Translators: The '%s' is an element type name, part of an expressing language */
                                error_msg = g_strdup_printf(_("(%s) requires a single bool result"), "match-all");
                                e_sexp_fatal_error (f, error_msg);
                                g_free (error_msg);
@@ -882,6 +883,7 @@ search_match_all (struct _ESExp *f, gint argc, struct _ESExpTerm **argv, CamelFo
                                        g_ptr_array_add (r->value.ptrarray, (gchar *) uid);
                        } else {
                                g_warning("invalid syntax, matches require a single bool result");
+                               /* Translators: The '%s' is an element type name, part of an expressing language */
                                error_msg = g_strdup_printf(_("(%s) requires a single bool result"), "match-all");
                                e_sexp_fatal_error (f, error_msg);
                                g_free (error_msg);
@@ -935,12 +937,14 @@ search_match_threads (struct _ESExp *f, gint argc, struct _ESExpTerm **argv, Cam
 
        /* not supported in match-all */
        if (search->current) {
+               /* Translators: Each '%s' is an element type name, part of an expressing language */
                error_msg = g_strdup_printf(_("(%s) not allowed inside %s"), "match-threads", "match-all");
                e_sexp_fatal_error (f, error_msg);
                g_free (error_msg);
        }
 
        if (argc == 0) {
+               /* Translators: The '%s' is an element type name, part of an expressing language */
                error_msg = g_strdup_printf(_("(%s) requires a match type string"), "match-threads");
                e_sexp_fatal_error (f, error_msg);
                g_free (error_msg);
@@ -948,6 +952,7 @@ search_match_threads (struct _ESExp *f, gint argc, struct _ESExpTerm **argv, Cam
 
        r = e_sexp_term_eval (f, argv[0]);
        if (r->type != ESEXP_RES_STRING) {
+               /* Translators: The '%s' is an element type name, part of an expressing language */
                error_msg = g_strdup_printf(_("(%s) requires a match type string"), "match-threads");
                e_sexp_fatal_error (f, error_msg);
                g_free (error_msg);
@@ -975,6 +980,7 @@ search_match_threads (struct _ESExp *f, gint argc, struct _ESExpTerm **argv, Cam
        }
 
        if (r == NULL || r->type != ESEXP_RES_ARRAY_PTR) {
+               /* Translators: The '%s' is an element type name, part of an expressing language */
                error_msg = g_strdup_printf(_("(%s) expects an array result"), "match-threads");
                e_sexp_fatal_error (f, error_msg);
                g_free (error_msg);
@@ -984,6 +990,7 @@ search_match_threads (struct _ESExp *f, gint argc, struct _ESExpTerm **argv, Cam
                return r;
 
        if (search->folder == NULL) {
+               /* Translators: The '%s' is an element type name, part of an expressing language */
                error_msg = g_strdup_printf(_("(%s) requires the folder set"), "match-threads");
                e_sexp_fatal_error (f, error_msg);
                g_free (error_msg);

diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c
index 460c319..1d5a039 100644 (file)
--- a/camel/camel-vee-store.c
+++ b/camel/camel-vee-store.c
@@ -32,6 +32,10 @@
 #include "camel-vee-folder.h"
 #include "camel-vee-store.h"
 
+/* Translators: 'Unmatched' is a folder name under Search folders where are shown
+   all messages not belonging into any other configured search folder */
+#define PRETTY_UNMATCHED_FOLDER_NAME _("Unmatched")
+
 #define d(x)
 
 /* flags
@@ -122,12 +126,12 @@ vee_store_constructed (GObject *object)
        vee_store->folder_unmatched = g_object_new (
                CAMEL_TYPE_VEE_FOLDER,
                "full-name", CAMEL_UNMATCHED_NAME,
-               "display-name", _("Unmatched"),
+               "display-name", PRETTY_UNMATCHED_FOLDER_NAME,
                "parent-store", vee_store, NULL);
        camel_vee_folder_construct (
                vee_store->folder_unmatched, CAMEL_STORE_FOLDER_PRIVATE);
        camel_db_create_vfolder (
-               CAMEL_STORE (vee_store)->cdb_r, _("Unmatched"), NULL);
+               CAMEL_STORE (vee_store)->cdb_r, PRETTY_UNMATCHED_FOLDER_NAME, NULL);
 #endif
 
 }
@@ -294,7 +298,7 @@ vee_store_get_folder_info_sync (CamelStore *store,
        if ((top == NULL || top[0] == 0 || strncmp (top, CAMEL_UNMATCHED_NAME, strlen (CAMEL_UNMATCHED_NAME)) == 0)) {
                info = camel_folder_info_new ();
                info->full_name = g_strdup (CAMEL_UNMATCHED_NAME);
-               info->display_name = g_strdup (_("Unmatched"));
+               info->display_name = g_strdup (PRETTY_UNMATCHED_FOLDER_NAME);
                info->unread = -1;
                info->flags =
                        CAMEL_FOLDER_NOCHILDREN |