Third and last part of this review-round of localisable strings.

Originally committed to SVN as r1377.
This commit is contained in:
Niels Martin Hansen 2007-07-05 15:51:42 +00:00
parent a3ee2770fa
commit d578680974
3 changed files with 21 additions and 21 deletions

View File

@ -399,8 +399,8 @@ void FrameMain::OnMenuOpen (wxMenuEvent &event) {
// Undo state // Undo state
editMenu->Remove(Menu_Edit_Undo); editMenu->Remove(Menu_Edit_Undo);
editMenu->Remove(Menu_Edit_Redo); editMenu->Remove(Menu_Edit_Redo);
AppendBitmapMenuItem(editMenu,Menu_Edit_Undo, _("&Undo") + wxString(_T(" ")) + AssFile::GetUndoDescription() + wxString(_T("\t")) + Hotkeys.GetText(_T("Undo")), _("Undoes last action"),wxBITMAP(undo_button),0)->Enable(!AssFile::IsUndoStackEmpty()); AppendBitmapMenuItem(editMenu,Menu_Edit_Undo, wxString::Format(_T("%s %s\t%s"), _("&Undo"), AssFile::GetUndoDescription().c_str(), Hotkeys.GetText(_T("Undo")).c_str()), _("Undoes last action"),wxBITMAP(undo_button),0)->Enable(!AssFile::IsUndoStackEmpty());
AppendBitmapMenuItem(editMenu,Menu_Edit_Redo, _("&Redo") + wxString(_T(" ")) + AssFile::GetRedoDescription() + wxString(_T("\t")) + Hotkeys.GetText(_T("Redo")), _("Redoes last action"),wxBITMAP(redo_button),1)->Enable(!AssFile::IsRedoStackEmpty()); AppendBitmapMenuItem(editMenu,Menu_Edit_Redo, wxString::Format(_T("%s %s\t%s"), _("&Redo"), AssFile::GetRedoDescription().c_str(), Hotkeys.GetText(_T("Redo")).c_str()), _("Redoes last action"),wxBITMAP(redo_button),1)->Enable(!AssFile::IsRedoStackEmpty());
// Copy/cut/paste // Copy/cut/paste
wxArrayInt sels = SubsBox->GetSelection(); wxArrayInt sels = SubsBox->GetSelection();
@ -576,7 +576,7 @@ void FrameMain::OnVideoPlay(wxCommandEvent &event) {
// Open video // Open video
void FrameMain::OnOpenVideo(wxCommandEvent& WXUNUSED(event)) { void FrameMain::OnOpenVideo(wxCommandEvent& WXUNUSED(event)) {
wxString path = Options.AsText(_T("Last open video path")); wxString path = Options.AsText(_T("Last open video path"));
wxString filename = wxFileSelector(_("Open video file"),path,_T(""),_T(""),_T("Recommended Formats (*.avi,*.avs,*.d2v)|*.avi;*.avs;*.d2v|Other supported formats (*.mkv,*.ogm,*.mp4,*.mpeg,*.mpg,*.vob)|*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg;*.vob|All Files (*.*)|*.*"),wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxString filename = wxFileSelector(_("Open video file"),path,_T(""),_T(""),_("Recommended Formats (*.avi,*.avs,*.d2v)|*.avi;*.avs;*.d2v|Other supported formats (*.mkv,*.ogm,*.mp4,*.mpeg,*.mpg,*.vob)|*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg;*.vob|All Files (*.*)|*.*"),wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (!filename.empty()) { if (!filename.empty()) {
LoadVideo(filename); LoadVideo(filename);
Options.SetText(_T("Last open video path"), filename); Options.SetText(_T("Last open video path"), filename);
@ -596,7 +596,7 @@ void FrameMain::OnCloseVideo(wxCommandEvent& WXUNUSED(event)) {
// Open Audio // Open Audio
void FrameMain::OnOpenAudio (wxCommandEvent& WXUNUSED(event)) { void FrameMain::OnOpenAudio (wxCommandEvent& WXUNUSED(event)) {
wxString path = Options.AsText(_T("Last open audio path")); wxString path = Options.AsText(_T("Last open audio path"));
wxString filename = wxFileSelector(_("Open audio file"),path,_T(""),_T(""),_T("Audio Formats (*.wav,*.mp3,*.ogg,*.flac,*.mp4,*.ac3,*.aac,*.mka)|*.wav;*.mp3;*.ogg;*.flac;*.mp4;*.ac3;*.aac;*.mka|Video Formats (*.avi,*.mkv,*.ogm,*.mpg,*.mpeg)|*.avi;*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg|All files (*.*)|*.*"),wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxString filename = wxFileSelector(_("Open audio file"),path,_T(""),_T(""),_("Audio Formats (*.wav,*.mp3,*.ogg,*.flac,*.mp4,*.ac3,*.aac,*.mka)|*.wav;*.mp3;*.ogg;*.flac;*.mp4;*.ac3;*.aac;*.mka|Video Formats (*.avi,*.mkv,*.ogm,*.mpg,*.mpeg)|*.avi;*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg|All files (*.*)|*.*"),wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (!filename.empty()) { if (!filename.empty()) {
LoadAudio(filename); LoadAudio(filename);
Options.SetText(_T("Last open audio path"), filename); Options.SetText(_T("Last open audio path"), filename);
@ -710,7 +710,7 @@ void FrameMain::OnExportSubtitles(wxCommandEvent & WXUNUSED(event)) {
// Open VFR tags // Open VFR tags
void FrameMain::OnOpenVFR(wxCommandEvent &event) { void FrameMain::OnOpenVFR(wxCommandEvent &event) {
wxString path = Options.AsText(_T("Last open timecodes path")); wxString path = Options.AsText(_T("Last open timecodes path"));
wxString filename = wxFileSelector(_("Open timecodes file"),path,_T(""),_T(""),_T("All Supported Types (*.txt)|*.txt|All Files (*.*)|*.*"),wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxString filename = wxFileSelector(_("Open timecodes file"),path,_T(""),_T(""),_("All Supported Types (*.txt)|*.txt|All Files (*.*)|*.*"),wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (!filename.empty()) { if (!filename.empty()) {
LoadVFR(filename); LoadVFR(filename);
Options.SetText(_T("Last open timecodes path"), filename); Options.SetText(_T("Last open timecodes path"), filename);

View File

@ -616,7 +616,7 @@ void SubsEditBox::OnLayerChange(wxSpinEvent &event) {
} }
// Done // Done
Layer->SetValue(wxString::Format(_("%i"),temp)); Layer->SetValue(wxString::Format(_T("%i"),temp));
grid->ass->FlagAsModified(_("layer change")); grid->ass->FlagAsModified(_("layer change"));
grid->CommitChanges(); grid->CommitChanges();
} }

View File

@ -161,44 +161,44 @@ void SubtitlesGrid::OnPopupMenu(bool alternate) {
//menu.AppendSeparator(); //menu.AppendSeparator();
// Duplicate selection // Duplicate selection
menu.Append(MENU_DUPLICATE,_("&Duplicate"),_T("Duplicate the selected lines"))->Enable(continuous); menu.Append(MENU_DUPLICATE,_("&Duplicate"),_("Duplicate the selected lines"))->Enable(continuous);
menu.Append(MENU_DUPLICATE_NEXT_FRAME,_("&Duplicate and shift by 1 frame"),_T("Duplicate lines and shift by one frame"))->Enable(continuous && VFR_Output.IsLoaded()); menu.Append(MENU_DUPLICATE_NEXT_FRAME,_("&Duplicate and shift by 1 frame"),_("Duplicate lines and shift by one frame"))->Enable(continuous && VFR_Output.IsLoaded());
menu.Append(MENU_SPLIT_BY_KARAOKE,_("Split (by karaoke)"),_T("Uses karaoke timing to split line into multiple smaller lines"))->Enable(sels > 0); menu.Append(MENU_SPLIT_BY_KARAOKE,_("Split (by karaoke)"),_("Uses karaoke timing to split line into multiple smaller lines"))->Enable(sels > 0);
// Swaps selection // Swaps selection
state = (sels == 2); state = (sels == 2);
menu.Append(MENU_SWAP,_("&Swap"),_T("Swaps the two selected lines"))->Enable(state); menu.Append(MENU_SWAP,_("&Swap"),_("Swaps the two selected lines"))->Enable(state);
// Join selection // Join selection
state = (sels >= 2 && continuous); state = (sels >= 2 && continuous);
menu.Append(MENU_JOIN_CONCAT,_("&Join (concatenate)"),_T("Joins selected lines in a single one, concatenating text together"))->Enable(state); menu.Append(MENU_JOIN_CONCAT,_("&Join (concatenate)"),_("Joins selected lines in a single one, concatenating text together"))->Enable(state);
menu.Append(MENU_JOIN_REPLACE,_("Join (keep first)"),_T("Joins selected lines in a single one, keeping text of first and discarding remaining"))->Enable(state); menu.Append(MENU_JOIN_REPLACE,_("Join (keep first)"),_("Joins selected lines in a single one, keeping text of first and discarding remaining"))->Enable(state);
menu.Append(MENU_JOIN_AS_KARAOKE,_("Join (as Karaoke)"),_T(""))->Enable(state); menu.Append(MENU_JOIN_AS_KARAOKE,_("Join (as Karaoke)"),_("Joins selected lines in a single one, making each line into a karaoke syllable"))->Enable(state);
menu.AppendSeparator(); menu.AppendSeparator();
// Adjoin selection // Adjoin selection
menu.Append(MENU_ADJOIN,_("&Make times continuous (change start)"),_T("Changes times of subs so start times begin on previous's end time"))->Enable(state); menu.Append(MENU_ADJOIN,_("&Make times continuous (change start)"),_("Changes times of subs so start times begin on previous's end time"))->Enable(state);
menu.Append(MENU_ADJOIN2,_("&Make times continuous (change end)"),_T("Changes times of subs so end times begin on next's start time"))->Enable(state); menu.Append(MENU_ADJOIN2,_("&Make times continuous (change end)"),_("Changes times of subs so end times begin on next's start time"))->Enable(state);
// Recombine selection // Recombine selection
state = (sels == 2 || sels == 3) && continuous; state = (sels == 2 || sels == 3) && continuous;
menu.Append(MENU_RECOMBINE,_("Recombine Lines"),_T("Recombine subtitles when they have been split and merged"))->Enable(state); menu.Append(MENU_RECOMBINE,_("Recombine Lines"),_("Recombine subtitles when they have been split and merged"))->Enable(state);
menu.AppendSeparator(); menu.AppendSeparator();
//Make audio clip //Make audio clip
state = parentFrame->audioBox->audioDisplay->loaded==true; state = parentFrame->audioBox->audioDisplay->loaded==true;
menu.Append(MENU_AUDIOCLIP,_("Create audio clip"),_T("Create an audio clip of the selected line"))->Enable(state); menu.Append(MENU_AUDIOCLIP,_("Create audio clip"),_("Create an audio clip of the selected line"))->Enable(state);
menu.AppendSeparator(); menu.AppendSeparator();
// Copy/cut/paste // Copy/cut/paste
menu.Append(MENU_COPY,_("&Copy"),_T("Copies selected lines to clipboard")); menu.Append(MENU_COPY,_("&Copy"),_("Copies selected lines to clipboard"));
menu.Append(MENU_CUT,_("C&ut"),_T("Cuts selected lines to clipboard")); menu.Append(MENU_CUT,_("C&ut"),_("Cuts selected lines to clipboard"));
menu.Append(MENU_PASTE,_("&Paste"),_T("Paste lines from clipboard")); menu.Append(MENU_PASTE,_("&Paste"),_("Paste lines from clipboard"));
menu.AppendSeparator(); menu.AppendSeparator();
// Delete // Delete
menu.Append(MENU_DELETE,_("Delete"),_T("Delete currently selected lines")); menu.Append(MENU_DELETE,_("Delete"),_("Delete currently selected lines"));
PopupMenu(&menu); PopupMenu(&menu);
} }