gettextize

* Makefile.in: updated
* menu.c: gettextize
* rc.c: gettextize
* intl/.cvsignore: added
* po/.cvsignore: added
* po/Makevars: added
* po/Makevars.template: removed
* po/POTFILES.in: updated
* po/w3m.pot: created
* po/ja.po: created
From: Fumitoshi UKAI  <ukai@debian.or.jp>

1 files changed, 212 insertions, 192 deletions

diff --git a/rc.c b/rc.c
index e540885..8bb76f0 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.89 2003/09/23 18:42:25 ukai Exp $ */
+/* $Id: rc.c,v 1.90 2003/09/24 18:35:06 ukai Exp $ */
 /* 
  * Initialization file etc.
  */
@@ -52,10 +52,9 @@ static int RC_table_size;
 #define P_SCALE    10
 
 #if LANG == JA
-static wc_ces OptionCharset = WC_CES_EUC_JP;
+static wc_ces OptionCharset = WC_CES_EUC_JP; /* charset of source code */
 static int OptionEncode = FALSE;
 
-/* FIXME: gettextize here */
 #define CMT_HELPER	 "外部ビューアの編集"
 #define CMT_TABSTOP      "タブ幅"
 #define CMT_INDENT_INCR  "HTML整形時のインデント幅"
@@ -232,181 +231,185 @@ static int OptionEncode = FALSE;
 #define CMT_KEYMAP_FILE "keymapファイル"
 
 #else				/* LANG != JA */
+/* FIXME: gettextize here */
+#if ENABLE_NLS
+static wc_ces OptionCharset = WC_CES_US_ASCII;
+static int OptionEncode = FALSE;
+#endif
 
-
-#define CMT_HELPER	 "External Viewer Setup"
-#define CMT_TABSTOP      "Tab width in characters"
-#define CMT_INDENT_INCR  "Indent for HTML rendering"
-#define CMT_PIXEL_PER_CHAR      "Number of pixels per character (4.0...32.0)"
-#define CMT_PIXEL_PER_LINE      "Number of pixels per line (4.0...64.0)"
-#define CMT_PAGERLINE    "Number of remembered lines when used as a pager"
-#define CMT_HISTORY	 "Use URL history"
-#define CMT_HISTSIZE     "Number of remembered URL"
-#define CMT_SAVEHIST     "Save URL history"
-#define CMT_FRAME        "Render frames automatically"
-#define CMT_ARGV_IS_URL  "Treat argument without scheme as URL"
-#define CMT_TSELF        "Use _self as default target"
-#define CMT_OPEN_TAB_BLANK "Open link on new tab if target is _blank or _new"
-#define CMT_OPEN_TAB_DL_LIST "Open download list panel on new tab"
-#define CMT_DISPLINK     "Display link URL automatically"
-#define CMT_DECODE_URL   "Display decoded URL"
-#define CMT_DISPLINEINFO "Display current line number"
-#define CMT_DISP_IMAGE   "Display inline images"
+#define CMT_HELPER	 N_("External Viewer Setup")
+#define CMT_TABSTOP      N_("Tab width in characters")
+#define CMT_INDENT_INCR  N_("Indent for HTML rendering")
+#define CMT_PIXEL_PER_CHAR N_("Number of pixels per character (4.0...32.0)")
+#define CMT_PIXEL_PER_LINE N_("Number of pixels per line (4.0...64.0)")
+#define CMT_PAGERLINE    N_("Number of remembered lines when used as a pager")
+#define CMT_HISTORY	 N_("Use URL history")
+#define CMT_HISTSIZE     N_("Number of remembered URL")
+#define CMT_SAVEHIST     N_("Save URL history")
+#define CMT_FRAME        N_("Render frames automatically")
+#define CMT_ARGV_IS_URL  N_("Treat argument without scheme as URL")
+#define CMT_TSELF        N_("Use _self as default target")
+#define CMT_OPEN_TAB_BLANK N_("Open link on new tab if target is _blank or _new")
+#define CMT_OPEN_TAB_DL_LIST N_("Open download list panel on new tab")
+#define CMT_DISPLINK     N_("Display link URL automatically")
+#define CMT_DECODE_URL   N_("Display decoded URL")
+#define CMT_DISPLINEINFO N_("Display current line number")
+#define CMT_DISP_IMAGE   N_("Display inline images")
 #ifdef USE_IMAGE
