From 0d5e8e336aa6d3b76470c8b396e442e0e7f2dd83 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Tue, 6 Jul 2010 23:13:12 -0400 Subject: [PATCH] String cleanup. Removed pango markup from translatable strings. Fixed word order assumption with use of standalone "per sheet" string. --- data/ui/merge-properties-dialog.ui | 12 +++++--- data/ui/object-editor.ui | 2 +- data/ui/prefs-dialog.ui | 38 ++++++++++++++---------- data/ui/print-op-dialog-custom-widget.ui | 18 +++++++---- libglabels/template.c | 10 +++++-- src/template-designer.c | 7 +++-- 6 files changed, 57 insertions(+), 30 deletions(-) diff --git a/data/ui/merge-properties-dialog.ui b/data/ui/merge-properties-dialog.ui index 18ae33dd..cda7d895 100644 --- a/data/ui/merge-properties-dialog.ui +++ b/data/ui/merge-properties-dialog.ui @@ -84,8 +84,10 @@ True - <b>Source</b> - True + Source + + + @@ -176,8 +178,10 @@ True - <b>Record selection/preview</b> - True + Record selection/preview + + + diff --git a/data/ui/object-editor.ui b/data/ui/object-editor.ui index 43ac7f79..833a5848 100644 --- a/data/ui/object-editor.ui +++ b/data/ui/object-editor.ui @@ -33,7 +33,7 @@ True - <span weight="bold" size="larger">Xxx object properties</span> + <span weight="bold" size="larger">Xxx object properties</span> True diff --git a/data/ui/prefs-dialog.ui b/data/ui/prefs-dialog.ui index 65d23688..75da0aa6 100644 --- a/data/ui/prefs-dialog.ui +++ b/data/ui/prefs-dialog.ui @@ -9,6 +9,7 @@ True + vertical True @@ -17,6 +18,7 @@ True 12 + vertical 12 @@ -112,8 +114,10 @@ True 0 - <span weight="bold">Units</span> - True + Units + + + @@ -189,8 +193,10 @@ True 0 - <span weight="bold">Default page size</span> - True + Default page size + + + @@ -215,6 +221,7 @@ True 12 + vertical 12 @@ -343,7 +350,6 @@ True gtk-bold - 4 @@ -362,7 +368,6 @@ True gtk-italic - 4 @@ -409,7 +414,6 @@ True gtk-justify-left - 4 @@ -428,7 +432,6 @@ True gtk-justify-center - 4 @@ -447,7 +450,6 @@ True gtk-justify-right - 4 @@ -505,8 +507,10 @@ True - <span weight="bold">Text</span> - True + Text + + + @@ -631,8 +635,10 @@ True - <span weight="bold">Line</span> - True + Line + + + @@ -703,8 +709,10 @@ True - <span weight="bold">Fill</span> - True + Fill + + + diff --git a/data/ui/print-op-dialog-custom-widget.ui b/data/ui/print-op-dialog-custom-widget.ui index 59afddbb..e2e07163 100644 --- a/data/ui/print-op-dialog-custom-widget.ui +++ b/data/ui/print-op-dialog-custom-widget.ui @@ -178,8 +178,10 @@ True - <b>Copies</b> - True + Copies + + + @@ -324,8 +326,10 @@ True - <b>Merge Control</b> - True + Merge Control + + + @@ -407,8 +411,10 @@ True - <b>Options</b> - True + Options + + + diff --git a/libglabels/template.c b/libglabels/template.c index c942e8bd..d5bf0373 100644 --- a/libglabels/template.c +++ b/libglabels/template.c @@ -719,11 +719,17 @@ lgl_template_frame_get_layout_description (const lglTemplateFrame *frame) if ( frame->all.layouts && (frame->all.layouts->next == NULL) ) { layout = (lglTemplateLayout *)frame->all.layouts->data; - string = g_strdup_printf ("%d × %d (%d %s)", layout->nx, layout->ny, n_labels, _("per sheet")); + /* + * Translators: 1st %d = number of labels across a page, + * 2nd %d = number of labels down a page, + * 3rd %d = total number of labels on a page (sheet). + */ + string = g_strdup_printf (_("%d × %d (%d per sheet)"), layout->nx, layout->ny, n_labels); } else { - string = g_strdup_printf ("%d %s", n_labels, _("per sheet")); + /* Translators: %d is the total number of labels on a page (sheet). */ + string = g_strdup_printf (_("%d per sheet"), n_labels); } return string; diff --git a/src/template-designer.c b/src/template-designer.c index 891648a5..4a8473e7 100644 --- a/src/template-designer.c +++ b/src/template-designer.c @@ -1393,6 +1393,7 @@ static void name_page_changed_cb (glTemplateDesigner *dialog) { gchar *brand, *part_num, *desc; + gchar *string; brand = g_strstrip (gtk_editable_get_chars (GTK_EDITABLE(dialog->priv->brand_entry), 0, -1)); part_num = g_strstrip (gtk_editable_get_chars (GTK_EDITABLE(dialog->priv->part_num_entry), 0, -1)); @@ -1418,8 +1419,10 @@ name_page_changed_cb (glTemplateDesigner *dialog) gtk_image_set_from_stock (GTK_IMAGE (dialog->priv->name_warning_image), GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); - gtk_label_set_markup (GTK_LABEL (dialog->priv->name_warning_label), - _("Brand and part# match an existing template!")); + string = g_strdup_printf ("%s", + _("Brand and part# match an existing template!")); + gtk_label_set_markup (GTK_LABEL (dialog->priv->name_warning_label), string); + g_free (string); } } -- 2.39.5