From e8ba128fa841b4e5271da450406da7f13dc66e20 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 8 Jan 2012 01:05:25 +0000 Subject: [PATCH] Synchronize a bunch of similar but not quite identical strings. Closes #1081. Originally committed to SVN as r6213. --- aegisub/src/auto4_base.cpp | 9 +++------ aegisub/src/command/audio.cpp | 4 ++-- aegisub/src/command/keyframe.cpp | 2 +- aegisub/src/command/time.cpp | 8 ++++---- aegisub/src/command/timecode.cpp | 8 ++++---- aegisub/src/command/tool.cpp | 8 ++++---- aegisub/src/dialog_export.cpp | 8 ++++---- aegisub/src/dialog_resample.cpp | 2 +- aegisub/src/dialog_spellchecker.cpp | 4 ++-- aegisub/src/dialog_style_editor.cpp | 2 +- aegisub/src/dialog_styling_assistant.cpp | 2 +- 11 files changed, 27 insertions(+), 30 deletions(-) diff --git a/aegisub/src/auto4_base.cpp b/aegisub/src/auto4_base.cpp index e563c0a43..e3505f885 100644 --- a/aegisub/src/auto4_base.cpp +++ b/aegisub/src/auto4_base.cpp @@ -576,16 +576,13 @@ namespace Automation4 { fnfilter = wxString::Format("%s%s scripts (%s)|%s|", fnfilter, fact->GetEngineName(), fact->GetFilenamePattern(), fact->GetFilenamePattern()); catchall += fact->GetFilenamePattern() + ";"; } -#ifdef __WINDOWS__ - fnfilter += "All files|*.*"; -#else - fnfilter += "All files|*"; -#endif + fnfilter += _("All Files") + " (*.*)|*.*"; + if (!catchall.empty()) catchall.RemoveLast(); if (factories->size() > 1) - fnfilter = "All supported scripts|" + catchall + "|" + fnfilter; + fnfilter = _("All Supported Formats") + "|" + catchall + "|" + fnfilter; return fnfilter; } diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp index 5367a1666..2fd353de6 100644 --- a/aegisub/src/command/audio.cpp +++ b/aegisub/src/command/audio.cpp @@ -96,8 +96,8 @@ struct audio_open : public Command { wxString path = lagi_wxString(OPT_GET("Path/Last/Audio")->GetString()); wxString str = wxString(_("Audio Formats")) + " (*.wav,*.mp3,*.ogg,*.flac,*.mp4,*.ac3,*.aac,*.mka,*.m4a,*.w64)|*.wav;*.mp3;*.ogg;*.flac;*.mp4;*.ac3;*.aac;*.mka;*.m4a;*.w64|" + _("Video Formats") + " (*.avi,*.mkv,*.ogm,*.mpg,*.mpeg)|*.avi;*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg|" - + _("All files") + " (*.*)|*.*"; - wxString filename = wxFileSelector(_("Open audio file"),path,"","",str,wxFD_OPEN | wxFD_FILE_MUST_EXIST); + + _("All Files") + " (*.*)|*.*"; + wxString filename = wxFileSelector(_("Open Audio File"),path,"","",str,wxFD_OPEN | wxFD_FILE_MUST_EXIST); if (!filename.empty()) { c->audioController->OpenAudio(filename); OPT_SET("Path/Last/Audio")->SetString(STD_STR(wxFileName(filename).GetPath())); diff --git a/aegisub/src/command/keyframe.cpp b/aegisub/src/command/keyframe.cpp index cc448f261..2bd347dd9 100644 --- a/aegisub/src/command/keyframe.cpp +++ b/aegisub/src/command/keyframe.cpp @@ -88,7 +88,7 @@ struct keyframe_open : public Command { path, "" ,".txt", - "All supported formats (*.txt, *.pass, *.stats, *.log)|*.txt;*.pass;*.stats;*.log|All files (*.*)|*.*", + _("All Supported Formats") + " (*.txt, *.pass, *.stats, *.log)|*.txt;*.pass;*.stats;*.log|" + _("All Files") + " (*.*)|*.*", wxFD_FILE_MUST_EXIST | wxFD_OPEN); if (filename.empty()) return; diff --git a/aegisub/src/command/time.cpp b/aegisub/src/command/time.cpp index fb408bca3..22b997c32 100644 --- a/aegisub/src/command/time.cpp +++ b/aegisub/src/command/time.cpp @@ -328,8 +328,8 @@ struct time_sort_style : public Command { /// Switch to the next timeable thing (line or syllable) struct time_next : public Command { CMD_NAME("time/next") - STR_MENU("Next line") - STR_DISP("Next line") + STR_MENU("Next Line") + STR_DISP("Next Line") STR_HELP("Next line or syllable") void operator()(agi::Context *c) { c->audioController->Stop(); @@ -342,8 +342,8 @@ struct time_next : public Command { /// Switch to the previous timeable thing (line or syllable) struct time_prev : public Command { CMD_NAME("time/prev") - STR_MENU("Previous line") - STR_DISP("Previous line") + STR_MENU("Previous Line") + STR_DISP("Previous Line") STR_HELP("Previous line or syllable") void operator()(agi::Context *c) { c->audioController->Stop(); diff --git a/aegisub/src/command/timecode.cpp b/aegisub/src/command/timecode.cpp index 696dddac9..1c258d655 100644 --- a/aegisub/src/command/timecode.cpp +++ b/aegisub/src/command/timecode.cpp @@ -82,8 +82,8 @@ struct timecode_open : public Command { void operator()(agi::Context *c) { wxString path = lagi_wxString(OPT_GET("Path/Last/Timecodes")->GetString()); - wxString str = wxString(_("All Supported Types")) + "(*.txt)|*.txt|" + _("All Files") + " (*.*)|*.*"; - wxString filename = wxFileSelector(_("Open timecodes file"),path,"","",str,wxFD_OPEN | wxFD_FILE_MUST_EXIST); + wxString str = _("All Supported Formats") + " (*.txt)|*.txt|" + _("All Files") + " (*.*)|*.*"; + wxString filename = wxFileSelector(_("Open Timecodes File"),path,"","",str,wxFD_OPEN | wxFD_FILE_MUST_EXIST); if (!filename.empty()) { c->videoController->LoadTimecodes(filename); OPT_SET("Path/Last/Timecodes")->SetString(STD_STR(wxFileName(filename).GetPath())); @@ -106,8 +106,8 @@ struct timecode_save : public Command { void operator()(agi::Context *c) { wxString path = lagi_wxString(OPT_GET("Path/Last/Timecodes")->GetString()); - wxString str = wxString(_("All Supported Types")) + "(*.txt)|*.txt|" + _("All Files") + " (*.*)|*.*"; - wxString filename = wxFileSelector(_("Save timecodes file"),path,"","",str,wxFD_SAVE | wxFD_OVERWRITE_PROMPT); + wxString str = _("All Supported Formats") + " (*.txt)|*.txt|" + _("All Files") + " (*.*)|*.*"; + wxString filename = wxFileSelector(_("Save Timecodes File"),path,"","",str,wxFD_SAVE | wxFD_OVERWRITE_PROMPT); if (!filename.empty()) { c->videoController->SaveTimecodes(filename); OPT_SET("Path/Last/Timecodes")->SetString(STD_STR(wxFileName(filename).GetPath())); diff --git a/aegisub/src/command/tool.cpp b/aegisub/src/command/tool.cpp index b668d7188..c8e47d049 100644 --- a/aegisub/src/command/tool.cpp +++ b/aegisub/src/command/tool.cpp @@ -276,8 +276,8 @@ struct tool_translation_assistant_preview : public tool_translation_assistant_va /// Move to the next line without committing changes. struct tool_translation_assistant_next : public tool_translation_assistant_validator { CMD_NAME("tool/translation_assistant/next") - STR_MENU("&Next line") - STR_DISP("Next line") + STR_MENU("&Next Line") + STR_DISP("Next Line") STR_HELP("Move to the next line without committing changes.") void operator()(agi::Context *c) { @@ -288,8 +288,8 @@ struct tool_translation_assistant_next : public tool_translation_assistant_valid /// Move to the previous line without committing changes. struct tool_translation_assistant_prev : public tool_translation_assistant_validator { CMD_NAME("tool/translation_assistant/prev") - STR_MENU("&Prev line") - STR_DISP("Prev line") + STR_MENU("&Previous Line") + STR_DISP("Previous Line") STR_HELP("Move to the previous line without committing changes.") void operator()(agi::Context *c) { diff --git a/aegisub/src/dialog_export.cpp b/aegisub/src/dialog_export.cpp index b955c63a4..023ede716 100644 --- a/aegisub/src/dialog_export.cpp +++ b/aegisub/src/dialog_export.cpp @@ -74,10 +74,10 @@ DialogExport::DialogExport(agi::Context *c) } } - wxButton *btn_up = new wxButton(this, -1, _("Move &up"), wxDefaultPosition, wxSize(90, -1)); - wxButton *btn_down = new wxButton(this, -1, _("Move &down"), wxDefaultPosition, wxSize(90, -1)); - wxButton *btn_all = new wxButton(this, -1, _("Select &all"), wxDefaultPosition, wxSize(80, -1)); - wxButton *btn_none = new wxButton(this, -1, _("Select &none"), wxDefaultPosition, wxSize(80, -1)); + wxButton *btn_up = new wxButton(this, -1, _("Move &Up"), wxDefaultPosition, wxSize(90, -1)); + wxButton *btn_down = new wxButton(this, -1, _("Move &Down"), wxDefaultPosition, wxSize(90, -1)); + wxButton *btn_all = new wxButton(this, -1, _("Select &All"), wxDefaultPosition, wxSize(80, -1)); + wxButton *btn_none = new wxButton(this, -1, _("Select &None"), wxDefaultPosition, wxSize(80, -1)); btn_up->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogExport::OnMoveUp, this); btn_down->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogExport::OnMoveDown, this); diff --git a/aegisub/src/dialog_resample.cpp b/aegisub/src/dialog_resample.cpp index efb01aa99..da5dbfdb3 100644 --- a/aegisub/src/dialog_resample.cpp +++ b/aegisub/src/dialog_resample.cpp @@ -67,7 +67,7 @@ enum { }; DialogResample::DialogResample(agi::Context *c) -: wxDialog(c->parent,-1,_("Resample resolution"),wxDefaultPosition) +: wxDialog(c->parent,-1,_("Resample Resolution"),wxDefaultPosition) , c(c) { // Set icon diff --git a/aegisub/src/dialog_spellchecker.cpp b/aegisub/src/dialog_spellchecker.cpp index 3119ae3c5..c09e5e5d0 100644 --- a/aegisub/src/dialog_spellchecker.cpp +++ b/aegisub/src/dialog_spellchecker.cpp @@ -71,9 +71,9 @@ DialogSpellChecker::DialogSpellChecker(agi::Context *context) // Misspelled word and currently selected correction current_word_sizer->AddGrowableCol(1, 1); current_word_sizer->Add(new wxStaticText(this, -1, _("Misspelled word:")), 0, wxALIGN_CENTER_VERTICAL); - current_word_sizer->Add(orig_word = new wxTextCtrl(this, -1, _("original"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY), wxSizerFlags(1).Expand()); + current_word_sizer->Add(orig_word = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_READONLY), wxSizerFlags(1).Expand()); current_word_sizer->Add(new wxStaticText(this, -1, _("Replace with:")), 0, wxALIGN_CENTER_VERTICAL); - current_word_sizer->Add(replace_word = new wxTextCtrl(this, -1, _("replace with")), wxSizerFlags(1).Expand()); + current_word_sizer->Add(replace_word = new wxTextCtrl(this, -1, ""), wxSizerFlags(1).Expand()); // List of suggested corrections suggest_list = new wxListBox(this, -1, wxDefaultPosition, wxSize(300, 150)); diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp index fbdfe7647..bbcff933b 100644 --- a/aegisub/src/dialog_style_editor.cpp +++ b/aegisub/src/dialog_style_editor.cpp @@ -110,7 +110,7 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con AssStyle::GetEncodings(encodingStrings); // Create sizers - wxSizer *NameSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Style name")); + wxSizer *NameSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Style Name")); wxSizer *FontSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Font")); wxSizer *ColorsSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Colors")); wxSizer *MarginSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Margins")); diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp index 8ffd38601..54529c67c 100644 --- a/aegisub/src/dialog_styling_assistant.cpp +++ b/aegisub/src/dialog_styling_assistant.cpp @@ -56,7 +56,7 @@ static void add_hotkey(wxSizer *sizer, wxWindow *parent, const char *command, co } DialogStyling::DialogStyling(agi::Context *context) -: wxDialog(context->parent, -1, _("Styling assistant"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMINIMIZE_BOX) +: wxDialog(context->parent, -1, _("Styling Assistant"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMINIMIZE_BOX) , c(context) , active_line(0) {