iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Misc. changes to localisable text, part one. 

Originally committed to SVN as r1374.
This commit is contained in:
Niels Martin Hansen 2007-07-05 15:23:31 +00:00
parent 00f64c0620
commit 93185b04aa
10 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aegisub/dialog_about.cpp
View File

@ -76,7 +76,6 @@ AboutScreen::AboutScreen(wxWindow *parent)
aboutString += wxString(_T("Aegisub ")) + GetAegisubShortVersionString() + _(" by ArchMage ZeratuL.\n");
aboutString += _T("Copyright (c) 2005-2007 - Rodrigo Braz Monteiro.\n\n");
aboutString += _T("Automation - Copyright (c) 2005-2007 Niels Martin Hansen (aka jfs).\n");
aboutString += _T("Motion Tracker - Copyright (c) 2006 Hajo Krabbenhoeft (aka Tentacle).\n");
aboutString += _("Programmers: ");
aboutString += _T(" ArchMageZeratuL, jfs, Myrsloik, equinox, Tentacle, Yuvi,\n Azzy, Pomyk, Motoko-chan, Dansolo, Haali.\n");
aboutString += _("Manual by: ");

6
aegisub/dialog_automation.cpp
View File

@ -88,6 +88,12 @@ DialogAutomation::DialogAutomation(wxWindow *parent, Automation4::ScriptManager
SetSizer(main_box);
Center();
// why doesn't this work... the button gets the "default" decoration but doesn't answer to Enter
// ("esc" does work)
SetDefaultItem(close_button);
SetAffirmativeId(wxID_CANCEL);
close_button->SetDefault();
RebuildList();
UpdateDisplay();
}

13
aegisub/dialog_fonts_collector.cpp
View File

