Remove markup from translatable strings

Pointed out in bug 588964. String change !
This commit is contained in:
Matthias Clasen 2009-07-20 01:10:52 -04:00
parent 8430e215a7
commit 267d209441
2 changed files with 20 additions and 12 deletions

View File

@ -9530,6 +9530,7 @@ search_setup_widgets (GtkFileChooserDefault *impl)
{
GtkWidget *label;
GtkWidget *image;
gchar *tmp;
impl->search_hbox = gtk_hbox_new (FALSE, 12);
@ -9542,8 +9543,10 @@ search_setup_widgets (GtkFileChooserDefault *impl)
/* Label */
label = gtk_label_new (NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("<b>_Search:</b>"));
tmp = g_strdup_printf ("<b>%s</b>", _("Search:"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), tmp);
gtk_box_pack_start (GTK_BOX (impl->search_hbox), label, FALSE, FALSE, 0);
g_free (tmp);
/* Entry */
@ -10268,6 +10271,7 @@ recent_hide_entry (GtkFileChooserDefault *impl)
{
GtkWidget *label;
GtkWidget *image;
gchar *tmp;
impl->recent_hbox = gtk_hbox_new (FALSE, 12);
@ -10278,8 +10282,10 @@ recent_hide_entry (GtkFileChooserDefault *impl)
/* Label */
label = gtk_label_new (NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("<b>Recently Used</b>"));
tmp = g_strdup_print ("<b>%s</b>", _("Recently Used"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), tmp);
gtk_box_pack_start (GTK_BOX (impl->recent_hbox), label, FALSE, FALSE, 0);
g_free (tmp);
gtk_widget_hide (impl->browse_path_bar);
gtk_widget_hide (impl->browse_new_folder_button);

View File

@ -146,7 +146,7 @@ gtk_page_setup_unix_dialog_class_init (GtkPageSetupUnixDialogClass *class)
object_class->finalize = gtk_page_setup_unix_dialog_finalize;
g_type_class_add_private (class, sizeof (GtkPageSetupUnixDialogPrivate));
g_type_class_add_private (class, sizeof (GtkPageSetupUnixDialogPrivate));
}
static void
@ -154,21 +154,24 @@ gtk_page_setup_unix_dialog_init (GtkPageSetupUnixDialog *dialog)
{
GtkPageSetupUnixDialogPrivate *priv;
GtkTreeIter iter;
gchar *tmp;
priv = dialog->priv = GTK_PAGE_SETUP_UNIX_DIALOG_GET_PRIVATE (dialog);
priv->print_backends = NULL;
priv->printer_list = gtk_list_store_new (PRINTER_LIST_N_COLS,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_OBJECT);
gtk_list_store_append (priv->printer_list, &iter);
tmp = g_strdup_print ("<b>%s</b>\n%s", _("Any Printer"), _("For portable documents"));
gtk_list_store_set (priv->printer_list, &iter,
PRINTER_LIST_COL_NAME, _("<b>Any Printer</b>\nFor portable documents"),
PRINTER_LIST_COL_NAME, tmp,
PRINTER_LIST_COL_PRINTER, NULL,
-1);
g_free (tmp);
priv->page_setup_list = gtk_list_store_new (PAGE_SETUP_LIST_N_COLS,
G_TYPE_OBJECT,
G_TYPE_BOOLEAN);
@ -260,7 +263,7 @@ printer_added_cb (GtkPrintBackend *backend,
GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
GtkTreeIter iter;
gchar *str;
const gchar *location;;
const gchar *location;
if (gtk_printer_is_virtual (printer))
return;
@ -271,18 +274,17 @@ printer_added_cb (GtkPrintBackend *backend,
str = g_strdup_printf ("<b>%s</b>\n%s",
gtk_printer_get_name (printer),
location);
gtk_list_store_append (priv->printer_list, &iter);
gtk_list_store_set (priv->printer_list, &iter,
PRINTER_LIST_COL_NAME, str,
PRINTER_LIST_COL_PRINTER, printer,
-1);
g_object_set_data_full (G_OBJECT (printer),
"gtk-print-tree-iter",
g_object_set_data_full (G_OBJECT (printer),
"gtk-print-tree-iter",
gtk_tree_iter_copy (&iter),
(GDestroyNotify) gtk_tree_iter_free);
g_free (str);
if (priv->waiting_for_printer != NULL &&
@ -316,7 +318,7 @@ printer_status_cb (GtkPrintBackend *backend,
GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
GtkTreeIter *iter;
gchar *str;
const gchar *location;;
const gchar *location;
iter = g_object_get_data (G_OBJECT (printer), "gtk-print-tree-iter");