-#define CMT_AUTO_IMAGE   "Load inline images automatically"
-#define CMT_MAX_LOAD_IMAGE "Maximum processes for parallel image loading"
-#define CMT_EXT_IMAGE_VIEWER   "Use external image viewer"
-#define CMT_IMAGE_SCALE  "Scale of image (%)"
-#define CMT_IMGDISPLAY   "External command to display image"
-#define CMT_IMAGE_MAP_LIST "Use link list of image map"
-#endif
-#define CMT_MULTICOL     "Display file names in multi-column format"
-#define CMT_ALT_ENTITY   "Use ASCII equivalents to display entities"
-#define CMT_GRAPHIC_CHAR "Use graphic char for border of table and menu"
-#define CMT_FOLD_TEXTAREA "Fold lines in TEXTAREA"
-#define CMT_DISP_INS_DEL "Display DEL, S and STRIKE element"
-#define CMT_COLOR        "Display with color"
-#define CMT_B_COLOR      "Color of normal character"
-#define CMT_A_COLOR      "Color of anchor"
-#define CMT_I_COLOR      "Color of image link"
-#define CMT_F_COLOR      "Color of form"
-#define CMT_ACTIVE_STYLE "Enable coloring of active link"
-#define CMT_C_COLOR	 "Color of currently active link"
-#define CMT_VISITED_ANCHOR "Use visited link color"
-#define CMT_V_COLOR	 "Color of visited link"
-#define CMT_BG_COLOR     "Color of background"
-#define CMT_MARK_COLOR   "Color of mark"
-#define CMT_USE_PROXY    "Use proxy"
-#define CMT_HTTP_PROXY   "URL of HTTP proxy host"
+#define CMT_AUTO_IMAGE   N_("Load inline images automatically")
+#define CMT_MAX_LOAD_IMAGE N_("Maximum processes for parallel image loading")
+#define CMT_EXT_IMAGE_VIEWER   N_("Use external image viewer")
+#define CMT_IMAGE_SCALE  N_("Scale of image (%)")
+#define CMT_IMGDISPLAY   N_("External command to display image")
+#define CMT_IMAGE_MAP_LIST N_("Use link list of image map")
+#endif
+#define CMT_MULTICOL     N_("Display file names in multi-column format")
+#define CMT_ALT_ENTITY   N_("Use ASCII equivalents to display entities")
+#define CMT_GRAPHIC_CHAR N_("Use graphic char for border of table and menu")
+#define CMT_FOLD_TEXTAREA N_("Fold lines in TEXTAREA")
+#define CMT_DISP_INS_DEL N_("Display DEL, S and STRIKE element")
+#define CMT_COLOR        N_("Display with color")
+#define CMT_B_COLOR      N_("Color of normal character")
+#define CMT_A_COLOR      N_("Color of anchor")
+#define CMT_I_COLOR      N_("Color of image link")
+#define CMT_F_COLOR      N_("Color of form")
+#define CMT_ACTIVE_STYLE N_("Enable coloring of active link")
+#define CMT_C_COLOR	 N_("Color of currently active link")
+#define CMT_VISITED_ANCHOR N_("Use visited link color")
+#define CMT_V_COLOR	 N_("Color of visited link")
+#define CMT_BG_COLOR     N_("Color of background")
+#define CMT_MARK_COLOR   N_("Color of mark")
+#define CMT_USE_PROXY    N_("Use proxy")
+#define CMT_HTTP_PROXY   N_("URL of HTTP proxy host")
 #ifdef USE_SSL
-#define CMT_HTTPS_PROXY  "URL of HTTPS proxy host"
+#define CMT_HTTPS_PROXY  N_("URL of HTTPS proxy host")
 #endif				/* USE_SSL */
 #ifdef USE_GOPHER
-#define CMT_GOPHER_PROXY "URL of GOPHER proxy host"
+#define CMT_GOPHER_PROXY N_("URL of GOPHER proxy host")
 #endif				/* USE_GOPHER */
