Merge branch 'for_merging'

This commit is contained in:
bubnikv 2018-06-28 17:43:15 +02:00
commit c4a3e4eca7
5 changed files with 63 additions and 90 deletions

View file

@ -893,9 +893,9 @@ const wxString& ConfigWizard::name()
{
// A different naming convention is used for the Wizard on Windows vs. OSX & GTK.
#if WIN32
static const wxString config_wizard_name = _(L("Configuration Wizard"));
static const wxString config_wizard_name = L("Configuration Wizard");
#else
static const wxString config_wizard_name = _(L("Configuration Assistant"));
static const wxString config_wizard_name = L("Configuration Assistant");
#endif
return config_wizard_name;
}