applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove markup tags from translated strings, #118801.

Browse source 
Fri Aug  1 14:28:52 2003  Jonathan Blandford  <jrb@redhat.com>

	* main.c (init_startup_state): remove markup tags from translated
	strings, #118801.
This commit is contained in:
Jonathan Blandford 2003-08-01 18:43:43 +00:00 • committed by Jonathan Blandford
parent 22e9266f78
commit a3fbc72ef3
4 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/accessibility/at-properties/ChangeLog
View file

@ -1,3 +1,8 @@
Fri Aug 1 14:28:52 2003 Jonathan Blandford <jrb@redhat.com>
* main.c (init_startup_state): remove markup tags from translated
strings, #118801.
2003-07-18 Jonathan Blandford <jrb@gnome.org> 2003-07-18 Jonathan Blandford <jrb@gnome.org>
* main.c: Add a check to confirm that the AT's are installed. Add * main.c: Add a check to confirm that the AT's are installed. Add

13
capplets/accessibility/at-properties/main.c
View file

@ -50,20 +50,21 @@ init_startup_state (GladeXML *dialog)
gtk_widget_hide (WID ("at_applications_warning_label")); gtk_widget_hide (WID ("at_applications_warning_label"));
gtk_widget_hide (WID ("at_applications_hseparator")); gtk_widget_hide (WID ("at_applications_hseparator"));
} else { } else {
gchar *warning_label;
gtk_widget_show (WID ("at_applications_warning_label")); gtk_widget_show (WID ("at_applications_warning_label"));
gtk_widget_show (WID ("at_applications_hseparator")); gtk_widget_show (WID ("at_applications_hseparator"));
if (!at_startup_state.enabled.osk_installed && if (!at_startup_state.enabled.osk_installed &&
!(at_startup_state.enabled.screenreader_installed || !(at_startup_state.enabled.screenreader_installed ||
at_startup_state.enabled.magnifier_installed)) { at_startup_state.enabled.magnifier_installed)) {
gtk_label_set_markup (GTK_LABEL (WID ("at_applications_warning_label")), warning_label = g_strdup_printf ("<i>%s</i>", _("No Assistive Technology is available on your system. The 'gok' package must be installed in order to get on-screen keyboard support, and the 'gnopernicus' package must be installed for screenreading and magnifying capabilities."));
_("<i>No Assistive Technology is available on your system. The 'gok' package must be installed in order to get on-screen keyboard support, and the 'gnopernicus' package must be installed for screenreading and magnifying capabilities.</i>"));
} else if (!at_startup_state.enabled.osk_installed) { } else if (!at_startup_state.enabled.osk_installed) {
gtk_label_set_markup (GTK_LABEL (WID ("at_applications_warning_label")), warning_label = g_strdup_printf ("<i>%s</i>", _("Not all available assistive technologies are installed on your system. The 'gok' package must be installed in order to get on-screen keyboard support."));
_("<i>Not all available assistive technologies are installed on your system. The 'gok' package must be installed in order to get on-screen keyboard support.</i>"));
} else { } else {
gtk_label_set_markup (GTK_LABEL (WID ("at_applications_warning_label")), warning_label = g_strdup_printf ("<i>%s</i>", _("Not all available assistive technologies are installed on your system. The 'gnopernicus' package must be installed for screenreading and magnifying capabilities."));
_("<i>Not all available assistive technologies are installed on your system. The 'gnopernicus' package must be installed for screenreading and magnifying capabilities.</i>"));
} }
gtk_label_set_markup (GTK_LABEL (WID ("at_applications_warning_label")), warning_label);
g_free (warning_label);
} }
} }

5
capplets/mouse/ChangeLog
View file

@ -1,3 +1,8 @@
Fri Aug 1 14:29:12 2003 Jonathan Blandford <jrb@redhat.com>
* gnome-mouse-properties.c (setup_dialog): remove markup from
translated strings, #118801.
Fri Aug 1 13:06:04 2003 Jonathan Blandford <jrb@redhat.com> Fri Aug 1 13:06:04 2003 Jonathan Blandford <jrb@redhat.com>
* gnome-mouse-properties.c (create_dialog): add support for * gnome-mouse-properties.c (create_dialog): add support for

28
capplets/mouse/gnome-mouse-properties.c
View file