-#define CMT_FTP_PROXY    "URL of FTP proxy host"
-#define CMT_NO_PROXY     "Domains to be accessed directly (no proxy)"
-#define CMT_NOPROXY_NETADDR	"Check noproxy by network address"
-#define CMT_NO_CACHE     "Disable cache"
+#define CMT_FTP_PROXY    N_("URL of FTP proxy host")
+#define CMT_NO_PROXY     N_("Domains to be accessed directly (no proxy)")
+#define CMT_NOPROXY_NETADDR	N_("Check noproxy by network address")
+#define CMT_NO_CACHE     N_("Disable cache")
 #ifdef USE_NNTP
-#define CMT_NNTP_SERVER  "News server"
-#define CMT_NNTP_MODE    "Mode of news server"
-#define CMT_MAX_NEWS     "Number of news messages"
-#endif
-#define CMT_DNS_ORDER	"Order of name resolution"
-#define CMT_DROOT        "Directory corresponding to / (document root)"
-#define CMT_PDROOT       "Directory corresponding to /~user"
-#define CMT_CGIBIN       "Directory corresponding to /cgi-bin"
-#define CMT_CONFIRM_QQ   "Confirm when quitting with q"
-#define CMT_CLOSE_TAB_BACK "Close tab if buffer is last when back"
+#define CMT_NNTP_SERVER  N_("News server")
+#define CMT_NNTP_MODE    N_("Mode of news server")
+#define CMT_MAX_NEWS     N_("Number of news messages")
+#endif
+#define CMT_DNS_ORDER	N_("Order of name resolution")
+#define CMT_DROOT       N_("Directory corresponding to / (document root)")
+#define CMT_PDROOT      N_("Directory corresponding to /~user")
+#define CMT_CGIBIN      N_("Directory corresponding to /cgi-bin")
+#define CMT_CONFIRM_QQ  N_("Confirm when quitting with q")
+#define CMT_CLOSE_TAB_BACK N_("Close tab if buffer is last when back")
 #ifdef USE_MARK
-#define CMT_USE_MARK	"Enable mark operations"
-#endif
-#define CMT_EMACS_LIKE_LINEEDIT	"Enable Emacs-style line editing"
-#define CMT_VI_PREC_NUM	 "Enable vi-like numeric prefix"
-#define CMT_LABEL_TOPLINE	"Move cursor to top line when going to label"
-#define CMT_NEXTPAGE_TOPLINE	"Move cursor to top line when moving to next page"
-#define CMT_FOLD_LINE    "Fold lines of plain text file"
-#define CMT_SHOW_NUM     "Show line numbers"
-#define CMT_SHOW_SRCH_STR "Show search string"
-#define CMT_MIMETYPES    "List of mime.types files"
-#define CMT_MAILCAP      "List of mailcap files"
-#define CMT_URIMETHODMAP "List of urimethodmap files"
-#define CMT_EDITOR       "Editor"
-#define CMT_MAILER       "Mailer"
-#define CMT_EXTBRZ       "External Browser"
-#define CMT_EXTBRZ2      "Second External Browser"
-#define CMT_EXTBRZ3      "Third External Browser"
-#define CMT_DISABLE_SECRET_SECURITY_CHECK	"Disable secret file security check"
-#define CMT_PASSWDFILE	 "Password file"
-#define CMT_PRE_FORM_FILE	"File for setting form on loading"
-#define CMT_FTPPASS      "Password for anonymous FTP (your mail address)"
-#define CMT_FTPPASS_HOSTNAMEGEN "Generate domain part of password for FTP"
-#define CMT_USERAGENT    "User-Agent identification string"
-#define CMT_ACCEPTENCODING	"Accept-Encoding header"
-#define CMT_ACCEPTMEDIA	 "Accept header"
-#define CMT_ACCEPTLANG   "Accept-Language header"
-#define CMT_MARK_ALL_PAGES "Treat URL-like strings as links in all pages"
-#define CMT_WRAP         "Wrap search"
-#define CMT_VIEW_UNSEENOBJECTS "Display unseen objects (e.g. bgimage tag)"
+#define CMT_USE_MARK	N_("Enable mark operations")
+#endif
+#define CMT_EMACS_LIKE_LINEEDIT	N_("Enable Emacs-style line editing")
+#define CMT_VI_PREC_NUM	 N_("Enable vi-like numeric prefix")
+#define CMT_LABEL_TOPLINE N_("Move cursor to top line when going to label")
+#define CMT_NEXTPAGE_TOPLINE N_("Move cursor to top line when moving to next page")
+#define CMT_FOLD_LINE    N_("Fold lines of plain text file")
+#define CMT_SHOW_NUM     N_("Show line numbers")
+#define CMT_SHOW_SRCH_STR N_("Show search string")
+#define CMT_MIMETYPES    N_("List of mime.types files")
+#define CMT_MAILCAP      N_("List of mailcap files")
+#define CMT_URIMETHODMAP N_("List of urimethodmap files")
+#define CMT_EDITOR       N_("Editor")
+#define CMT_MAILER       N_("Mailer")
+#define CMT_EXTBRZ       N_("External Browser")
+#define CMT_EXTBRZ2      N_("Second External Browser")
+#define CMT_EXTBRZ3      N_("Third External Browser")
+#define CMT_DISABLE_SECRET_SECURITY_CHECK	N_("Disable secret file security check")
+#define CMT_PASSWDFILE	 N_("Password file")
+#define CMT_PRE_FORM_FILE	N_("File for setting form on loading")
+#define CMT_FTPPASS      N_("Password for anonymous FTP (your mail address)")
+#define CMT_FTPPASS_HOSTNAMEGEN N_("Generate domain part of password for FTP")
+#define CMT_USERAGENT    N_("User-Agent identification string")
+#define CMT_ACCEPTENCODING	N_("Accept-Encoding header")
+#define CMT_ACCEPTMEDIA	 N_("Accept header")
+#define CMT_ACCEPTLANG   N_("Accept-Language header")
+#define CMT_MARK_ALL_PAGES N_("Treat URL-like strings as links in all pages")
+#define CMT_WRAP         N_("Wrap search")
+#define CMT_VIEW_UNSEENOBJECTS N_("Display unseen objects (e.g. bgimage tag)")
 #ifdef __EMX__
