diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | acinclude.m4 | 19 | ||||
| -rw-r--r-- | aclocal.m4 | 19 | ||||
| -rwxr-xr-x | configure | 38 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | menu.c | 39 | ||||
| -rw-r--r-- | rc.c | 198 |
8 files changed, 100 insertions, 242 deletions
@@ -1,5 +1,17 @@ 2003-09-26 Fumitoshi UKAI <ukai@debian.or.jp> + * add posubst, compile-time message l10n + * Makefile.in: @POSUBST@ + * acinclude.m4(AC_W3M_M17N): add POSUBST, POLANG + --enable-messagel10n + * configure.in (W3M_LANG): subst + (AM_GET_GNUTEXT): if messagel10n enabled, don't use NLS + (AC_OUTOUT): add posubst, chmod +x + * menu.c: remove if LANG == JA messages + * rc.c: ditto + +2003-09-26 Fumitoshi UKAI <ukai@debian.or.jp> + * remove ./intl * configure.in: external fo AM_GNU_GETTEXT * Makefile.in: remove intl, INTLTARGET @@ -8085,4 +8097,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.871 2003/09/25 16:39:15 ukai Exp $ +$Id: ChangeLog,v 1.872 2003/09/25 18:08:59 ukai Exp $ diff --git a/Makefile.in b/Makefile.in index 0646deb..0e369c6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,7 +59,8 @@ MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \ IMGCFLAGS = @IMGX11CFLAGS@ @IMGFBCFLAGS@ IMGLDFLAGS = @IMGX11LDFLAGS@ @IMGFBLDFLAGS@ -CC = @CC@ +CC0 = @CC@ +CC = @POSUBST@ $(CC0) RANLIB=@RANLIB@ AWK = @AWK@ PERL = @PERL@ @@ -166,7 +167,7 @@ inflate.o: inflate.c $(CC) $(CFLAGS) -o $@ -c $(srcdir)/inflate.c libwc: - (cd libwc && $(MAKE) CC='$(CC)' TOP_CFLAGS='$(CFLAGS)') + (cd libwc && $(MAKE) CC='$(CC0)' TOP_CFLAGS='$(CFLAGS)') dummy.o: entity.c $(CC) $(CFLAGS) -DDUMMY -c -o $@ $? @@ -178,7 +179,7 @@ w3mimgdisplay.o: w3mimgdisplay.c w3mimg $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c w3mimg: - (cd w3mimg && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)") + (cd w3mimg && $(MAKE) CC="$(CC0)" CFLAGS="$(CFLAGS)") po: (cd $@ && $(MAKE)) diff --git a/acinclude.m4 b/acinclude.m4 index e8ae6f3..e92d7d8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -141,6 +141,8 @@ AC_SUBST(WCCFLAGS) AC_SUBST(DISPLAY_CHARSET) AC_SUBST(SYSTEM_CHARSET) AC_SUBST(DOCUMENT_CHARSET) +AC_SUBST(POSUBST) +AC_SUBST(POLANG) WCTARGET=""; WCCFLAGS=""; wcinclude=""; wclib="" AC_MSG_CHECKING(if m17n support is enabled) AC_ARG_ENABLE(m17n, @@ -179,10 +181,23 @@ else fi AC_DEFINE(USE_UNICODE) fi + AC_MSG_CHECKING(if message l10n) + AC_ARG_ENABLE(messagel10n, + [ --enable-messagel10n=LL message l10n instead of NLS],, + [enable_messagel10n="no"]) + if test x$enable_messagel10n = xyes; then + enable_messagel10n="ja"; + fi + AC_MSG_RESULT($enable_messagel10n) + if test x$enable_messagel10n = xno; then + : + else + POSUBST="\$(top_srcdir)/posubst" + POLANG="$enable_messagel10n" + fi AC_MSG_CHECKING(if japanese support is enabled) AC_ARG_ENABLE(japanese, - [ --enable-japanese=CODE support Japanese message instead of NLS - CODE=(S|E|J|U)],, + [ --enable-japanese=CODE support Japanese CODE=(S|E|J|U)],, [enable_japanese="no"]) AC_MSG_RESULT($enable_japanese) if test x"$enable_japanese" = xno; then @@ -153,6 +153,8 @@ AC_SUBST(WCCFLAGS) AC_SUBST(DISPLAY_CHARSET) AC_SUBST(SYSTEM_CHARSET) AC_SUBST(DOCUMENT_CHARSET) +AC_SUBST(POSUBST) +AC_SUBST(POLANG) WCTARGET=""; WCCFLAGS=""; wcinclude=""; wclib="" AC_MSG_CHECKING(if m17n support is enabled) AC_ARG_ENABLE(m17n, @@ -191,10 +193,23 @@ else fi AC_DEFINE(USE_UNICODE) fi + AC_MSG_CHECKING(if message l10n) + AC_ARG_ENABLE(messagel10n, + [ --enable-messagel10n=LL message l10n instead of NLS],, + [enable_messagel10n="no"]) + if test x$enable_messagel10n = xyes; then + enable_messagel10n="ja"; + fi + AC_MSG_RESULT($enable_messagel10n) + if test x$enable_messagel10n = xno; then + : + else + POSUBST="\$(top_srcdir)/posubst" + POLANG="$enable_messagel10n" + fi AC_MSG_CHECKING(if japanese support is enabled) AC_ARG_ENABLE(japanese, - [ --enable-japanese=CODE support Japanese message instead of NLS - CODE=(S|E|J|U)],, + [ --enable-japanese=CODE support Japanese CODE=(S|E|J|U)],, [enable_japanese="no"]) AC_MSG_RESULT($enable_japanese) if test x"$enable_japanese" = xno; then @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION W3M AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL NKF MAN build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB INTLTARGET NLSTARGET USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGTARGETS IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY USE_W3M USE_SYSMOUSE AUXBIN_TARGETS EGREP USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN RC_DIR DOCDIRS CURRENT_VERSION LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION W3M W3M_LANG AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL NKF MAN build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET POSUBST POLANG MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB INTLTARGET NLSTARGET USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGTARGETS IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY USE_W3M USE_SYSMOUSE AUXBIN_TARGETS EGREP USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN RC_DIR DOCDIRS CURRENT_VERSION LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -849,8 +849,8 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-m17n support m17n --disable-unicode support unicode - --enable-japanese=CODE support Japanese message instead of NLS - CODE=(S|E|J|U) + --enable-messagel10n=LL message l10n instead of NLS + --enable-japanese=CODE support Japanese CODE=(S|E|J|U) --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --disable-color disable color for vt100 terminal @@ -1342,6 +1342,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF + W3M_LANG=${LC_ALL:-$LANG} ac_config_headers="$ac_config_headers config.h" @@ -2952,6 +2953,8 @@ _ACEOF + + WCTARGET=""; WCCFLAGS=""; wcinclude=""; wclib="" echo "$as_me:$LINENO: checking if m17n support is enabled" >&5 echo $ECHO_N "checking if m17n support is enabled... $ECHO_C" >&6 @@ -3008,6 +3011,26 @@ echo "${ECHO_T}$enable_unicode" >&6 _ACEOF fi + echo "$as_me:$LINENO: checking if message l10n" >&5 +echo $ECHO_N "checking if message l10n... $ECHO_C" >&6 + # Check whether --enable-messagel10n or --disable-messagel10n was given. +if test "${enable_messagel10n+set}" = set; then + enableval="$enable_messagel10n" + +else + enable_messagel10n="no" +fi; + if test x$enable_messagel10n = xyes; then + enable_messagel10n="ja"; + fi + echo "$as_me:$LINENO: result: $enable_messagel10n" >&5 +echo "${ECHO_T}$enable_messagel10n" >&6 + if test x$enable_messagel10n = xno; then + : + else + POSUBST="\$(top_srcdir)/posubst" + POLANG="$enable_messagel10n" + fi echo "$as_me:$LINENO: checking if japanese support is enabled" >&5 echo $ECHO_N "checking if japanese support is enabled... $ECHO_C" >&6 # Check whether --enable-japanese or --disable-japanese was given. @@ -3099,6 +3122,7 @@ cat >>confdefs.h <<_ACEOF #define DOCUMENT_CHARSET $document_charset _ACEOF +if test x$enable_messagel10n = xno; then MKINSTALLDIRS= if test -n "$ac_aux_dir"; then @@ -4774,6 +4798,7 @@ _ACEOF +fi NLSTARGET="" if test x"$USE_NLS" = xyes; then @@ -9149,7 +9174,7 @@ _ACEOF cvsver=`$AWK '\$1 ~ /Id:/ { print \$3}' $srcdir/ChangeLog` sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c` - ac_config_files="$ac_config_files Makefile po/Makefile.in scripts/Makefile scripts/dirlist.cgi scripts/w3mhelp.cgi scripts/w3mmail.cgi scripts/xface2xpm scripts/multipart/Makefile scripts/multipart/multipart.cgi scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 scripts/w3mman/w3mman2html.cgi libwc/Makefile w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html" + ac_config_files="$ac_config_files Makefile posubst po/Makefile.in scripts/Makefile scripts/dirlist.cgi scripts/w3mhelp.cgi scripts/w3mmail.cgi scripts/xface2xpm scripts/multipart/Makefile scripts/multipart/multipart.cgi scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 scripts/w3mman/w3mman2html.cgi libwc/Makefile w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -9691,6 +9716,7 @@ do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "posubst" ) CONFIG_FILES="$CONFIG_FILES posubst" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "scripts/dirlist.cgi" ) CONFIG_FILES="$CONFIG_FILES scripts/dirlist.cgi" ;; @@ -9801,6 +9827,7 @@ s,@LIBS@,$LIBS,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t s,@W3M@,$W3M,;t t +s,@W3M_LANG@,$W3M_LANG,;t t s,@AWK@,$AWK,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t @@ -9841,6 +9868,8 @@ s,@WCCFLAGS@,$WCCFLAGS,;t t s,@DISPLAY_CHARSET@,$DISPLAY_CHARSET,;t t s,@SYSTEM_CHARSET@,$SYSTEM_CHARSET,;t t s,@DOCUMENT_CHARSET@,$DOCUMENT_CHARSET,;t t +s,@POSUBST@,$POSUBST,;t t +s,@POLANG@,$POLANG,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t s,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t @@ -10529,3 +10558,4 @@ if test "$no_create" != yes; then fi +chmod +x posubst diff --git a/configure.in b/configure.in index 417f37c..b9970fd 100644 --- a/configure.in +++ b/configure.in @@ -12,6 +12,7 @@ AC_SUBST(W3M) W3M=w3m AC_DEFINE(W3M, w3m) +AC_SUBST(W3M_LANG) W3M_LANG=${LC_ALL:-$LANG} dnl AM_INIT_AUTOMAKE(w3m, 0.4) AC_CONFIG_HEADER(config.h) @@ -41,7 +42,9 @@ W3M_TARGET=$target AC_DEFINE_UNQUOTED(W3M_TARGET, $W3M_TARGET) AC_W3M_M17N -AM_GNU_GETTEXT([external]) +if test x$enable_messagel10n = xno; then + AM_GNU_GETTEXT([external]) +fi NLSTARGET="" if test x"$USE_NLS" = xyes; then @@ -154,7 +157,7 @@ DOCDIRS="doc:en_English doc-jp:ja_Japanese" AC_DEFINE_UNQUOTED(DOCDIRS, "$DOCDIRS") AC_W3M_VERSION -AC_OUTPUT([Makefile po/Makefile.in \ +AC_OUTPUT([Makefile posubst po/Makefile.in \ scripts/Makefile scripts/dirlist.cgi \ scripts/w3mhelp.cgi \ scripts/w3mmail.cgi scripts/xface2xpm \ @@ -166,3 +169,4 @@ w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile \ w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \ w3mhelp-lynx_en.html w3mhelp-lynx_ja.html]) +chmod +x posubst @@ -1,4 +1,4 @@ -/* $Id: menu.c,v 1.38 2003/09/24 18:49:00 ukai Exp $ */ +/* $Id: menu.c,v 1.39 2003/09/25 18:09:01 ukai Exp $ */ /* * w3m menu.c */ @@ -256,44 +256,12 @@ static int smDelTab(char c); /* --- MainMenu --- */ static Menu MainMenu; -#if LANG == JA -static wc_ces MainMenuCharset = WC_CES_EUC_JP; /* charset of source code */ -static int MainMenuEncode = FALSE; -static MenuItem MainMenuItem[] = { - /* type label variabel value func popup keys data */ - {MENU_FUNC, "��� (b)", NULL, 0, backBf, NULL, "b", NULL}, - {MENU_POPUP, "�Хåե����� (s)", NULL, 0, NULL, &SelectMenu, "s", NULL}, - {MENU_POPUP, "�������� (t)", NULL, 0, NULL, &SelTabMenu, "tT", NULL}, - {MENU_FUNC, "��������ɽ�� (v)", NULL, 0, vwSrc, NULL, "vV", NULL}, - {MENU_FUNC, "���������Խ� (e)", NULL, 0, editBf, NULL, "eE", NULL}, - {MENU_FUNC, "����������¸ (S)", NULL, 0, svSrc, NULL, "S", NULL}, - {MENU_FUNC, "���ɤ߹��� (r)", NULL, 0, reload, NULL, "rR", NULL}, - {MENU_NOP, "----------------", NULL, 0, nulcmd, NULL, "", NULL}, - {MENU_FUNC, "���ɽ�� (a)", NULL, 0, followA, NULL, "a", NULL}, - {MENU_FUNC, "�����֤�ɽ�� (n)", NULL, 0, tabA, NULL, "nN", NULL}, - {MENU_FUNC, "�����¸ (A)", NULL, 0, svA, NULL, "A", NULL}, - {MENU_FUNC, "������ɽ�� (i)", NULL, 0, followI, NULL, "i", NULL}, - {MENU_FUNC, "��������¸ (I)", NULL, 0, svI, NULL, "I", NULL}, - {MENU_FUNC, "�ե졼��ɽ�� (f)", NULL, 0, rFrame, NULL, "fF", NULL}, - {MENU_NOP, "----------------", NULL, 0, nulcmd, NULL, "", NULL}, - {MENU_FUNC, "�֥å��ޡ��� (B)", NULL, 0, ldBmark, NULL, "B", NULL}, - {MENU_FUNC, "�إ�� (h)", NULL, 0, ldhelp, NULL, "hH", NULL}, - {MENU_FUNC, "���ץ���� (o)", NULL, 0, ldOpt, NULL, "oO", NULL}, - {MENU_NOP, "----------------", NULL, 0, nulcmd, NULL, "", NULL}, - {MENU_FUNC, "��λ (q)", NULL, 0, qquitfm, NULL, "qQ", NULL}, - {MENU_END, "", NULL, 0, nulcmd, NULL, "", NULL}, -}; -#else /* LANG != JA */ - #ifdef USE_M17N /* FIXME: gettextize here */ -static wc_ces MainMenuCharset = WC_CES_US_ASCII; -#if ENABLE_NLS +static wc_ces MainMenuCharset = WC_CES_US_ASCII; /* FIXME: charset of source code */ static int MainMenuEncode = FALSE; -#else -static int MainMenuEncode = TRUE; -#endif #endif + static MenuItem MainMenuItem[] = { /* type label variable value func popup keys data */ {MENU_FUNC, N_(" Back (b) "), NULL, 0, backBf, NULL, "b", NULL}, @@ -320,7 +288,6 @@ static MenuItem MainMenuItem[] = { {MENU_FUNC, N_(" Quit (q) "), NULL, 0, qquitfm, NULL, "qQ", NULL}, {MENU_END, "", NULL, 0, nulcmd, NULL, "", NULL}, }; -#endif /* LANG != JA */ /* --- MainMenu (END) --- */ @@ -1,4 +1,4 @@ -/* $Id: rc.c,v 1.91 2003/09/24 18:49:00 ukai Exp $ */ +/* $Id: rc.c,v 1.92 2003/09/25 18:09:01 ukai Exp $ */ /* * Initialization file etc. */ @@ -51,189 +51,9 @@ static int RC_table_size; #define P_NZINT 9 #define P_SCALE 10 -#if LANG == JA -static wc_ces OptionCharset = WC_CES_EUC_JP; /* charset of source code */ -static int OptionEncode = FALSE; - -#define CMT_HELPER "�����ӥ塼�����Խ�" -#define CMT_TABSTOP "������" -#define CMT_INDENT_INCR "HTML�������Υ���ǥ����" -#define CMT_PIXEL_PER_CHAR "ʸ���� (4.0...32.0)" -#define CMT_PIXEL_PER_LINE "��Ԥι⤵ (4.0...64.0)" -#define CMT_PAGERLINE "�ڡ�����Ȥ������Ѥ���������¸�����Կ�" -#define CMT_HISTORY "�����Ȥ�" -#define CMT_HISTSIZE "�ݻ�����URL����ο�" -#define CMT_SAVEHIST "URL�������¸" -#define CMT_FRAME "�ե졼��μ�ưɽ��" -#define CMT_ARGV_IS_URL "scheme �Τʤ������� URL �Ȥߤʤ�" -#define CMT_TSELF "target��̤����ξ���_self����Ѥ���" -#define CMT_OPEN_TAB_BLANK "target��_blank��_new�ξ��Ͽ��������֤dz���" -#define CMT_OPEN_TAB_DL_LIST "Download list panel �������֤dz���" -#define CMT_DISPLINK "�����μ�ưɽ��" -#define CMT_DECODE_URL "URL��ǥ����ɤ���ɽ��" -#define CMT_DISPLINEINFO "���ߤι��ֹ��ɽ��" -#define CMT_DISP_IMAGE "����饤�������ɽ��" -#ifdef USE_IMAGE -#define CMT_AUTO_IMAGE "����饤�������ư���ɤ߹���" -#define CMT_MAX_LOAD_IMAGE "�����ɤ߹����κ���ץ�������" -#define CMT_EXT_IMAGE_VIEWER "���������ӥ塼���ɽ��" -#define CMT_IMAGE_SCALE "�����Υ�������(%)" -#define CMT_IMGDISPLAY "������ɽ�����뤿��Υ��ޥ��" -#define CMT_IMAGE_MAP_LIST "������ޥåפΥ���������ɽ��" -#endif -#define CMT_MULTICOL "�ե�����̾�Υޥ�������ɽ��" -#define CMT_ALT_ENTITY "����ƥ��ƥ��� ASCII ������ɽ����ɽ��" -#define CMT_GRAPHIC_CHAR "�ơ��֥���˥塼���Ȥ� graphic ʸ����Ȥ�" -#define CMT_FOLD_TEXTAREA "TEXTAREA �ιԤ��ޤ��֤���ɽ��" -#define CMT_DISP_INS_DEL "DEL, S, STRIKE ���Ǥ����Ƥ�ɽ�����롣" -#define CMT_COLOR "���顼ɽ��" -#define CMT_B_COLOR "ʸ���ο�" -#define CMT_A_COLOR "�����ο�" -#define CMT_I_COLOR "������ο�" -#define CMT_F_COLOR "�ե�����ο�" -#define CMT_BG_COLOR "�طʤο�" -#define CMT_MARK_COLOR "�ޡ����ο�" -#define CMT_ACTIVE_STYLE "��������Ƥ����ο�����ꤹ��" -#define CMT_C_COLOR "��������Ƥ����ο�" -#define CMT_VISITED_ANCHOR "ˬ�줿���Ȥ������Ͽ����Ѥ���" -#define CMT_V_COLOR "ˬ�줿���Ȥ������ο�" -#define CMT_USE_PROXY "�ץ���������Ѥ���" -#define CMT_HTTP_PROXY "HTTP�ץ�����(URL������)" -#ifdef USE_SSL -#define CMT_HTTPS_PROXY "HTTPS�ץ�����(URL������)" -#endif /* USE_SSL */ -#ifdef USE_GOPHER -#define CMT_GOPHER_PROXY "GOPHER�ץ�����(URL������)" -#endif /* USE_GOPHER */ -#define CMT_FTP_PROXY "FTP�ץ�����(URL������)" -#define CMT_NO_PROXY "�ץ����������������ɥᥤ��" -#define CMT_NOPROXY_NETADDR "�ͥåȥ�����ɥ쥹�ǥץ����������Υ����å�" -#define CMT_NO_CACHE "Cache ��Ȥ�ʤ�" -#ifdef USE_NNTP -#define CMT_NNTP_SERVER "News ������" -#define CMT_NNTP_MODE "News �����ФΥ⡼��" -#define CMT_MAX_NEWS "News �����ɽ��������ο�" -#endif -#define CMT_DNS_ORDER "̾�����ν��" -#define CMT_DROOT "/ ��ɽ�����ǥ��쥯�ȥ�(document root)" -#define CMT_PDROOT "/~user ��ɽ�����ǥ��쥯�ȥ�" -#define CMT_CGIBIN "/cgi-bin ��ɽ�����ǥ��쥯�ȥ�" -#define CMT_CONFIRM_QQ "q �Ǥν�λ���˳�ǧ����" -#define CMT_CLOSE_TAB_BACK "�����˥Хåե����Ǹ�ʤ饿�֤��Ĥ���" -#ifdef USE_MARK -#define CMT_USE_MARK "�ޡ�����ǽ��ͭ���ˤ���" -#endif -#define CMT_EMACS_LIKE_LINEEDIT "Emacs���ι��Խ��ˤ���" -#define CMT_VI_PREC_NUM "vi���ο��ͥץ�ե�����" -#define CMT_LABEL_TOPLINE "��٥�˰�ư������˥������뤬�ȥåפˤʤ�褦�ˤ���" -#define CMT_NEXTPAGE_TOPLINE "���Υڡ����˰�ư������˥������뤬�ȥåפˤʤ�褦�ˤ���" -#define CMT_FOLD_LINE "plain text �ե�����ιԤ��ޤ��֤�" -#define CMT_SHOW_NUM "���ֹ��ɽ������" -#define CMT_SHOW_SRCH_STR "����ʸ�����ɽ������" -#define CMT_MIMETYPES "���Ѥ���mime.types" -#define CMT_MAILCAP "���Ѥ���mailcap" -#define CMT_URIMETHODMAP "���Ѥ���urimethodmap" -#define CMT_EDITOR "���Ѥ��륨�ǥ���" -#define CMT_MAILER "���Ѥ�����" -#define CMT_EXTBRZ "�����֥饦��" -#define CMT_EXTBRZ2 "�����֥饦������2" -#define CMT_EXTBRZ3 "�����֥饦������3" -#define CMT_DISABLE_SECRET_SECURITY_CHECK "�ѥ���ɥե�����Υѡ��ߥå���������å����ʤ�" -#define CMT_PASSWDFILE "�ѥ���ɥե�����" -#define CMT_PRE_FORM_FILE "ʸ���ɹ����Υե����������ѥե�����" -#define CMT_FTPPASS "FTP�Υѥ����(���̤ϼ�ʬ��mail address��Ȥ�)" -#define CMT_FTPPASS_HOSTNAMEGEN "FTP�Υѥ���ɤΥɥᥤ��̾��ư��������" -#define CMT_USERAGENT "User-Agent" -#define CMT_ACCEPTENCODING "������ˡ(Accept-Encoding:)" -#define CMT_ACCEPTMEDIA "�����Ĥ����ǥ���������(Accept:)" -#define CMT_ACCEPTLANG "�����Ĥ������(Accept-Language:)" -#define CMT_MARK_ALL_PAGES "���ƤΥڡ�����URL����ʸ������ˤ���" -#define CMT_WRAP "�ޤ��֤�����" -#define CMT_VIEW_UNSEENOBJECTS "�طʲ������ؤΥ����" -#ifdef __EMX__ -#define CMT_BGEXTVIEW "�����ӥ塼�����̥��å�����ư����" -#else -#define CMT_BGEXTVIEW "�����ӥ塼����Хå����饦��ɤ�ư����" -#endif -#define CMT_EXT_DIRLIST "�ǥ��쥯�ȥ�ꥹ�Ȥ˳������ޥ�ɤ�Ȥ�" -#define CMT_DIRLIST_CMD "�ǥ��쥯�ȥ�ꥹ���ѥ��ޥ��" -#ifdef USE_DICT -#define CMT_USE_DICTCOMMAND "���������CGI��ͳ�Ǥ����ʤ�" -#define CMT_DICTCOMMAND "����������ޥ�ɤ�URL" -#endif /* USE_DICT */ -#define CMT_IGNORE_NULL_IMG_ALT "����IMG ALT°���λ��˥��̾��ɽ������" -#define CMT_IFILE "�ƥǥ��쥯�ȥ�Υ���ǥå����ե�����" -#define CMT_RETRY_HTTP "URL�˼�ưŪ�� http:// ���䤦" -#define CMT_DEFAULT_URL "URL�����Υǥե����ʸ����" -#define CMT_DECODE_CTE "��¸���� Content-Transfer-Encoding ��ǥ����ɤ���" -#define CMT_PRESERVE_TIMESTAMP "��¸���˥����ॹ����פ��ݻ�����" -#ifdef USE_MOUSE -#define CMT_MOUSE "�ޥ�����Ȥ�" -#define CMT_REVERSE_MOUSE "�ޥ����Υɥ�å�ư���դˤ���" -#define CMT_RELATIVE_WHEEL_SCROLL "�ۥ�����ǤΥ���������®�٤ΰ���" -#define CMT_RELATIVE_WHEEL_SCROLL_RATIO "(A�Τ�)���̤β�%���������뤹�뤫" -#define CMT_FIXED_WHEEL_SCROLL_COUNT "(B�Τ�)���������뤹��Կ�" -#endif /* USE_MOUSE */ -#define CMT_CLEAR_BUF "ɽ������Ƥ��ʤ��Хåե��Υ�����������" -#define CMT_NOSENDREFERER "Referer: ������ʤ��褦�ˤ���" -#define CMT_IGNORE_CASE "������������ʸ����ʸ���ζ��̤ʤ�" -#define CMT_USE_LESSOPEN "LESSOPEN�����" -#ifdef USE_SSL -#ifdef USE_SSL_VERIFY -#define CMT_SSL_VERIFY_SERVER "SSL�Υ�����ǧ�ڤ�Ԥ�" -#define CMT_SSL_CERT_FILE "SSL�Υ��饤�������PEM����������ե�����" -#define CMT_SSL_KEY_FILE "SSL�Υ��饤�������PEM������̩���ե�����" -#define CMT_SSL_CA_PATH "SSL��ǧ�ڶɤ�PEM���������Τ���ǥ��쥯�ȥ�ؤΥѥ�" -#define CMT_SSL_CA_FILE "SSL��ǧ�ڶɤ�PEM���������Υե�����" -#endif /* USE_SSL_VERIFY */ -#define CMT_SSL_FORBID_METHOD "�Ȥ�ʤ�SSL��åɤΥꥹ��(2: SSLv2, 3: SSLv3, t:TLSv1)" -#endif /* USE_SSL */ -#ifdef USE_COOKIE -#define CMT_USECOOKIE "���å�������Ѥ���" -#define CMT_ACCEPTCOOKIE "���å���������դ���" -#define CMT_ACCEPTBADCOOKIE "����Τ��륯�å����Ǥ�����դ���" -#define CMT_COOKIE_REJECT_DOMAINS "���å���������դ��ʤ��ɥᥤ��" -#define CMT_COOKIE_ACCEPT_DOMAINS "���å���������դ���ɥᥤ��" -#endif - -#define CMT_FOLLOW_REDIRECTION "����������쥯�Ȥβ��" -#define CMT_META_REFRESH "meta refresh ���б�����" - -#ifdef USE_MIGEMO -#define CMT_USE_MIGEMO "Migemo(����������)����Ѥ���" -#define CMT_MIGEMO_COMMAND "Migemo���ޥ��" -#endif /* USE_MIGEMO */ - -#ifdef USE_M17N -#define CMT_DISPLAY_CHARSET "ɽ����ʸ��������" -#define CMT_DOCUMENT_CHARSET "ʸ���ɸ���ʸ��������" -#define CMT_AUTO_DETECT "ʸ����ɤ߹�����ʸ�������ɤμ�ưȽ���Ԥ�" -#define CMT_SYSTEM_CHARSET "�����ƥ��ʸ��������" -#define CMT_FOLLOW_LOCALE "Locale(LC_CTYPE) �˽��äƥ����ƥ��ʸ�������ɤ�����" -#define CMT_EXT_HALFDUMP "ɽ����ʸ�������ɤ� halfdump �ν��Ϥ�Ԥ�" -#define CMT_USE_WIDE "ʣ��������ʸ����Ȥ�" -#define CMT_USE_COMBINING "���ʸ����Ȥ�" -#define CMT_USE_LANGUAGE_TAG "Unicode �θ��쥿����Ȥ�" -#define CMT_UCS_CONV "Unicode��𤷤��������Ѵ�" -#define CMT_PRE_CONV "ʸ����ɤ߹�����ʸ�������ɤ��Ѵ�����" -#define CMT_SEARCH_CONV "����ʸ�����ʸ���ʸ�������ɤ��Ѵ�����" -#define CMT_FIX_WIDTH_CONV "ʸ�������Ѥ���Ѵ��ʤ�" -#define CMT_USE_GB12345_MAP "GB 12345 �� Unicode �ޥåפ� GB 2312 �Ѥ˻Ȥ�" -#define CMT_USE_JISX0201 "ISO-2022-JP �� JIS X 0201-Roman ��Ȥ�" -#define CMT_USE_JISC6226 "ISO-2022-JP �� JIS C 6226:1978(��JIS) ��Ȥ�" -#define CMT_USE_JISX0201K "JIS X 0201-Katakana ��Ȥ�" -#define CMT_USE_JISX0212 "JIS X 0212:1990(�������) ��Ȥ�" -#define CMT_USE_JISX0213 "JIS X 0213:2000(2000JIS) ��Ȥ�" -#define CMT_STRICT_ISO2022 "���ʤ� ISO-2022-JP/KR/CN ��Ȥ�" -#define CMT_GB18030_AS_UCS "GB18030 �� 4�Х���ʸ���� Unicode �Ȥ��ư���" -#endif - -#define CMT_KEYMAP_FILE "keymap�ե�����" - -#else /* LANG != JA */ /* FIXME: gettextize here */ -#if ENABLE_NLS -static wc_ces OptionCharset = WC_CES_US_ASCII; +#ifdef USE_M17N +static wc_ces OptionCharset = WC_CES_US_ASCII; /* FIXME: charset of source code */ static int OptionEncode = FALSE; #endif @@ -411,8 +231,6 @@ static int OptionEncode = FALSE; #define CMT_KEYMAP_FILE N_("keymap file") -#endif /* LANG != JA */ - #define PI_TEXT 0 #define PI_ONOFF 1 #define PI_SEL_C 2 @@ -1024,7 +842,7 @@ show_params(FILE * fp) fputs("\nconfiguration parameters\n", fp); for (j = 0; sections[j].name != NULL; j++) { -#if LANG == JA || ENABLE_NLS +#ifdef USE_M17N if (!OptionEncode) cmt = wc_conv(gettext(sections[j].name), OptionCharset, @@ -1071,7 +889,7 @@ show_params(FILE * fp) t = "percent"; break; } -#if LANG == JA || ENABLE_NLS +#ifdef USE_M17N if (!OptionEncode) cmt = wc_conv(gettext(sections[j].params[i].comment), OptionCharset, InnerCharset)->ptr; @@ -1546,7 +1364,7 @@ load_option_panel(void) #if ENABLE_NLS OptionCharset = SystemCharset; /* FIXME */ #endif -#if LANG == JA || ENABLE_NLS +#ifdef USE_M17N if (!OptionEncode) { optionpanel_str = wc_Str_conv(optionpanel_str, OptionCharset, InnerCharset); @@ -1634,11 +1452,7 @@ load_option_panel(void) buf = loadHTMLString(src); #ifdef USE_M17N if (buf) -#if LANG == JA buf->document_charset = OptionCharset; -#else /* XXX: ENABLE_NLS is ok for SystemCharset */ - buf->document_charset = SystemCharset; -#endif #endif return buf; } |