diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-15 09:34:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-15 09:34:46 +0100 |
| commit | e491397c0028a80ac4a48a92007f783746553c1a (patch) | |
| tree | 6cfabf78852e968323a1855c650b3b9c739b5334 /src | |
| parent | 12efbd5938f08eb445b43f539fa4f27aa5caccfb (diff) | |
| parent | 60febebc55d25b5f60297d9f8c1b51fbda6bac63 (diff) | |
Merge master.
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 003cc222f..c4a7fd5bc 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")); |