-#define CMT_BGEXTVIEW	 "Run external viewer in a separate session"
+#define CMT_BGEXTVIEW	 N_("Run external viewer in a separate session")
 #else
-#define CMT_BGEXTVIEW    "Run external viewer in the background"
+#define CMT_BGEXTVIEW    N_("Run external viewer in the background")
 #endif
-#define CMT_EXT_DIRLIST  "Use external program for directory listing"
-#define CMT_DIRLIST_CMD  "URL of directory listing command"
+#define CMT_EXT_DIRLIST  N_("Use external program for directory listing")
+#define CMT_DIRLIST_CMD  N_("URL of directory listing command")
 #ifdef USE_DICT
-#define CMT_USE_DICTCOMMAND  "Enable dictionary lookup through CGI"
-#define CMT_DICTCOMMAND  "URL of dictionary lookup command"
+#define CMT_USE_DICTCOMMAND  N_("Enable dictionary lookup through CGI")
+#define CMT_DICTCOMMAND  N_("URL of dictionary lookup command")
 #endif				/* USE_DICT */
-#define CMT_IGNORE_NULL_IMG_ALT	"Display link name for images lacking ALT"
-#define CMT_IFILE        "Index file for directories"
-#define CMT_RETRY_HTTP   "Prepend http:// to URL automatically"
-#define CMT_DEFAULT_URL  "Default value for open-URL command"
-#define CMT_DECODE_CTE   "Decode Content-Transfer-Encoding when saving"
-#define CMT_PRESERVE_TIMESTAMP "Preserve timestamp when saving"
+#define CMT_IGNORE_NULL_IMG_ALT	N_("Display link name for images lacking ALT")
+#define CMT_IFILE        N_("Index file for directories")
+#define CMT_RETRY_HTTP   N_("Prepend http:// to URL automatically")
+#define CMT_DEFAULT_URL  N_("Default value for open-URL command")
+#define CMT_DECODE_CTE   N_("Decode Content-Transfer-Encoding when saving")
+#define CMT_PRESERVE_TIMESTAMP N_("Preserve timestamp when saving")
 #ifdef USE_MOUSE