@ -236,7 +236,7 @@ void DialogFontsCollector::OnBrowse(wxCommandEvent &event) {
// Chose file name
if (CollectAction->GetSelection()==2) {
wxFileName fname(DestBox->GetValue());
wxString dest = wxFileSelector(_("Select archive file name"),DestBox->GetValue(),fname.GetFullName(),_T(".zip"),_T("Zip Archives (*.zip)|*.zip"),wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
wxString dest = wxFileSelector(_("Select archive file name"),DestBox->GetValue(),fname.GetFullName(),_T(".zip"),_("Zip Archives (*.zip)|*.zip"),wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
if (!dest.empty()) {
DestBox->SetValue(dest);
}
@ -373,9 +373,10 @@ void FontsCollectorThread::Collect() {
}
// Collect font data
AppendText(_("Collecting font data from system. This might take a while, depending on the number of fonts installed. Results are cached and subsequent executions will be faster... "));
AppendText(_("Collecting font data from system. This might take a while, depending on the number of fonts installed. Results are cached and subsequent executions will be faster...\n"));
CollectFontData();
AppendText(_("done.\n\nScanning file for fonts..."));
AppendText(_("Done collecting font data."));
AppendText(_("Scanning file for fonts..."));
// Scan file
AssDialogue *curDiag;
@ -400,7 +401,7 @@ void FontsCollectorThread::Collect() {
}
// Copy fonts
AppendText(_("Done.\n\n"));
AppendText(wxString(_("Done.")) + _T("\n\n"));
switch (oper) {
case 0: AppendText(_("Checking fonts...\n")); break;
case 1: AppendText(_("Copying fonts to folder...\n")); break;
@ -558,8 +559,8 @@ void FontsCollectorThread::AddFont(wxString fontname,bool isStyle) {
if (fonts.Index(fontname) == wxNOT_FOUND) {
fonts.Add(fontname);
if (isStyle) AppendText(wxString(_T("\"")) + fontname + _("\" found on style \"") + curStyle->name + _T("\".\n"));
if (!isStyle) AppendText(wxString(_T("\"")) + fontname + _("\" found on dialogue line ") + wxString::Format(_T("%i"),curLine) + _T(".\n"));
if (isStyle) AppendText(wxString::Format(_("\"%s\" found on style \"%s\".\n"), fontname.c_str(), curStyle->name.c_str()));
if (!isStyle) AppendText(wxString::Format(_("\"%s\" found on dialogue line \"%d\".\n"), fontname.c_str(), curLine));
}
}

10
aegisub/dialog_kanji_timer.cpp
View File

@ -85,9 +85,9 @@ DialogKanjiTimer::DialogKanjiTimer(wxWindow *parent, SubtitlesGrid *_grid)
wxStaticText *ShortcutKeys = new wxStaticText(this,-1,_("When the destination textbox has focus, use the following keys:\n\nRight Arrow: Increase dest. selection length\nLeft Arrow: Decrease dest. selection length\nUp Arrow: Increase source selection length\nDown Arrow: Decrease source selection length\nEnter: Link, accept line when done\nBackspace: Unlink last"));
SourceStyle=new wxComboBox(this,-1,_(""),wxDefaultPosition,wxSize(160,-1),
SourceStyle=new wxComboBox(this,-1,_T(""),wxDefaultPosition,wxSize(160,-1),
subs->GetStyles(),wxCB_READONLY,wxDefaultValidator,_("Source Style"));
DestStyle = new wxComboBox(this,-1,_(""),wxDefaultPosition,wxSize(160,-1),
DestStyle = new wxComboBox(this,-1,_T(""),wxDefaultPosition,wxSize(160,-1),
subs->GetStyles(),wxCB_READONLY,wxDefaultValidator,_("Dest Style"));
GroupsList = new wxListCtrl(this,-1,wxDefaultPosition,wxSize(180,100),wxLC_REPORT|wxLC_NO_HEADER|wxLC_HRULES|wxLC_VRULES);
@ -299,7 +299,7 @@ void DialogKanjiTimer::OnSkipSource(wxCommandEvent &event) {
*Ask the user to copy it over or ignore it.
*/
int result = wxMessageBox(_("The source line contains text before the first karaoke block.\nDo you want to carry it over to the destination?\nIt will be ignored otherwise."),
_("Question"),wxICON_QUESTION|wxYES_NO|wxYES_DEFAULT);
_("Kanji timer"),wxICON_QUESTION|wxYES_NO|wxYES_DEFAULT);
TextBeforeOffset = plain->text.Len();
if (result==wxYES)
TextBeforeKaraoke = plain->text;
@ -366,7 +366,7 @@ void DialogKanjiTimer::OnAccept(wxCommandEvent &event) {
// since we can't figure out if it should go to the previous or the next group.
// We're not going to copy these if they're 0 length because if they're 0 length and have no
// text, then they're not necessary.
OutputText = wxString::Format(_("%s{\\k%i}"),OutputText.c_str(),RegroupSourceKLengths[SourceIndex]);
OutputText = wxString::Format(_T("%s{\\k%i}"),OutputText.c_str(),RegroupSourceKLengths[SourceIndex]);
SourceIndex++;
}
@ -375,7 +375,7 @@ void DialogKanjiTimer::OnAccept(wxCommandEvent &event) {
SourceLength -= (RegroupSourceText[SourceIndex]).Len();
SourceIndex++;
}
OutputText = wxString::Format(_("%s{\\k%i}%s"),OutputText.c_str(),WorkingK,(RegroupGroups[(index<<1)+1]).c_str());
OutputText = wxString::Format(_T("%s{\\k%i}%s"),OutputText.c_str(),WorkingK,(RegroupGroups[(index<<1)+1]).c_str());
WorkingK = 0;
}

4
aegisub/dialog_options.cpp
View File

@ -305,7 +305,7 @@ DialogOptions::DialogOptions(wxWindow *parent)
_("Collision foreground"), _("Line in frame background"), _("Header"),
_("Left Column"), _("Active Line Border"), _("Lines") };
wxString options2[12] = { _T("standard foreground"), _T("background"), _T("selection foreground"),
_("selection background"), _T("comment background"), _T("selected comment background"),
_T("selection background"), _T("comment background"), _T("selected comment background"),
_T("collision foreground") , _T("inframe background"), _T("header"),
_T("left column"), _T("active border"), _T("lines") };
for (int i=0;i<12;i++) {
@ -1015,7 +1015,7 @@ DialogInputHotkey::DialogInputHotkey(HotkeyType *_key,wxString name)
key = _key;
// Text
wxStaticText *text = new wxStaticText(this,-1,_("Press key to bind to \"") + name + _("\" or esc to cancel."));
wxStaticText *text = new wxStaticText(this,-1,wxString::Format(_("Press key to bind to \"%s\" or Esc to cancel."), name.c_str()));
// Key capturer
capture = new CaptureKey(this);

32
aegisub/dialog_paste_over.cpp
View File

@ -51,22 +51,22 @@ DialogPasteOver::DialogPasteOver (wxWindow *parent)
// List box
wxArrayString choices;
choices.Add(_T("Layer"));
choices.Add(_T("Start Time"));
choices.Add(_T("End Time"));
choices.Add(_T("Style"));
choices.Add(_T("Actor"));
choices.Add(_T("Margin Left"));
choices.Add(_T("Margin Right"));
choices.Add(_("Layer"));
choices.Add(_("Start Time"));
choices.Add(_("End Time"));
choices.Add(_("Style"));
choices.Add(_("Actor"));
choices.Add(_("Margin Left"));
choices.Add(_("Margin Right"));
if (mode == 1) {
choices.Add(_T("Margin Vertical"));
choices.Add(_("Margin Vertical"));
}
else {
choices.Add(_T("Margin Top"));
choices.Add(_T("Margin Bottom"));
choices.Add(_("Margin Top"));
choices.Add(_("Margin Bottom"));
}
choices.Add(_T("Effect"));
choices.Add(_T("Text"));
choices.Add(_("Effect"));
choices.Add(_("Text"));
ListBox = new wxCheckListBox(this,-1,wxDefaultPosition,wxSize(250,170), choices);
// Load checked items
@ -80,10 +80,10 @@ DialogPasteOver::DialogPasteOver (wxWindow *parent)
// Top buttons
wxSizer *TopButtonSizer = new wxBoxSizer(wxHORIZONTAL);
TopButtonSizer->Add(new wxButton(this, Paste_Over_All, _T("All")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_None, _T("None")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_Times, _T("Times")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_Text, _T("Text")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_All, _("All")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_None, _("None")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_Times, _("Times")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_Text, _("Text")),1,0,0);
// Buttons
wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);

2
aegisub/dialog_properties.cpp
View File

@ -120,7 +120,7 @@ DialogProperties::DialogProperties (wxWindow *parent)
long n;
subs->GetScriptInfo(_T("WrapStyle")).ToLong(&n);
WrapStyle->SetSelection(n);
optionsGrid->Add(new wxStaticText(this,-1,_("Warp Style: ")),0,wxALIGN_CENTER_VERTICAL,0);
optionsGrid->Add(new wxStaticText(this,-1,_("Wrap Style: ")),0,wxALIGN_CENTER_VERTICAL,0);
optionsGrid->Add(WrapStyle,1,wxEXPAND,0);
options.Clear();
options.Add(_("Normal"));

4
aegisub/dialog_spellchecker.cpp
View File

@ -102,8 +102,8 @@ DialogSpellChecker::DialogSpellChecker(wxFrame *parent)
}
// Top sizer
origWord = new wxTextCtrl(this,-1,_T("original"),wxDefaultPosition,wxDefaultSize,wxTE_READONLY);
replaceWord = new wxTextCtrl(this,-1,_T("replace with"));
origWord = new wxTextCtrl(this,-1,_("original"),wxDefaultPosition,wxDefaultSize,wxTE_READONLY);
replaceWord = new wxTextCtrl(this,-1,_("replace with"));
wxFlexGridSizer *topSizer = new wxFlexGridSizer(2,2,5,5);
topSizer->Add(new wxStaticText(this,-1,_("Misspelled word:")),0,wxALIGN_CENTER_VERTICAL);
topSizer->Add(origWord,1,wxEXPAND);

12
aegisub/dialog_style_editor.cpp
View File

@ -158,15 +158,15 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
StyleName->SetToolTip(_("Style name."));
FontName->SetToolTip(_("Font face."));
FontSize->SetToolTip(_("Font size."));
colorButton[0]->SetToolTip(_("Click to choose primary color."));
colorButton[1]->SetToolTip(_("Click to choose secondary color."));
colorButton[2]->SetToolTip(_("Click to choose outline color."));
colorButton[3]->SetToolTip(_("Click to choose shadow color."));
colorButton[0]->SetToolTip(_("Choose primary color."));
colorButton[1]->SetToolTip(_("Choose secondary color."));
colorButton[2]->SetToolTip(_("Choose outline color."));
colorButton[3]->SetToolTip(_("Choose shadow color."));
for (int i=0;i<4;i++) colorAlpha[i]->SetToolTip(_("Set opacity, from 0 (opaque) to 255 (transparent)."));
margin[0]->SetToolTip(_("Distance from left edge, in pixels."));
margin[1]->SetToolTip(_("Distance from right edge, in pixels."));
margin[2]->SetToolTip(_("Distance from top/bottom edge, in pixels."));
OutlineType->SetToolTip(_("Checking this will display an opaque box instead of outline."));
OutlineType->SetToolTip(_("When selected, display an opaque box behind the subtitles instead of an outline around the text."));
Outline->SetToolTip(_("Outline width, in pixels."));
Shadow->SetToolTip(_("Shadow distance, in pixels."));
ScaleX->SetToolTip(_("Scale X, in percentage."));
@ -444,7 +444,7 @@ void DialogStyleEditor::Apply (bool apply,bool close) {
if (!work->name.StartsWith(_("Copy of "))) {
// See if user wants to update style name through script
int answer = wxNO;
if (work->name != _T("Default")) answer = wxMessageBox(_T("Do you want to change all instances of this style in the script to this new name?"),_T("Update script?"),wxYES_NO | wxCANCEL);
if (work->name != _T("Default")) answer = wxMessageBox(_("Do you want to change all instances of this style in the script to this new name?"),_("Update script?"),wxYES_NO | wxCANCEL);
// Cancel
if (answer == wxCANCEL) return;

4
aegisub/dialog_version_check.cpp
View File

@ -179,7 +179,7 @@ wxThread::ExitCode VersionCheckThread::Entry() {
#ifdef __WXDEBUG__
wxMutexGuiEnter();
if (!alive) goto endThread;
parent->logBox->AppendText(_("Attempting to open \"") + path + _T("\"... "));
parent->logBox->AppendText(wxString::Format(_("Attempting to open \"%s\"..."), path.c_str()));
wxMutexGuiLeave();
#endif
wxFileSystem fs;
@ -261,7 +261,7 @@ wxThread::ExitCode VersionCheckThread::Entry() {
if (!alive) goto endThread;
parent->logBox->AppendText(_("New version found!\n"));
parent->logBox->AppendText(parsed[3] + _T("\n"));
parent->logBox->AppendText(_("Please go to the following URL to download it: ") + parsed[2] + _T("\n"));
parent->logBox->AppendText(wxString::Format(_("Please go to the following URL to download it: %s\n"), parsed[2].c_str()));
if (!parent->visible) {
parent->Show();
parent->Raise();