diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-16 10:39:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-16 10:39:31 +0100 |
| commit | a55adfd6f1a22b00d1330e9aea1f5cf8d24bf92f (patch) | |
| tree | 5a2bad051d50b222dab0876b8d86b2c9f8828f5d /src | |
| parent | 30661f2b8c2da1022c2cebbec62c3e15cabde5b1 (diff) | |
| parent | 60febebc55d25b5f60297d9f8c1b51fbda6bac63 (diff) | |
Merge branch 'master' of git.carlh.net:git/dcpomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/wx_util.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 1e501f54f..7f15217f1 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -280,6 +280,14 @@ dcpomatic_setup_i18n () locale->AddCatalogLookupPathPrefix (POSIX_LOCALE_PREFIX); #endif +#ifdef DCPOMATIC_LINUX + /* We have to include the wxWidgets .mo in our distribution, + so we rename it to avoid clashes with any other installation + of wxWidgets. + */ + locale->AddCatalog (wxT ("dcpomatic-wxstd")); +#endif + locale->AddCatalog (wxT ("libdcpomatic-wx")); locale->AddCatalog (wxT ("dcpomatic")); |