-#define CMT_MOUSE         "Enable mouse"
-#define CMT_REVERSE_MOUSE "Scroll in reverse direction of mouse drag"
-#define CMT_RELATIVE_WHEEL_SCROLL "Behavior of wheel scroll speed"
-#define CMT_RELATIVE_WHEEL_SCROLL_RATIO "(A only)Scroll by # % of screen"
-#define CMT_FIXED_WHEEL_SCROLL_COUNT "(B only)Scroll by # lines"
+#define CMT_MOUSE         N_("Enable mouse")
+#define CMT_REVERSE_MOUSE N_("Scroll in reverse direction of mouse drag")
+#define CMT_RELATIVE_WHEEL_SCROLL N_("Behavior of wheel scroll speed")
+#define CMT_RELATIVE_WHEEL_SCROLL_RATIO N_("(A only)Scroll by # % of screen")
+#define CMT_FIXED_WHEEL_SCROLL_COUNT N_("(B only)Scroll by # lines")
 #endif				/* USE_MOUSE */
-#define CMT_CLEAR_BUF     "Free memory of undisplayed buffers"
-#define CMT_NOSENDREFERER "Suppress `Referer:' header"
-#define CMT_IGNORE_CASE "Search case-insensitively"
-#define CMT_USE_LESSOPEN "Use LESSOPEN"
+#define CMT_CLEAR_BUF     N_("Free memory of undisplayed buffers")
+#define CMT_NOSENDREFERER N_("Suppress `Referer:' header")
+#define CMT_IGNORE_CASE N_("Search case-insensitively")
+#define CMT_USE_LESSOPEN N_("Use LESSOPEN")
 #ifdef USE_SSL
 #ifdef USE_SSL_VERIFY
-#define CMT_SSL_VERIFY_SERVER "Perform SSL server verification"
-#define CMT_SSL_CERT_FILE "PEM encoded certificate file of client"
-#define CMT_SSL_KEY_FILE "PEM encoded private key file of client"
-#define CMT_SSL_CA_PATH "Path to directory for PEM encoded certificates of CAs"
-#define CMT_SSL_CA_FILE "File consisting of PEM encoded certificates of CAs"
+#define CMT_SSL_VERIFY_SERVER N_("Perform SSL server verification")
+#define CMT_SSL_CERT_FILE N_("PEM encoded certificate file of client")
+#define CMT_SSL_KEY_FILE N_("PEM encoded private key file of client")
+#define CMT_SSL_CA_PATH N_("Path to directory for PEM encoded certificates of CAs")
+#define CMT_SSL_CA_FILE N_("File consisting of PEM encoded certificates of CAs")
 #endif				/* USE_SSL_VERIFY */
-#define CMT_SSL_FORBID_METHOD "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)"
+#define CMT_SSL_FORBID_METHOD N_("List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)")
 #endif				/* USE_SSL */
 #ifdef USE_COOKIE
-#define CMT_USECOOKIE   "Enable cookie processing"
-#define CMT_ACCEPTCOOKIE "Accept cookies"
-#define CMT_ACCEPTBADCOOKIE "Action to be taken on invalid cookie"
-#define CMT_COOKIE_REJECT_DOMAINS "Domains to reject cookies from"
-#define CMT_COOKIE_ACCEPT_DOMAINS "Domains to accept cookies from"
+#define CMT_USECOOKIE   N_("Enable cookie processing")
+#define CMT_ACCEPTCOOKIE N_("Accept cookies")
+#define CMT_ACCEPTBADCOOKIE N_("Action to be taken on invalid cookie")
+#define CMT_COOKIE_REJECT_DOMAINS N_("Domains to reject cookies from")
+#define CMT_COOKIE_ACCEPT_DOMAINS N_("Domains to accept cookies from")
 #endif
-#define CMT_FOLLOW_REDIRECTION "Number of redirections to follow"
-#define CMT_META_REFRESH "Enable processing of meta-refresh tag"
+#define CMT_FOLLOW_REDIRECTION N_("Number of redirections to follow")
+#define CMT_META_REFRESH N_("Enable processing of meta-refresh tag")
 
 #ifdef USE_MIGEMO
-#define CMT_USE_MIGEMO "Enable Migemo (Roma-ji search)"
-#define CMT_MIGEMO_COMMAND "Migemo command"
+#define CMT_USE_MIGEMO N_("Enable Migemo (Roma-ji search)")
+#define CMT_MIGEMO_COMMAND N_("Migemo command")
 #endif				/* USE_MIGEMO */
 
 #ifdef USE_M17N
