projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.cc
diff --git
a/src/wx/screen_dialog.cc
b/src/wx/screen_dialog.cc
index 0d46a46ec215dfc5f7de8cdaf89821d955bf3fe2..6b58145eb367737c6bf6317f8b4b7d368bf43b8f 100644
(file)
--- a/
src/wx/screen_dialog.cc
+++ b/
src/wx/screen_dialog.cc
@@
-35,10
+35,10
@@
ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_
: TableDialog (parent, std_to_wx (title), 2, true)
, _certificate (certificate)
{
: TableDialog (parent, std_to_wx (title), 2, true)
, _certificate (certificate)
{
- add (
"Name"
, true);
+ add (
_("Name")
, true);
_name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)));
_name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)));
- add (
"Server manufacturer"
, true);
+ add (
_("Server manufacturer")
, true);
_manufacturer = add (new wxChoice (this, wxID_ANY));
add (_("Certificate"), true);
_manufacturer = add (new wxChoice (this, wxID_ANY));
add (_("Certificate"), true);
@@
-92,7
+92,7
@@
ScreenDialog::load_certificate (boost::filesystem::path file)
_certificate.reset (new dcp::Certificate (file));
_certificate_text->SetValue (_certificate->certificate ());
} catch (dcp::MiscError& e) {
_certificate.reset (new dcp::Certificate (file));
_certificate_text->SetValue (_certificate->certificate ());
} catch (dcp::MiscError& e) {
- error_dialog (this,
String::compose ("Could not read certificate file (%1)"
, e.what()));
+ error_dialog (this,
wxString::Format (_("Could not read certificate file (%s)")
, e.what()));
}
}
}
}