Merge branch 'master' into master

Listing /usr/share/locale doesn't work, and
already OpenBSD has support for locale.

src/bin/e_intl.c

@@ -865,11 +865,7 @@ _e_intl_locale_system_locales_get(void)
 
    locales = NULL;
    /* FIXME: Maybe needed for other BSD OS, or even Solaris */
-#ifdef __OpenBSD__
-   output = popen("ls /usr/share/locale", "r");
-#else
    output = popen("locale -a", "r");
-#endif
    if (output)
      {
         char line[32];

src/modules/conf_intl/e_int_config_intl.c

@@ -649,11 +649,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    e_lang_list = e_intl_language_list();
 
    /* Get list of all locales and start making map */
-#ifdef __OpenBSD__
-   output = popen("ls /usr/share/locale", "r");
-#else
    output = popen("locale -a", "r");
-#endif
    if ( output )
      {
         char line[32];

src/modules/wizard/page_010.c

@@ -91,11 +91,7 @@ wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EIN
 {
    FILE *output;
 
-#ifdef __OpenBSD__
-   output = popen("ls /usr/share/locale", "r");
-#else
    output = popen("locale -a", "r");
-#endif
    if (output)
      {
         char line[32];