@ -495,7 +495,7 @@ cursor_font_changed (GConfClient *client,
/* we didn't find it; we add it to the end. */ /* we didn't find it; we add it to the end. */
gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_append (GTK_LIST_STORE (model), &iter);
cursor_text = g_strdup_printf (_("<b>Unknown Cursor</b>\n%s"), cursor_font); cursor_text = g_strdup_printf ("<b>%s</b>\n%s", _("Unknown Cursor"), cursor_font);
gtk_list_store_set (GTK_LIST_STORE (model), &iter, gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COLUMN_TEXT, cursor_text, COLUMN_TEXT, cursor_text,
COLUMN_FONT_PATH, cursor_font, COLUMN_FONT_PATH, cursor_font,
@ -600,10 +600,10 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_append (GTK_LIST_STORE (model), &iter);
if (cursor_font == NULL) { if (cursor_font == NULL) {
cursor_string = _("<b>Default Cursor - Current</b>\nThe default cursor that ships with X"); cursor_string = g_strdup_printf ("<b>%s</b>\n%s", _("Default Cursor - Current"), _("The default cursor that ships with X"));
found_default = TRUE; found_default = TRUE;
} else { } else {
cursor_string = _("<b>Default Cursor</b>\nThe default cursor that ships with X"); cursor_string = g_strdup_printf ("<b>%s</b>\n%s", _("Default Cursor"), _("The default cursor that ships with X"));
} }
gtk_list_store_set (GTK_LIST_STORE (model), &iter, gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@ -611,7 +611,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
COLUMN_TEXT, cursor_string, COLUMN_TEXT, cursor_string,
COLUMN_FONT_PATH, NULL, COLUMN_FONT_PATH, NULL,
-1); -1);
g_free (cursor_string);
/* Inverted cursor */ /* Inverted cursor */
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL); filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
@ -621,10 +621,10 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_append (GTK_LIST_STORE (model), &iter);
if (cursor_font && ! strcmp (cursor_font, font_path)) { if (cursor_font && ! strcmp (cursor_font, font_path)) {
cursor_string = _("<b>White Cursor - Current</b>\nThe default cursor inverted"); cursor_string = g_strdup_printf ("<b>%s</b>\n%s", _("White Cursor - Current"), _("The default cursor inverted"));
found_default = TRUE; found_default = TRUE;
} else { } else {
cursor_string = _("<b>White Cursor</b>\nThe default cursor inverted"); cursor_string = g_strdup_printf ("<b>%s</b>\n%s", _("White Cursor"), _("The default cursor inverted"));
} }
gtk_list_store_set (GTK_LIST_STORE (model), &iter, gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@ -633,7 +633,8 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
COLUMN_FONT_PATH, font_path, COLUMN_FONT_PATH, font_path,
-1); -1);
g_free (font_path); g_free (font_path);
g_free (cursor_string);
/* Large cursor */ /* Large cursor */
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL); filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
pixbuf = gdk_pixbuf_new_from_file (filename, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
@ -642,10 +643,10 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_append (GTK_LIST_STORE (model), &iter);
if (cursor_font && ! strcmp (cursor_font, font_path)) { if (cursor_font && ! strcmp (cursor_font, font_path)) {
cursor_string = _("<b>Large Cursor - Current</b>\nLarge version of normal cursor"); cursor_string = g_strdup_printf ("<b>%s</b>\n%s", _("Large Cursor - Current"), _("Large version of normal cursor"));
found_default = TRUE; found_default = TRUE;
} else { } else {
cursor_string = _("<b>Large Cursor</b>\nLarge version of normal cursor"); cursor_string = g_strdup_printf ("<b>%s</b>\n%s", _("Large Cursor"), _("Large version of normal cursor"));
} }
gtk_list_store_set (GTK_LIST_STORE (model), &iter, gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@ -654,6 +655,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
COLUMN_FONT_PATH, font_path, COLUMN_FONT_PATH, font_path,
-1); -1);
g_free (font_path); g_free (font_path);
g_free (cursor_string);
/* Large inverted cursor */ /* Large inverted cursor */
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL); filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
@ -663,10 +665,10 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_append (GTK_LIST_STORE (model), &iter);
if (cursor_font && ! strcmp (cursor_font, font_path)) { if (cursor_font && ! strcmp (cursor_font, font_path)) {
cursor_string = _("<b>Large White Cursor - Current</b>\nLarge version of white cursor"); cursor_string = g_strdup_printf ("<b>%s</b>\n%s", _("Large White Cursor - Current"), _("Large version of white cursor"));
found_default = TRUE; found_default = TRUE;
} else { } else {
cursor_string = _("<b>Large White Cursor</b>\nLarge version of white cursor"); cursor_string = g_strdup_printf ("<b>%s</b>\n%s", _("Large White Cursor"), _("Large version of white cursor"));
} }
gtk_list_store_set (GTK_LIST_STORE (model), &iter, gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@ -675,8 +677,10 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
COLUMN_FONT_PATH, font_path, COLUMN_FONT_PATH, font_path,
-1); -1);
g_free (font_path); g_free (font_path);
g_free (cursor_string);
g_free (cursor_font); g_free (cursor_font);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column); gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
gconf_peditor_new_boolean gconf_peditor_new_boolean