]>
Commit | Line | Data |
---|---|---|
7235e43b KK |
1 | --- mkvtoolnix-2.8.0/src/common/translation.cpp.orig 2009-05-10 16:14:28.000000000 +0200 |
2 | +++ mkvtoolnix-2.8.0/src/common/translation.cpp 2009-05-10 15:05:54.000000000 +0200 | |
3 | @@ -210,7 +210,7 @@ | |
4 | mxverb(4, boost::format("[init_locales chosen locale %1%]\n") % chosen_locale); | |
5 | ||
6 | if (chosen_locale.empty()) | |
7 | - mxerror(Y("The locale could not be set properly. Check the LANG, LC_ALL and LC_MESSAGES environment variables.\n")); | |
e7abba70 | 8 | + mxwarn("The locale could not be set properly. Check the LANG, LC_ALL and LC_MESSAGES environment variables.\n"); |
7235e43b KK |
9 | |
10 | locale_dir = MTX_LOCALE_DIR; | |
11 | # endif // SYS_WINDOWS | |
e7abba70 KK |
12 | --- mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp.orig 2009-07-01 18:40:03.000000000 +0200 |
13 | +++ mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp 2009-07-05 19:50:07.000000000 +0200 | |
14 | @@ -163,8 +163,9 @@ | |
15 | siz_all->Add(new wxStaticLine(this), 0, wxGROW | wxLEFT | wxRIGHT, 5); | |
16 | siz_all->AddSpacer(5); | |
17 | ||
18 | + wxBoxSizer *siz_line; | |
19 | #if defined(HAVE_LIBINTL_H) | |
20 | - wxBoxSizer *siz_line = new wxBoxSizer(wxHORIZONTAL); | |
21 | + siz_line = new wxBoxSizer(wxHORIZONTAL); | |
22 | siz_line->Add(st_ui_language, 0, wxALIGN_CENTER_VERTICAL); | |
23 | siz_line->Add(cob_ui_language, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 5); | |
24 | ||
25 | --- mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp.orig 2009-07-05 19:51:07.000000000 +0200 | |
26 | +++ mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp 2009-07-05 19:59:06.000000000 +0200 | |
27 | @@ -248,10 +248,12 @@ | |
28 | b_browse_output_directory->Enable(enable && odm_is_fixed); | |
29 | } | |
30 | ||
31 | +#if defined(HAVE_LIBINTL_H) | |
32 | std::string | |
33 | optdlg_mmg_tab::get_selected_ui_language() { | |
34 | return m_sorted_locales[cob_ui_language->GetSelection()]; | |
35 | } | |
36 | +#endif // HAVE_LIBINTL_H | |
37 | ||
38 | void | |
39 | optdlg_mmg_tab::save_options() { |