More translation-related updates

Originally committed to SVN as r1753.

aegisub/dialog_about.cpp

@@ -79,14 +79,16 @@ AboutScreen::AboutScreen(wxWindow *parent)
 	aboutString += wxString(_T("Aegisub ")) + GetAegisubShortVersionString() + _(" by ArchMage ZeratuL.\n");
 	aboutString += _T("Copyright (c) 2005-2008 - Rodrigo Braz Monteiro.\n\n");
 	aboutString += _T("Automation - Copyright (c) 2005-2008 Niels Martin Hansen (aka jfs).\n");
-	aboutString += _("Programmers: ");
+	aboutString += _("Programmers:");
 	aboutString += _T(" ArchMageZeratuL, jfs, Myrsloik, equinox, Tentacle, Yuvi,\n     Azzy, Pomyk, Motoko-chan, Dansolo, Haali.\n");
-	aboutString += _("Manual by: ");
-	aboutString += _T("ArchMage ZeratuL, jfs, movax, Kobi, TheFluff, Jcubed.\n");
-	aboutString += _("Forum, wiki and bug tracker hosting by: ");
-	aboutString += _T("Bot1.\n");
-	aboutString += _("SVN hosting by: ");
-	aboutString += _T("equinox, BerliOS, Mentar.\n");
+	aboutString += _("Manual by:");
+	aboutString += _T(" TheFluff, ArchMage ZeratuL, jfs, movax, Kobi, Jcubed.\n");
+	aboutString += _("Forum and wiki hosting by:");
+	aboutString += _T(" Bot1.\n");
+	aboutString += _("SVN hosting by:");
+	aboutString += _T(" equinox, BerliOS, Mentar.\n");
+	aboutString += _("Bug tracker hosting by:");
+	aboutString += _T(" jfs\n");
 	aboutString += translatorCredit;
 	aboutString += _T("\n") + libString;
 	aboutString += _("\nSee the help file for full credits.\n");

aegisub/dialog_style_manager.cpp

