From 29d57a7936c1d39db31fd5e952bda32f13331ac1 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Mon, 24 May 2010 19:45:03 -0400 Subject: [PATCH] Additional translator hints. - Fixed a couple of strings that should not have been marked translatable. - Added comments for "Fixed", "Other", "None", and "No match." - Attempted to disambiguate 3 different occurances of "Any" --- data/ui/new-label-dialog.ui | 2 +- data/ui/object-editor.ui | 2 +- libglabels/db.c | 3 +++ libglabels/template.c | 2 +- src/media-select.c | 29 ++++++++++++++--------------- src/merge-properties-dialog.c | 4 ++++ src/merge.c | 2 ++ 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/data/ui/new-label-dialog.ui b/data/ui/new-label-dialog.ui index 8f9a645e..ddafabb9 100644 --- a/data/ui/new-label-dialog.ui +++ b/data/ui/new-label-dialog.ui @@ -419,7 +419,7 @@ True 0 0 - 1 + 1 2 3 4 diff --git a/data/ui/object-editor.ui b/data/ui/object-editor.ui index d8139534..9bd35e53 100644 --- a/data/ui/object-editor.ui +++ b/data/ui/object-editor.ui @@ -1077,7 +1077,7 @@ True 0 - 00000000000 00000 + 00000000000 00000 1 diff --git a/libglabels/db.c b/libglabels/db.c index 76fd084c..0e7cf276 100644 --- a/libglabels/db.c +++ b/libglabels/db.c @@ -264,6 +264,9 @@ lgl_db_init (void) model->papers = read_papers (); /* Create and append an "Other" entry. */ + /* Translators: "Other" here means other page size. Meaning a page size + * other than the standard ones that libglabels knows about such as + * "letter", "A4", etc. */ paper_other = lgl_paper_new ("Other", _("Other"), 0.0, 0.0, NULL); model->papers = g_list_append (model->papers, paper_other); diff --git a/libglabels/template.c b/libglabels/template.c index bacb6c67..c942e8bd 100644 --- a/libglabels/template.c +++ b/libglabels/template.c @@ -723,7 +723,7 @@ lgl_template_frame_get_layout_description (const lglTemplateFrame *frame) } else { - string = g_strdup_printf (_("%d %s"), n_labels, _("per sheet")); + string = g_strdup_printf ("%d %s", n_labels, _("per sheet")); } return string; diff --git a/src/media-select.c b/src/media-select.c index 11692786..e6f1c534 100644 --- a/src/media-select.c +++ b/src/media-select.c @@ -346,16 +346,16 @@ gl_media_select_construct (glMediaSelect *this) /* Brand selection control */ gl_combo_util_add_text_model (GTK_COMBO_BOX (this->priv->brand_combo)); brands = lgl_db_get_brand_list (NULL, NULL); - brands = g_list_prepend (brands, g_strdup (_("Any"))); + brands = g_list_prepend (brands, g_strdup (C_("Brand", "Any"))); gl_combo_util_set_strings (GTK_COMBO_BOX (this->priv->brand_combo), brands); lgl_db_free_brand_list (brands); gl_combo_util_set_active_text (GTK_COMBO_BOX (this->priv->brand_combo), - _("Any")); + C_("Brand", "Any")); /* Page size selection control */ gl_combo_util_add_text_model (GTK_COMBO_BOX (this->priv->page_size_combo)); page_sizes = lgl_db_get_paper_name_list (); - page_sizes = g_list_prepend (page_sizes, g_strdup (_("Any"))); + page_sizes = g_list_prepend (page_sizes, g_strdup (C_("Page size", "Any"))); gl_combo_util_set_strings (GTK_COMBO_BOX (this->priv->page_size_combo), page_sizes); lgl_db_free_paper_name_list (page_sizes); gl_combo_util_set_active_text (GTK_COMBO_BOX (this->priv->page_size_combo), @@ -364,10 +364,10 @@ gl_media_select_construct (glMediaSelect *this) /* Category selection control */ gl_combo_util_add_text_model (GTK_COMBO_BOX (this->priv->category_combo)); categories = lgl_db_get_category_name_list (); - categories = g_list_prepend (categories, g_strdup (_("Any"))); + categories = g_list_prepend (categories, g_strdup (C_("Category", "Any"))); gl_combo_util_set_strings (GTK_COMBO_BOX (this->priv->category_combo), categories); gl_combo_util_set_active_text (GTK_COMBO_BOX (this->priv->category_combo), - _("Any")); + C_("Category", "Any")); lgl_db_free_category_name_list (categories); /* Search all treeview */ @@ -499,7 +499,7 @@ filter_changed_cb (glMediaSelect *this) gl_debug (DEBUG_MEDIA_SELECT, "brand = \"%s\"", brand); gl_debug (DEBUG_MEDIA_SELECT, "page_size_name = \"%s\"", page_size_name); gl_debug (DEBUG_MEDIA_SELECT, "category_name = \"%s\"", category_name); - if (!g_utf8_collate (brand, _("Any"))) + if (!g_utf8_collate (brand, C_("Brand", "Any"))) { g_free (brand); brand = NULL; @@ -698,7 +698,7 @@ db_changed_cb (glMediaSelect *this) page_size_name && strlen(page_size_name) && category_name && strlen(category_name) ) { - if (!g_utf8_collate (brand, _("Any"))) + if (!g_utf8_collate (brand, C_("Brand", "Any"))) { g_free (brand); brand = NULL; @@ -868,7 +868,7 @@ gl_media_select_set_filter_parameters (glMediaSelect *this, page_size_name = lgl_db_lookup_paper_name_from_id (page_size_id); if (page_size_name == NULL) { - page_size_name = g_strdup (_("Any")); + page_size_name = g_strdup (C_("Page size", "Any")); } gl_combo_util_set_active_text (GTK_COMBO_BOX (this->priv->page_size_combo), @@ -877,7 +877,7 @@ gl_media_select_set_filter_parameters (glMediaSelect *this, category_name = lgl_db_lookup_category_name_from_id (category_id); if (category_name == NULL) { - category_name = g_strdup (_("Any")); + category_name = g_strdup (C_("Category", "Any")); } gl_combo_util_set_active_text (GTK_COMBO_BOX (this->priv->category_combo), @@ -964,9 +964,8 @@ load_recent_list (glMediaSelect *this, } else { - this->priv->recent_info_bar = gl_message_bar_new (GTK_MESSAGE_INFO, - GTK_BUTTONS_NONE, - "%s", _("No recent templates found.")); + this->priv->recent_info_bar = gl_message_bar_new (GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, + "%s", _("No recent templates found.")); gl_message_bar_format_secondary_text (GL_MESSAGE_BAR (this->priv->recent_info_bar), "%s", _("Try selecting a template in the \"Search all\" tab.")); @@ -1057,9 +1056,9 @@ load_search_all_list (glMediaSelect *this, } else { - this->priv->search_all_info_bar = gl_message_bar_new (GTK_MESSAGE_INFO, - GTK_BUTTONS_NONE, - "%s", _("No match.")); + /* Translators: "No match" means that for the given template search criteria, there + * were no matches found. */ + this->priv->search_all_info_bar = gl_message_bar_new (GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s", _("No match.")); gl_message_bar_format_secondary_text (GL_MESSAGE_BAR (this->priv->search_all_info_bar), "%s", _("Try selecting a different brand, page size or category.")); diff --git a/src/merge-properties-dialog.c b/src/merge-properties-dialog.c index d3eadc11..6988fcbc 100644 --- a/src/merge-properties-dialog.c +++ b/src/merge-properties-dialog.c @@ -436,6 +436,10 @@ type_changed_cb (GtkWidget *widget, G_CALLBACK (src_changed_cb), dialog); break; case GL_MERGE_SRC_IS_FIXED: + /* Translators: "Fixed" here means that for the given document-merge method, there are + * no further choices to further define the source of data. E.g. if you select the + * evolution-data-server, there are no further choices -- the source is "Fixed." + */ dialog->priv->src_entry = gtk_label_new (_("Fixed")); gtk_misc_set_alignment (GTK_MISC (dialog->priv->src_entry), 0.0, 0.5); diff --git a/src/merge.c b/src/merge.c index d83c4e44..68292462 100644 --- a/src/merge.c +++ b/src/merge.c @@ -166,6 +166,8 @@ gl_merge_get_descriptions (void) GList *p; Backend *backend; + /* Translators: "None" here means that no document-merge source or + * method has been selected. */ descriptions = g_list_append (descriptions, g_strdup(_("None"))); for ( p=backends; p!=NULL; p=p->next) { -- 2.39.5