From 4bb707d663a3d1ae9ea1521078a00fc0eafac2b8 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 3 Apr 2012 17:38:50 +0000 Subject: [PATCH] Use "color" in all UI strings Previously there were 29 instances of "color" and 9 of "colour". Originally committed to SVN as r6648. --- aegisub/src/command/video.cpp | 2 +- aegisub/src/dialog_colorpicker.cpp | 10 +++++----- aegisub/src/dialog_dummy_video.cpp | 2 +- aegisub/src/dialog_style_editor.cpp | 2 +- aegisub/src/preferences.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp index 8ec459aaf..78d77b283 100644 --- a/aegisub/src/command/video.cpp +++ b/aegisub/src/command/video.cpp @@ -608,7 +608,7 @@ struct video_open_dummy : public Command { CMD_NAME("video/open/dummy") STR_MENU("&Use Dummy Video...") STR_DISP("Use Dummy Video") - STR_HELP("Opens a video clip with solid colour") + STR_HELP("Opens a video clip with solid color") void operator()(agi::Context *c) { wxString fn; diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp index 10f2a9899..3f3398da4 100644 --- a/aegisub/src/dialog_colorpicker.cpp +++ b/aegisub/src/dialog_colorpicker.cpp @@ -652,7 +652,7 @@ static wxBitmap *make_rgb_image(int width, int offset) { } DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color, ColorCallback callback, void* userdata) -: wxDialog(parent, -1, _("Select Colour")) +: wxDialog(parent, -1, _("Select Color")) , callback(callback) , callbackUserdata(userdata) { @@ -685,7 +685,7 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color, C hsv_slider = new wxBitmap(sliderimg); // Create the controls for the dialog - wxSizer *spectrum_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Colour spectrum")); + wxSizer *spectrum_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Color spectrum")); spectrum = new ColorPickerSpectrum(this, ColorPickerSpectrum::HorzVert, wxSize(256, 256)); slider = new ColorPickerSpectrum(this, ColorPickerSpectrum::Vert, wxSize(slider_width, 256)); wxString modes[] = { _("RGB/R"), _("RGB/G"), _("RGB/B"), _("HSL/L"), _("HSV/H") }; @@ -694,9 +694,9 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color, C wxSize colorinput_size(70, -1); wxSize colorinput_labelsize(40, -1); - wxSizer *rgb_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("RGB colour")); - wxSizer *hsl_box = new wxStaticBoxSizer(wxVERTICAL, this, _("HSL colour")); - wxSizer *hsv_box = new wxStaticBoxSizer(wxVERTICAL, this, _("HSV colour")); + wxSizer *rgb_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("RGB color")); + wxSizer *hsl_box = new wxStaticBoxSizer(wxVERTICAL, this, _("HSL color")); + wxSizer *hsv_box = new wxStaticBoxSizer(wxVERTICAL, this, _("HSV color")); for (int i = 0; i < 3; ++i) { rgb_input[i] = new wxSpinCtrl(this, -1, "", wxDefaultPosition, colorinput_size, wxSP_ARROW_KEYS, 0, 255); hsl_input[i] = new wxSpinCtrl(this, -1, "", wxDefaultPosition, colorinput_size, wxSP_ARROW_KEYS, 0, 255); diff --git a/aegisub/src/dialog_dummy_video.cpp b/aegisub/src/dialog_dummy_video.cpp index c47746fb6..7e9ec5464 100644 --- a/aegisub/src/dialog_dummy_video.cpp +++ b/aegisub/src/dialog_dummy_video.cpp @@ -182,7 +182,7 @@ DialogDummyVideo::DialogDummyVideo(wxWindow *parent) res_sizer->Add(new wxStaticText(this, -1, " x "), 0, wxALIGN_CENTRE_VERTICAL|wxFIXED_MINSIZE); res_sizer->Add(height, 0, wxEXPAND); fg->Add(res_sizer, 0, wxEXPAND); - fg->Add(new wxStaticText(this, -1, _("Colour:")), 0, wxALIGN_CENTRE_VERTICAL); + fg->Add(new wxStaticText(this, -1, _("Color:")), 0, wxALIGN_CENTRE_VERTICAL); fg->Add(colour, 0, wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL); fg->AddStretchSpacer(); fg->Add(pattern, 0, wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL); diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp index c40546d85..26f15158d 100644 --- a/aegisub/src/dialog_style_editor.cpp +++ b/aegisub/src/dialog_style_editor.cpp @@ -342,7 +342,7 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con SubsPreview->SetStyle(*style); SubsPreview->SetText(PreviewText->GetValue()); PreviewText->SetToolTip(_("Text to be used for the preview")); - previewButton->SetToolTip(_("Colour of preview background")); + previewButton->SetToolTip(_("Color of preview background")); wxSizer *PreviewBottomSizer = new wxBoxSizer(wxHORIZONTAL); PreviewBottomSizer->Add(PreviewText, 1, wxEXPAND | wxRIGHT, 5); diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp index 89a62d36b..51ce73509 100644 --- a/aegisub/src/preferences.cpp +++ b/aegisub/src/preferences.cpp @@ -209,7 +209,7 @@ Interface::Interface(wxTreebook *book, Preferences *parent): OptionPage(book, pa } /// Interface Colours preferences subpage -Interface_Colours::Interface_Colours(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Colours"), PAGE_SCROLL|PAGE_SUB) { +Interface_Colours::Interface_Colours(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Colors"), PAGE_SCROLL|PAGE_SUB) { delete sizer; wxSizer *main_sizer = new wxBoxSizer(wxHORIZONTAL);