mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Synchronize a bunch of similar but not quite identical strings. Closes #1081.

Browse source 
Originally committed to SVN as r6213.
This commit is contained in:
Thomas Goyne 2012-01-08 01:05:25 +00:00
parent c847318ddb
commit e8ba128fa8
11 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
aegisub/src/auto4_base.cpp
View file

@ -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;
}

4
aegisub/src/command/audio.cpp
View file

@ -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()));

2
aegisub/src/command/keyframe.cpp
View file

@ -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;

8
aegisub/src/command/time.cpp
View file

@ -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();

8
aegisub/src/command/timecode.cpp
View file

@ -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()));

8
aegisub/src/command/tool.cpp
View file

@ -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) {

8
aegisub/src/dialog_export.cpp
View file

@ -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);

2
aegisub/src/dialog_resample.cpp
View file

@ -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

4
aegisub/src/dialog_spellchecker.cpp
View file

@ -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));

2
aegisub/src/dialog_style_editor.cpp
View file

@ -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"));

2
aegisub/src/dialog_styling_assistant.cpp
View file

@ -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)
{