-#define CMT_DISPLAY_CHARSET  "Display charset"
-#define CMT_DOCUMENT_CHARSET "Default document charset"
-#define CMT_AUTO_DETECT      "Automatic charset detect when loading"
-#define CMT_SYSTEM_CHARSET   "System charset"
-#define CMT_FOLLOW_LOCALE    "System charset follows locale(LC_CTYPE)"
-#define CMT_EXT_HALFDUMP     "Output halfdump with display charset"
-#define CMT_USE_WIDE         "Use multi column characters"
-#define CMT_USE_COMBINING    "Use combining characters"
-#define CMT_USE_LANGUAGE_TAG "Use Unicode language tags"
-#define CMT_UCS_CONV         "Charset conversion using Unicode map"
-#define CMT_PRE_CONV         "Charset conversion when loading"
-#define CMT_SEARCH_CONV      "Adjust search string for document charset"
-#define CMT_FIX_WIDTH_CONV   "Fix character width when conversion"
-#define CMT_USE_GB12345_MAP  "Use GB 12345 Unicode map instead of GB 2312's"
-#define CMT_USE_JISX0201     "Use JIS X 0201 Roman for ISO-2022-JP"
-#define CMT_USE_JISC6226     "Use JIS C 6226:1978 for ISO-2022-JP"
-#define CMT_USE_JISX0201K    "Use JIS X 0201 Katakana"
-#define CMT_USE_JISX0212     "Use JIS X 0212:1990 (Supplemental Kanji)"
-#define CMT_USE_JISX0213     "Use JIS X 0213:2000 (2000JIS)"
-#define CMT_STRICT_ISO2022   "Strict ISO-2022-JP/KR/CN"
-#define CMT_GB18030_AS_UCS   "Treat 4 bytes char. of GB18030 as Unicode"
-#endif
-
-#define CMT_KEYMAP_FILE "keymap file"
+#define CMT_DISPLAY_CHARSET  N_("Display charset")
+#define CMT_DOCUMENT_CHARSET N_("Default document charset")
+#define CMT_AUTO_DETECT      N_("Automatic charset detect when loading")
+#define CMT_SYSTEM_CHARSET   N_("System charset")
+#define CMT_FOLLOW_LOCALE    N_("System charset follows locale(LC_CTYPE)")
+#define CMT_EXT_HALFDUMP     N_("Output halfdump with display charset")
+#define CMT_USE_WIDE         N_("Use multi column characters")
+#define CMT_USE_COMBINING    N_("Use combining characters")
+#define CMT_USE_LANGUAGE_TAG N_("Use Unicode language tags")
+#define CMT_UCS_CONV         N_("Charset conversion using Unicode map")
+#define CMT_PRE_CONV         N_("Charset conversion when loading")
+#define CMT_SEARCH_CONV      N_("Adjust search string for document charset")
+#define CMT_FIX_WIDTH_CONV   N_("Fix character width when conversion")
+#define CMT_USE_GB12345_MAP  N_("Use GB 12345 Unicode map instead of GB 2312's")
+#define CMT_USE_JISX0201     N_("Use JIS X 0201 Roman for ISO-2022-JP")
+#define CMT_USE_JISC6226     N_("Use JIS C 6226:1978 for ISO-2022-JP")
+#define CMT_USE_JISX0201K    N_("Use JIS X 0201 Katakana")
+#define CMT_USE_JISX0212     N_("Use JIS X 0212:1990 (Supplemental Kanji)")
+#define CMT_USE_JISX0213     N_("Use JIS X 0213:2000 (2000JIS)")
+#define CMT_STRICT_ISO2022   N_("Strict ISO-2022-JP/KR/CN")
+#define CMT_GB18030_AS_UCS   N_("Treat 4 bytes char. of GB18030 as Unicode")
+#endif
+
+#define CMT_KEYMAP_FILE N_("keymap file")
 
 #endif				/* LANG != JA */
 
