projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[dcpomatic.git]
/
src
/
wx
/
job_wrapper.cc
diff --git
a/src/wx/job_wrapper.cc
b/src/wx/job_wrapper.cc
index f2056cf498abacd429c92464d9176082e3e7c5c0..cb02ecd0257dbddd771e80d131d2cc9f799d4a49 100644
(file)
--- a/
src/wx/job_wrapper.cc
+++ b/
src/wx/job_wrapper.cc
@@
-35,8
+35,8
@@
JobWrapper::make_dcp (wxWindow* parent, shared_ptr<Film> film, bool transcode)
try {
film->make_dcp (transcode);
} catch (BadSettingError& e) {
try {
film->make_dcp (transcode);
} catch (BadSettingError& e) {
- error_dialog (parent,
String::compose ("Bad setting for %1 (%2)", e.setting(), e.what
()));
+ error_dialog (parent,
wxString::Format (_("Bad setting for %s (%s)"), e.setting().c_str(), e.what
()));
} catch (std::exception& e) {
} catch (std::exception& e) {
- error_dialog (parent,
String::compose ("Could not make DCP: %1"
, e.what ()));
+ error_dialog (parent,
wxString::Format (_("Could not make DCP: %s")
, e.what ()));
}
}
}
}