--- xsane-0.999.old/src/xsane.c +++ xsane-0.999/src/xsane.c @@ -4941,39 +4941,12 @@ xsane.backend = malloc(strlen(textptr)+6); sprintf(xsane.backend, "sane-%s", textptr); /* add "sane-" */ - DBG(DBG_info, "Setting backend name \"%s\"\n", xsane.backend); - - xsane.backend_translation = xsane.backend; - bindtextdomain(xsane.backend_translation, STRINGIFY(SANELOCALEDIR)); /* set path for backend translation texts */ -#ifdef HAVE_GTK2 - bind_textdomain_codeset(xsane.backend_translation, "UTF-8"); -#endif - - if (!strlen(dgettext(xsane.backend_translation, ""))) /* translation not valid, use general translation table */ - { - xsane.backend_translation = "sane-backends"; - DBG(DBG_info, "Setting general translation table \"sane-backends\" with localedir: %s\n", STRINGIFY(LOCALEDIR)); - } - else /* we have a valid table for the backend */ - { - DBG(DBG_info, "Setting backend translation table \"%s\" with localedir: %s\n", xsane.backend_translation, STRINGIFY(LOCALEDIR)); - } } else /* use general backend name "sane-backends" for sane */ { xsane.backend = strdup("sane-backends"); - DBG(DBG_info, "Setting general backend name \"%s\"\n", xsane.backend); - - xsane.backend_translation = xsane.backend; - DBG(DBG_info, "Setting general translation table \"sane-backends\" with localedir: %s\n", STRINGIFY(LOCALEDIR)); } - bindtextdomain("sane-backends", STRINGIFY(SANELOCALEDIR)); /* set path for backend translation texts */ -#ifdef HAVE_GTK2 - bind_textdomain_codeset(xsane.backend_translation, "UTF-8"); -#endif - - /* create device-text for window titles */ snprintf(devicetext, sizeof(devicetext), "%s", xsane.devlist[xsane.selected_dev]->model); @@ -6169,21 +6142,6 @@ xsane.ipc_pipefd[1] = 0; } -#if 0 - bindtextdomain(PACKAGE, STRINGIFY(LOCALEDIR)); - textdomain(PACKAGE); -#ifdef HAVE_GTK2 - bind_textdomain_codeset(PACKAGE, "UTF-8"); -#endif -#else - DBG(DBG_info, "Setting xsane translation table with localedir: %s\n", STRINGIFY(LOCALEDIR)); - bindtextdomain(xsane.prog_name, STRINGIFY(LOCALEDIR)); - textdomain(xsane.prog_name); -#ifdef HAVE_GTK2 - bind_textdomain_codeset(xsane.prog_name, "UTF-8"); -#endif -#endif - #ifdef HAVE_ANY_GIMP { GPrintFunc old_print_func;