diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | po/ja.po | 46 | ||||
| -rw-r--r-- | po/w3m.pot | 46 | ||||
| -rw-r--r-- | rc.c | 42 |
4 files changed, 124 insertions, 20 deletions
@@ -1,3 +1,11 @@ +2004-07-16 WATANABE Katsuyuki <knabe@sannet.ne.jp> + + * [w3m-dev 04091] option panel: gettextize select list + * rc.c: gettextize option select list. + * rc.c: add gettextize message. + * po/w3m.pot: ditto. + * po/ja.po: ditto. + 2004-07-14 Fumitoshi UKAI <ukai@debian.or.jp> * Debian Bug#259053 @@ -8504,4 +8512,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.928 2004/07/13 17:17:39 ukai Exp $ +$Id: ChangeLog,v 1.929 2004/07/15 16:26:03 ukai Exp $ @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: w3m 0.5.1\n" "Report-Msgid-Bugs-To: ukai@debian.or.jp\n" -"POT-Creation-Date: 2004-04-29 03:17+0900\n" +"POT-Creation-Date: 2004-07-14 15:51+0900\n" "PO-Revision-Date: 2003-09-26 03:35+0900\n" "Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n" "Language-Team: Japanese\n" @@ -717,6 +717,50 @@ msgstr "A:画面サイズに比例" msgid "B:fixed speed" msgstr "B:一定の行数" +#: rc.c:292 +msgid "unspecified" +msgstr "指定しない" + +#: rc.c:293 +msgid "inet inet6" +msgstr "IPv4優先" + +#: rc.c:294 +msgid "inet6 inet" +msgstr "IPv6優先" + +#: rc.c:295 +msgid "inet only" +msgstr "IPv4のみ" + +#: rc.c:296 +msgid "inet6 only" +msgstr "IPv6のみ" + +#: rc.c:303 +msgid "discard" +msgstr "破棄する" + +#: rc.c:305 +msgid "accept" +msgstr "受け入れる" + +#: rc.c:307 +msgid "ask" +msgstr "確認する" + +#: rc.c:317 +msgid "OFF" +msgstr "無効" + +#: rc.c:318 +msgid "Only ISO 2022" +msgstr "ISO 2022 のみ" + +#: rc.c:319 +msgid "ON" +msgstr "有効" + #: rc.c:666 msgid "Display Settings" msgstr "表示関係" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: ukai@debian.or.jp\n" -"POT-Creation-Date: 2004-04-29 03:17+0900\n" +"POT-Creation-Date: 2004-07-14 15:51+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -716,6 +716,50 @@ msgstr "" msgid "B:fixed speed" msgstr "" +#: rc.c:292 +msgid "unspecified" +msgstr "" + +#: rc.c:293 +msgid "inet inet6" +msgstr "" + +#: rc.c:294 +msgid "inet6 inet" +msgstr "" + +#: rc.c:295 +msgid "inet only" +msgstr "" + +#: rc.c:296 +msgid "inet6 only" +msgstr "" + +#: rc.c:303 +msgid "discard" +msgstr "" + +#: rc.c:305 +msgid "accept" +msgstr "" + +#: rc.c:307 +msgid "ask" +msgstr "" + +#: rc.c:317 +msgid "OFF" +msgstr "" + +#: rc.c:318 +msgid "Only ISO 2022" +msgstr "" + +#: rc.c:319 +msgid "ON" +msgstr "" + #: rc.c:666 msgid "Display Settings" msgstr "" @@ -1,4 +1,4 @@ -/* $Id: rc.c,v 1.96 2004/04/22 16:34:08 ukai Exp $ */ +/* $Id: rc.c,v 1.97 2004/07/15 16:26:04 ukai Exp $ */ /* * Initialization file etc. */ @@ -289,22 +289,22 @@ static struct sel_c wheelmode[] = { #ifdef INET6 static struct sel_c dnsorders[] = { - {N_S(DNS_ORDER_UNSPEC), "unspecified"}, - {N_S(DNS_ORDER_INET_INET6), "inet inet6"}, - {N_S(DNS_ORDER_INET6_INET), "inet6 inet"}, - {N_S(DNS_ORDER_INET_ONLY), "inet only"}, - {N_S(DNS_ORDER_INET6_ONLY), "inet6 only"}, + {N_S(DNS_ORDER_UNSPEC), N_("unspecified")}, + {N_S(DNS_ORDER_INET_INET6), N_("inet inet6")}, + {N_S(DNS_ORDER_INET6_INET), N_("inet6 inet")}, + {N_S(DNS_ORDER_INET_ONLY), N_("inet only")}, + {N_S(DNS_ORDER_INET6_ONLY), N_("inet6 only")}, {0, NULL, NULL} }; #endif /* INET6 */ #ifdef USE_COOKIE static struct sel_c badcookiestr[] = { - {N_S(ACCEPT_BAD_COOKIE_DISCARD), "discard"}, + {N_S(ACCEPT_BAD_COOKIE_DISCARD), N_("discard")}, #if 0 - {N_S(ACCEPT_BAD_COOKIE_ACCEPT), "accept"}, + {N_S(ACCEPT_BAD_COOKIE_ACCEPT), N_("accept")}, #endif - {N_S(ACCEPT_BAD_COOKIE_ASK), "ask"}, + {N_S(ACCEPT_BAD_COOKIE_ASK), N_("ask")}, {0, NULL, NULL} }; #endif /* USE_COOKIE */ @@ -314,9 +314,9 @@ static wc_ces_list *display_charset_str = NULL; static wc_ces_list *document_charset_str = NULL; static wc_ces_list *system_charset_str = NULL; static struct sel_c auto_detect_str[] = { - {N_S(WC_OPT_DETECT_OFF), "OFF"}, - {N_S(WC_OPT_DETECT_ISO_2022), "Only ISO 2022"}, - {N_S(WC_OPT_DETECT_ON), "ON"}, + {N_S(WC_OPT_DETECT_OFF), N_("OFF")}, + {N_S(WC_OPT_DETECT_ISO_2022), N_("Only ISO 2022")}, + {N_S(WC_OPT_DETECT_ON), N_("ON")}, {0, NULL, NULL} }; #endif @@ -1303,7 +1303,7 @@ load_option_panel(void) if (optionpanel_str == NULL) optionpanel_str = Sprintf(optionpanel_src1, w3m_version, - html_quote(localCookie()->ptr), CMT_HELPER); + html_quote(localCookie()->ptr), _(CMT_HELPER)); #if ENABLE_NLS OptionCharset = SystemCharset; /* FIXME */ #endif @@ -1313,16 +1313,24 @@ load_option_panel(void) wc_Str_conv(optionpanel_str, OptionCharset, InnerCharset); for (i = 0; sections[i].name != NULL; i++) { sections[i].name = - wc_conv(gettext(sections[i].name), OptionCharset, + wc_conv(_(sections[i].name), OptionCharset, InnerCharset)->ptr; - for (p = sections[i].params; p->name; p++) + for (p = sections[i].params; p->name; p++) { p->comment = - wc_conv(gettext(p->comment), OptionCharset, + wc_conv(_(p->comment), OptionCharset, InnerCharset)->ptr; + if (p->inputtype == PI_SEL_C) { + for (s = (struct sel_c *)p->select; s->text != NULL; s++) { + s->text = + wc_conv(_(s->text), OptionCharset, + InnerCharset)->ptr; + } + } + } } #ifdef USE_COLOR for (s = colorstr; s->text; s++) - s->text = wc_conv(gettext(s->text), OptionCharset, + s->text = wc_conv(_(s->text), OptionCharset, InnerCharset)->ptr; #endif OptionEncode = TRUE; |