@@ -426,7 +429,6 @@ struct sel_c {
 #ifdef USE_COLOR
 static struct sel_c colorstr[] = {
 #if LANG == JA
-    /* FIXME: gettextize here */
     {0, "black", "黒"},
     {1, "red", "赤"},
     {2, "green", "緑"},
@@ -438,15 +440,16 @@ static struct sel_c colorstr[] = {
     {8, "terminal", "端末"},
     {0, NULL, NULL}
 #else				/* LANG != JA */
-    {0, "black", "black"},
-    {1, "red", "red"},
-    {2, "green", "green"},
-    {3, "yellow", "yellow"},
-    {4, "blue", "blue"},
-    {5, "magenta", "magenta"},
-    {6, "cyan", "cyan"},
-    {7, "white", "white"},
-    {8, "terminal", "terminal"},
+    /* FIXME: gettextize here */
+    {0, "black", N_("black")},
+    {1, "red", N_("red")},
+    {2, "green", N_("green")},
+    {3, "yellow", N_("yellow")},
+    {4, "blue", N_("blue")},
+    {5, "magenta", N_("magenta")},
+    {6, "cyan", N_("cyan")},
+    {7, "white", N_("white")},
+    {8, "terminal", N_("terminal")},
     {0, NULL, NULL}
 #endif				/* LANG != JA */
 };
@@ -467,14 +470,14 @@ static char n_s[][2] = {
 
 static struct sel_c defaulturls[] = {
 #if LANG == JA
-    /* FIXME: gettextize here */
     {N_S(DEFAULT_URL_EMPTY), "無し"},
     {N_S(DEFAULT_URL_CURRENT), "現在のURL"},
     {N_S(DEFAULT_URL_LINK), "リンク先のURL"},
 #else
-    {N_S(DEFAULT_URL_EMPTY), "none"},
-    {N_S(DEFAULT_URL_CURRENT), "current URL"},
-    {N_S(DEFAULT_URL_LINK), "link URL"},
+    /* FIXME: gettextize here */
+    {N_S(DEFAULT_URL_EMPTY), N_("none")},
+    {N_S(DEFAULT_URL_CURRENT), N_("current URL")},
+    {N_S(DEFAULT_URL_LINK), N_("link URL")},
 #endif
     {0, NULL, NULL}
 };
@@ -482,13 +485,13 @@ static struct sel_c defaulturls[] = {
 #ifdef USE_MOUSE
 static struct sel_c wheelmode[] = {
 #if LANG == JA
-    /* FIXME: gettextize here */
     {TRUE, "1", "A:画面サイズに比例"},
     {FALSE, "0", "B:一定の行数"},
     {0, NULL, NULL}
 #else				/* LANG != JA */
-    {TRUE, "1", "A:relative to screen height"},
-    {FALSE, "0", "B:fixed speed"},
+    /* FIXME: gettextize here */
+    {TRUE, "1", N_("A:relative to screen height")},
+    {FALSE, "0", N_("B:fixed speed")},
     {0, NULL, NULL}
 #endif				/* LANG != JA */
 };
@@ -871,7 +874,6 @@ struct param_ptr params10[] = {
 
 struct param_section sections[] = {
 #if LANG == JA
-    /* FIXME: gettextize here */
     {"表示関係", params1},
 #ifdef USE_COLOR
     {"表示色", params2},
@@ -892,23 +894,25 @@ struct param_section sections[] = {
 #endif
 
 #else				/* LANG != JA */
-    {"Display Settings", params1},
+    /* FIXME: gettextize here */
+
+    {N_("Display Settings"), params1},
 #ifdef USE_COLOR
-    {"Color Settings", params2},
+    {N_("Color Settings"), params2},
 #endif				/* USE_COLOR */
-    {"Miscellaneous Settings", params3},
-    {"Directory Settings", params5},
-    {"External Program Settings", params6},
-    {"Network Settings", params9},
-    {"Proxy Settings", params4},
+    {N_("Miscellaneous Settings"), params3},
+    {N_("Directory Settings"), params5},
+    {N_("External Program Settings"), params6},
+    {N_("Network Settings"), params9},
+    {N_("Proxy Settings"), params4},
 #ifdef USE_SSL
-    {"SSL Settings", params7},
+    {N_("SSL Settings"), params7},
 #endif
 #ifdef USE_COOKIE
-    {"Cookie Settings", params8},
+    {N_("Cookie Settings"), params8},
 #endif
 #ifdef USE_M17N
-    {"Charset Settings", params10},
+    {N_("Charset Settings"), params10},
 #endif
 #endif				/* LANG != JA */
     {NULL, NULL}
@@ -1006,6 +1010,7 @@ search_param(char *name)
     return NULL;
 }
 
+/* show parameter with bad options invokation */
 void
 show_params(FILE * fp)
 {
@@ -1013,11 +1018,15 @@ show_params(FILE * fp)
     char *t = NULL;
     char *cmt;
 
+#if ENABLE_NLS
+    OptionCharset = SystemCharset; /* FIXME */
+#endif	
+
     fputs("\nconfiguration parameters\n", fp);
     for (j = 0; sections[j].name != NULL; j++) {
-#if LANG == JA
+#if LANG == JA || ENABLE_NLS
 	if (!OptionEncode)
-	    cmt = wc_conv(sections[j].name, OptionCharset, InnerCharset)->ptr;
+	    cmt = wc_conv(gettext(sections[j].name), OptionCharset, InnerCharset)->ptr;
 	else
 #endif
 	    cmt = sections[j].name;
@@ -1060,9 +1069,9 @@ show_params(FILE * fp)
 		t = "percent";
 		break;
 	    }
-#if LANG == JA
+#if LANG == JA || ENABLE_NLS
 	    if (!OptionEncode)
-		cmt = wc_conv(sections[j].params[i].comment,
+		cmt = wc_conv(gettext(sections[j].params[i].comment),
 			      OptionCharset, InnerCharset)->ptr;
 	    else
 #endif
@@ -1366,10 +1375,15 @@ sync_with_option(void)
 
     if (AcceptLang == NULL || *AcceptLang == '\0') {
 #if LANG == JA
-	/* FIXME: gettextize here? */
+	/* FIXME: gettextize here */
 	AcceptLang = "ja;q=1.0, en;q=0.5";
 #else				/* LANG != JA (must be EN) */
-	AcceptLang = "en;q=1.0";
+	/* TRANSLATORS: 
+	   AcceptLang default: this is used in Accept-Language: HTTP request 
+	   header. For example, ja.po should translate it as
+	   "ja;q=1.0, en;q=0.5" like that.
+	 */
+	AcceptLang = _("en;q=1.0");
 #endif
     }
     if (AcceptEncoding == NULL || *AcceptEncoding == '\0')
@@ -1527,19 +1541,25 @@ load_option_panel(void)
     if (optionpanel_str == NULL)
 	optionpanel_str = Sprintf(optionpanel_src1, w3m_version,
 				  html_quote(localCookie()->ptr), CMT_HELPER);
-#if LANG == JA
+#if ENABLE_NLS
+    OptionCharset = SystemCharset; /* FIXME */
+#endif
+#if LANG == JA || ENABLE_NLS
     if (!OptionEncode) {
 	optionpanel_str =
 	    wc_Str_conv(optionpanel_str, OptionCharset, InnerCharset);
 	for (i = 0; sections[i].name != NULL; i++) {
 	    sections[i].name =
-		wc_conv(sections[i].name, OptionCharset, InnerCharset)->ptr;
+		wc_conv(gettext(sections[i].name), OptionCharset, 
+			InnerCharset)->ptr;
 	    for (p = sections[i].params; p->name; p++)
 		p->comment =
-		    wc_conv(p->comment, OptionCharset, InnerCharset)->ptr;
+		    wc_conv(gettext(p->comment), OptionCharset, 
+			    InnerCharset)->ptr;
 	}
 	for (s = colorstr; s->text; s++)
-	    s->text = wc_conv(s->text, OptionCharset, InnerCharset)->ptr;
+	    s->text = wc_conv(gettext(s->text), OptionCharset, 
+			      InnerCharset)->ptr;
 	OptionEncode = TRUE;
     }
 #endif
@@ -1612,9 +1632,9 @@ load_option_panel(void)
     buf = loadHTMLString(src);
 #ifdef USE_M17N
     if (buf)
-#if LANG == JA 	/* XXX: why? */
+#if LANG == JA
 	buf->document_charset = OptionCharset;
-#else
+#else   /* XXX: ENABLE_NLS is ok for SystemCharset */
 	buf->document_charset = SystemCharset;
 #endif
 #endif