@@ -882,7 +882,7 @@ void DialogStyleManager::OnCurrentImport(wxCommandEvent &event) {
 			// Get styles
 			wxArrayString styles = temp.GetStyles();
 			if (styles.Count() == 0 || (styles.Count() == 1 && styles[0] == _T("Default"))) {
-				wxMessageBox(_("There selected file has no available styles."),_("Error Importing Styles"),wxOK);
+				wxMessageBox(_("The selected file has no available styles."),_("Error Importing Styles"),wxOK);
 				return;
 			}
 

aegisub/frame_main_events.cpp

@@ -604,7 +604,10 @@ void FrameMain::OnVideoPlay(wxCommandEvent &event) {
 // Open video
 void FrameMain::OnOpenVideo(wxCommandEvent& WXUNUSED(event)) {
 	wxString path = Options.AsText(_T("Last open video path"));
-	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);
+	wxString str = wxString(_("Recommended Formats")) + _T(" (*.avi,*.avs,*.d2v)|*.avi;*.avs;*.d2v|")
+		         + _("Other supported formats") + _T(" (*.mkv,*.ogm,*.mp4,*.mpeg,*.mpg,*.vob)|*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg;*.vob|")
+				 + _("All Files") + _T(" (*.*)|*.*");
+	wxString filename = wxFileSelector(_("Open video file"),path,_T(""),_T(""),str,wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 	if (!filename.empty()) {
 		LoadVideo(filename);
 		Options.SetText(_T("Last open video path"), filename);
@@ -624,7 +627,10 @@ void FrameMain::OnCloseVideo(wxCommandEvent& WXUNUSED(event)) {
 // Open Audio
 void FrameMain::OnOpenAudio (wxCommandEvent& WXUNUSED(event)) {
 	wxString path = Options.AsText(_T("Last open audio path"));
-	wxString filename = wxFileSelector(_("Open audio file"),path,_T(""),_T(""),_("Audio Formats (*.wav,*.mp3,*.ogg,*.flac,*.mp4,*.ac3,*.aac,*.mka,*.m4a)|*.wav;*.mp3;*.ogg;*.flac;*.mp4;*.ac3;*.aac;*.mka;*.m4a|Video Formats (*.avi,*.mkv,*.ogm,*.mpg,*.mpeg)|*.avi;*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg|All files (*.*)|*.*"),wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+	wxString str = wxString(_("Audio Formats")) + _T(" (*.wav,*.mp3,*.ogg,*.flac,*.mp4,*.ac3,*.aac,*.mka,*.m4a)|*.wav;*.mp3;*.ogg;*.flac;*.mp4;*.ac3;*.aac;*.mka;*.m4a|")
+		         + _("Video Formats") + _T(" (*.avi,*.mkv,*.ogm,*.mpg,*.mpeg)|*.avi;*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg|")
+				 + _("All files") + _T(" (*.*)|*.*");
+	wxString filename = wxFileSelector(_("Open audio file"),path,_T(""),_T(""),str,wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 	if (!filename.empty()) {
 		LoadAudio(filename);
 		Options.SetText(_T("Last open audio path"), filename);
@@ -749,7 +755,9 @@ void FrameMain::OnExportSubtitles(wxCommandEvent & WXUNUSED(event)) {
 // Open VFR tags
 void FrameMain::OnOpenVFR(wxCommandEvent &event) {
 	wxString path = Options.AsText(_T("Last open timecodes path"));
-	wxString filename = wxFileSelector(_("Open timecodes file"),path,_T(""),_T(""),_("All Supported Types (*.txt)|*.txt|All Files (*.*)|*.*"),wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+	wxString str = wxString(_("All Supported Types")) + _T("(*.txt)|*.txt|")
+		           + _("All Files") + _T(" (*.*)|*.*");
+	wxString filename = wxFileSelector(_("Open timecodes file"),path,_T(""),_T(""),str,wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 	if (!filename.empty()) {
 		LoadVFR(filename);
 		Options.SetText(_T("Last open timecodes path"), filename);
@@ -762,7 +770,9 @@ void FrameMain::OnOpenVFR(wxCommandEvent &event) {
 // Save VFR tags
 void FrameMain::OnSaveVFR(wxCommandEvent &event) {
 	wxString path = Options.AsText(_T("Last open timecodes path"));
-	wxString filename = wxFileSelector(_("Save timecodes file"),path,_T(""),_T(""),_("All Supported Types (*.txt)|*.txt|All Files (*.*)|*.*"),wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+	wxString str = wxString(_("All Supported Types")) + _T("(*.txt)|*.txt|")
+		           + _("All Files") + _T(" (*.*)|*.*");
+	wxString filename = wxFileSelector(_("Save timecodes file"),path,_T(""),_T(""),str,wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
 	if (!filename.empty()) {
 		SaveVFR(filename);
 		Options.SetText(_T("Last open timecodes path"), filename);

aegisub/subtitle_format.cpp

@@ -262,7 +262,7 @@ wxString SubtitleFormat::GetWildcards(int mode) {
 		temp1 += all[i] + _T(",");
 		temp2 += all[i] + _T(";");
 	}
-	final = _("All Supported Formats (") + temp1.Left(temp1.Length()-1) + _T(")|") + temp2.Left(temp2.Length()-1) + _T("|") + final.Left(final.Length()-1);
+	final = wxString(_("All Supported Formats")) + _T(" (") + temp1.Left(temp1.Length()-1) + _T(")|") + temp2.Left(temp2.Length()-1) + _T("|") + final.Left(final.Length()-1);
 
 	// Return final list
 	return final;

po/make_pot.bat

@@ -1,4 +1,3 @@
 del /s list.txt
 dir /w /b ..\aegisub\*.cpp ..\aegisub\*.h >> list.txt
 "c:\program files\gettext\bin\xgettext.exe" --files-from=list.txt --directory=../aegisub/ --output=aegisub.pot --c++ -k_
-pause