diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-29 15:07:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-29 15:07:17 +0100 |
| commit | 318a778b1b5c98b79b202dc953ff2ac131371a1b (patch) | |
| tree | 52d05d9927c22842c5047a625e07eb9c92f87cdb /src/wx | |
| parent | 3802ba3df2ac27d4fabdcbd61b9ed84f6adf5627 (diff) | |
| parent | b289602176a4943233cffb75e8ccac379112420a (diff) | |
Fix merge.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/about_dialog.cc | 1 | ||||
| -rw-r--r-- | src/wx/subtitle_panel.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 142705a55..85cfc92be 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -227,6 +227,7 @@ AboutDialog::AboutDialog (wxWindow* parent) tested_by.Add (wxT ("Mauro Ottonello")); tested_by.Add (wxT ("Peter Puchner")); tested_by.Add (wxT ("Markus Raab")); + tested_by.Add (wxT ("Michael Reckert")); tested_by.Add (wxT ("Greg Rooke")); tested_by.Add (wxT ("Elad Saad")); tested_by.Add (wxT ("Karim Senoucci")); diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index a7774ed20..3d6e5c8c3 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -51,7 +51,7 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) grid->Add (_use); grid->AddSpacer (0); - _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles")); + _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image")); grid->Add (_burn); grid->AddSpacer (0); |