From 2e500fb4033135cbf180d04f954a4a7c9d85fa50 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Fri, 27 Jul 2007 11:56:50 +0000 Subject: [PATCH] Use AE spelling of 'color'. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1753 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 2 ++ geany.glade | 10 +++++----- src/interface.c | 10 +++++----- src/keybindings.c | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd808e39..b7c6e15c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ Move Color Chooser and Word Count tools to tools.c. * src/plugins.c: Add separator between built-in Tools menu items and plugins. + * src/interface.c, src/keybindings.c, geany.glade: + Use AE spelling of 'color'. 2007-07-26 Nick Treleaven diff --git a/geany.glade b/geany.glade index 86a5a3ab..ec26f008 100644 --- a/geany.glade +++ b/geany.glade @@ -1340,7 +1340,7 @@ True Open a color chooser dialog, to interactively pick colors from a palette. - _Colour Chooser + _Color Chooser True @@ -4408,8 +4408,8 @@ Bottom True - Display the Colour Chooser button in the toolbar - Show Colour Chooser button + Display the Color Chooser button in the toolbar + Show Color Chooser button True GTK_RELIEF_NORMAL False @@ -4829,7 +4829,7 @@ Bottom Use white text on a black background. True - Invert syntax highlighting colours + Invert syntax highlighting colors True GTK_RELIEF_NORMAL True @@ -5121,7 +5121,7 @@ Bottom True - The background colour of characters after the given cursor position (see below) changed to the colour set below. (This is recommended if you use proportional fonts) + The background color of characters after the given cursor position (see below) changed to the color set below. (This is recommended if you use proportional fonts) True Background True diff --git a/src/interface.c b/src/interface.c index e53fe98d..3387bb69 100644 --- a/src/interface.c +++ b/src/interface.c @@ -937,7 +937,7 @@ create_window1 (void) tools1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (tools1), tools1_menu); - menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("_Colour Chooser")); + menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("_Color Chooser")); gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); @@ -3113,11 +3113,11 @@ create_prefs_dialog (void) gtk_tooltips_set_tip (tooltips, check_toolbar_compile, _("Display the Compile and Run buttons in the toolbar"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_compile), FALSE); - check_toolbar_colour = gtk_check_button_new_with_mnemonic (_("Show Colour Chooser button")); + check_toolbar_colour = gtk_check_button_new_with_mnemonic (_("Show Color Chooser button")); gtk_widget_show (check_toolbar_colour); gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_colour, FALSE, FALSE, 0); GTK_WIDGET_UNSET_FLAGS (check_toolbar_colour, GTK_CAN_FOCUS); - gtk_tooltips_set_tip (tooltips, check_toolbar_colour, _("Display the Colour Chooser button in the toolbar"), NULL); + gtk_tooltips_set_tip (tooltips, check_toolbar_colour, _("Display the Color Chooser button in the toolbar"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_colour), FALSE); check_toolbar_zoom = gtk_check_button_new_with_mnemonic (_("Show Zoom In and Zoom Out buttons")); @@ -3250,7 +3250,7 @@ create_prefs_dialog (void) gtk_widget_show (vbox12); gtk_container_add (GTK_CONTAINER (alignment6), vbox12); - checkbutton1 = gtk_check_button_new_with_mnemonic (_("Invert syntax highlighting colours")); + checkbutton1 = gtk_check_button_new_with_mnemonic (_("Invert syntax highlighting colors")); gtk_box_pack_start (GTK_BOX (vbox12), checkbutton1, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, checkbutton1, _("Use white text on a black background."), NULL); @@ -3348,7 +3348,7 @@ create_prefs_dialog (void) radio_long_line_background = gtk_radio_button_new_with_mnemonic (NULL, _("Background")); gtk_widget_show (radio_long_line_background); gtk_box_pack_start (GTK_BOX (hbox5), radio_long_line_background, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, radio_long_line_background, _("The background colour of characters after the given cursor position (see below) changed to the colour set below. (This is recommended if you use proportional fonts)"), NULL); + gtk_tooltips_set_tip (tooltips, radio_long_line_background, _("The background color of characters after the given cursor position (see below) changed to the color set below. (This is recommended if you use proportional fonts)"), NULL); gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_background), radio_long_line_line_group); radio_long_line_line_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_background)); diff --git a/src/keybindings.c b/src/keybindings.c index b5fb230c..0259e741 100644 --- a/src/keybindings.c +++ b/src/keybindings.c @@ -187,7 +187,7 @@ void keybindings_init(void) GDK_minus, GDK_CONTROL_MASK, "menu_zoomout", _("Zoom Out")); keys[GEANY_KEYS_MENU_OPENCOLORCHOOSER] = fill(cb_func_menu_opencolorchooser, - 0, 0, "menu_opencolorchooser", _("Show Colour Chooser")); + 0, 0, "menu_opencolorchooser", _("Show Color Chooser")); keys[GEANY_KEYS_MENU_INSERTSPECIALCHARS] = fill(cb_func_menu_insert_specialchars, 0, 0, "menu_insert_specialchars", _("Insert Special HTML Characters"));