[w3m-dev 04236] expand display_ins_del to select a type of fontify.

2 files changed, 165 insertions, 133 deletions

diff --git a/po/ja.po b/po/ja.po
index bb87cea..167f780 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: w3m 0.5.1\n"
 "Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2004-07-14 15:51+0900\n"
-"PO-Revision-Date: 2003-09-26 03:35+0900\n"
+"POT-Creation-Date: 2007-05-07 10:49+0900\n"
+"PO-Revision-Date: 2007-05-07 10:52+0900\n"
 "Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -202,8 +202,8 @@ msgid "Fold lines in TEXTAREA"
 msgstr "TEXTAREA の行を折り返して表示"
 
 #: rc.c:90
-msgid "Display DEL, S and STRIKE element"
-msgstr "DEL, S, STRIKE 要素の内容を表示する"
+msgid "Display INS, DEL, S and STRIKE element"
+msgstr "INS, DEL, S, STRIKE 要素の表示"
 
 #: rc.c:91
 msgid "Display with color"
@@ -546,262 +546,278 @@ msgid "Enable cookie processing"
 msgstr "クッキーを使用する"
 
 #: rc.c:196
+msgid "Print a message when receiving a cookie"
+msgstr "クッキーを受け付けたときにメッセージを表示する"
+
+#: rc.c:197
 msgid "Accept cookies"
 msgstr "クッキーを受け付ける"
 
-#: rc.c:197
+#: rc.c:198
 msgid "Action to be taken on invalid cookie"
 msgstr "問題のあるクッキーでも受け付ける"
 
-#: rc.c:198
+#: rc.c:199
 msgid "Domains to reject cookies from"
 msgstr "クッキーを受け付けないドメイン"
 
-#: rc.c:199
+#: rc.c:200
 msgid "Domains to accept cookies from"
 msgstr "クッキーを受け付けるドメイン"
 
-#: rc.c:201
+#: rc.c:202
 msgid "Number of redirections to follow"
 msgstr "従うリダイレクトの回数"
 
-#: rc.c:202
+#: rc.c:203
 msgid "Enable processing of meta-refresh tag"
 msgstr "meta refresh に対応する"
 
-#: rc.c:205
+#: rc.c:206
 msgid "Enable Migemo (Roma-ji search)"
 msgstr "Migemo(ローマ字検索)を使用する"
 
-#: rc.c:206
+#: rc.c:207
 msgid "Migemo command"
 msgstr "Migemoコマンド"
 
-#: rc.c:210
+#: rc.c:211
 msgid "Display charset"
 msgstr "表示用文字コード"
 
-#: rc.c:211
+#: rc.c:212
 msgid "Default document charset"
 msgstr "文書の標準の文字コード"
 
-#: rc.c:212
+#: rc.c:213
 msgid "Automatic charset detect when loading"
 msgstr "文書の読み込み時に文字コードの自動判定を行う"
 
-#: rc.c:213
+#: rc.c:214
 msgid "System charset"
 msgstr "システムの文字コード"
 
-#: rc.c:214
+#: rc.c:215
 msgid "System charset follows locale(LC_CTYPE)"
 msgstr "Locale(LC_CTYPE) に従ってシステムの文字コードを設定"
 
-#: rc.c:215
+#: rc.c:216
 msgid "Output halfdump with display charset"
 msgstr "表示用文字コードで halfdump の出力を行う"
 
-#: rc.c:216
+#: rc.c:217
 msgid "Use multi column characters"
 msgstr "複数カラムの文字を使う"
 
-#: rc.c:217
+#: rc.c:218
 msgid "Use combining characters"
 msgstr "結合文字を使う"
 
-#: rc.c:218
+#: rc.c:219
 msgid "Use Unicode language tags"
 msgstr "Unicode の言語タグを使う"
 
-#: rc.c:219
+#: rc.c:220
 msgid "Charset conversion using Unicode map"
 msgstr "Unicodeを介したコード変換"
 
-#: rc.c:220
+#: rc.c:221
 msgid "Charset conversion when loading"
 msgstr "文書の読み込み時に文字コードを変換する"
 
-#: rc.c:221
+#: rc.c:222
 msgid "Adjust search string for document charset"
 msgstr "検索文字列を文書の文字コードに変換する"
 
-#: rc.c:222
+#: rc.c:223
 msgid "Fix character width when conversion"
 msgstr "文字幅の変わる変換をしない"
 
-#: rc.c:223
+#: rc.c:224
 msgid "Use GB 12345 Unicode map instead of GB 2312's"
 msgstr "GB 12345 の Unicode マップを GB 2312 用に使う"
 
-#: rc.c:224
+#: rc.c:225
 msgid "Use JIS X 0201 Roman for ISO-2022-JP"
 msgstr "ISO-2022-JP で JIS X 0201-Roman を使う"
 
-#: rc.c:225
+#: rc.c:226
 msgid "Use JIS C 6226:1978 for ISO-2022-JP"
 msgstr "ISO-2022-JP で JIS C 6226:1978(旧JIS) を使う"
 
-#: rc.c:226
+#: rc.c:227
 msgid "Use JIS X 0201 Katakana"
 msgstr "JIS X 0201-Katakana を使う"
 
-#: rc.c:227
+#: rc.c:228
 msgid "Use JIS X 0212:1990 (Supplemental Kanji)"
 msgstr "JIS X 0212:1990(補助漢字) を使う"
 
-#: rc.c:228
+#: rc.c:229
 msgid "Use JIS X 0213:2000 (2000JIS)"
 msgstr "JIS X 0213:2000(2000JIS) を使う"
 
-#: rc.c:229
+#: rc.c:230
 msgid "Strict ISO-2022-JP/KR/CN"
 msgstr "厳格な ISO-2022-JP/KR/CN を使う"
 
-#: rc.c:230
+#: rc.c:231
 msgid "Treat 4 bytes char. of GB18030 as Unicode"
 msgstr "GB18030 の 4バイト文字を Unicode として扱う"
 
-#: rc.c:233
+#: rc.c:234
 msgid "keymap file"
 msgstr "keymapファイル"
 
-#: rc.c:250
+#: rc.c:251
 msgid "black"
 msgstr "黒"
 
-#: rc.c:251
+#: rc.c:252
 msgid "red"
 msgstr "赤"
 
-#: rc.c:252
+#: rc.c:253
 msgid "green"
 msgstr "緑"
 
-#: rc.c:253
+#: rc.c:254
 msgid "yellow"
 msgstr "黄"
 
-#: rc.c:254
+#: rc.c:255
 msgid "blue"
 msgstr "青"
 
-#: rc.c:255
+#: rc.c:256
 msgid "magenta"
 msgstr "紫"
 
-#: rc.c:256
+#: rc.c:257
 msgid "cyan"
 msgstr "空色"
 
-#: rc.c:257
+#: rc.c:258
 msgid "white"
 msgstr "白"
 
-#: rc.c:258
+#: rc.c:259
 msgid "terminal"
 msgstr "端末"
 
-#: rc.c:277
+#: rc.c:278
 msgid "none"
 msgstr "無し"
 
-#: rc.c:278
+#: rc.c:279
 msgid "current URL"
 msgstr "現在のURL"
 
-#: rc.c:279
+#: rc.c:280
 msgid "link URL"
 msgstr "リンク先のURL"
 
 #: rc.c:285
+msgid "simple"
+msgstr "シンプル"
+
+#: rc.c:286
+msgid "use tag"
+msgstr "タグで表示"
+
+#: rc.c:287
+msgid "fontify"
+msgstr "文字装飾"
+
+#: rc.c:293
 msgid "A:relative to screen height"
 msgstr "A:画面サイズに比例"
 
-#: rc.c:286
+#: rc.c:294
 msgid "B:fixed speed"
 msgstr "B:一定の行数"
 
-#: rc.c:293
+#: rc.c:301
 msgid "unspecified"
 msgstr "指定しない"
 
-#: rc.c:294
+#: rc.c:302
 msgid "inet inet6"
 msgstr "IPv4優先"
 
-#: rc.c:295
+#: rc.c:303
 msgid "inet6 inet"
 msgstr "IPv6優先"
 
-#: rc.c:296
+#: rc.c:304
 msgid "inet only"
 msgstr "IPv4のみ"
 
-#: rc.c:297
+#: rc.c:305
 msgid "inet6 only"
 msgstr "IPv6のみ"
 
-#: rc.c:304
+#: rc.c:312
 msgid "discard"
 msgstr "破棄する"
 
-#: rc.c:306
+#: rc.c:314
 msgid "accept"
 msgstr "受け入れる"
 
-#: rc.c:308
+#: rc.c:316
 msgid "ask"
 msgstr "確認する"
 
-#: rc.c:318
+#: rc.c:326
 msgid "OFF"
 msgstr "無効"
 
-#: rc.c:319
+#: rc.c:327
 msgid "Only ISO 2022"
 msgstr "ISO 2022 のみ"
 
-#: rc.c:320
+#: rc.c:328
 msgid "ON"
 msgstr "有効"
 
-#: rc.c:667
+#: rc.c:679
 msgid "Display Settings"
 msgstr "表示関係"
 
-#: rc.c:669
+#: rc.c:681
 msgid "Color Settings"
 msgstr "表示色"
 
-#: rc.c:671
+#: rc.c:683
 msgid "Miscellaneous Settings"
 msgstr "雑多な設定"
 
-#: rc.c:672
+#: rc.c:684
 msgid "Directory Settings"
 msgstr "ディレクトリ設定"
 
-#: rc.c:673
+#: rc.c:685
 msgid "External Program Settings"
 msgstr "外部プログラム"
 
-#: rc.c:674
+#: rc.c:686
 msgid "Network Settings"
 msgstr "ネットワークの設定"
 
-#: rc.c:675
+#: rc.c:687
 msgid "Proxy Settings"
 msgstr "プロキシの設定"
 
-#: rc.c:677
+#: rc.c:689
 msgid "SSL Settings"
 msgstr "SSLの設定"
 
-#: rc.c:680
+#: rc.c:692
 msgid "Cookie Settings"
 msgstr "クッキーの設定"
 
-#: rc.c:683
+#: rc.c:695
 msgid "Charset Settings"
 msgstr "文字コードの設定"
 
@@ -810,6 +826,6 @@ msgstr "文字コードの設定"
 #. * header. For example, ja.po should translate it as
 #. * "ja;q=1.0, en;q=0.5" like that.
 #.
-#: rc.c:1151
+#: rc.c:1163
 msgid "en;q=1.0"
 msgstr "ja;q=1.0, en;q=0.5"
diff --git a/po/w3m.pot b/po/w3m.pot
index b222229..8a8c5b6 100644
--- a/po/w3m.pot
+++ b/po/w3m.pot
@@ -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-07-14 15:51+0900\n"
+"POT-Creation-Date: 2007-05-07 10:49+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"
@@ -545,262 +545,278 @@ msgid "Enable cookie processing"
 msgstr ""
 
 #: rc.c:196
-msgid "Accept cookies"
+msgid "Print a message when receiving a cookie"
 msgstr ""
 
 #: rc.c:197
-msgid "Action to be taken on invalid cookie"
+msgid "Accept cookies"
 msgstr ""
 
 #: rc.c:198
-msgid "Domains to reject cookies from"
+msgid "Action to be taken on invalid cookie"
 msgstr ""
 
 #: rc.c:199
+msgid "Domains to reject cookies from"
+msgstr ""
+
+#: rc.c:200
 msgid "Domains to accept cookies from"
 msgstr ""
 
-#: rc.c:201
+#: rc.c:202
 msgid "Number of redirections to follow"
 msgstr ""
 
-#: rc.c:202
+#: rc.c:203
 msgid "Enable processing of meta-refresh tag"
 msgstr ""
 
-#: rc.c:205
+#: rc.c:206
 msgid "Enable Migemo (Roma-ji search)"
 msgstr ""
 
-#: rc.c:206
+#: rc.c:207
 msgid "Migemo command"
 msgstr ""
 
-#: rc.c:210
+#: rc.c:211
 msgid "Display charset"
 msgstr ""
 
-#: rc.c:211
+#: rc.c:212
 msgid "Default document charset"
 msgstr ""
 
-#: rc.c:212
+#: rc.c:213
 msgid "Automatic charset detect when loading"
 msgstr ""
 
-#: rc.c:213
+#: rc.c:214
 msgid "System charset"
 msgstr ""
 
-#: rc.c:214
+#: rc.c:215
 msgid "System charset follows locale(LC_CTYPE)"
 msgstr ""
 
-#: rc.c:215
+#: rc.c:216
 msgid "Output halfdump with display charset"
 msgstr ""
 
-#: rc.c:216
+#: rc.c:217
 msgid "Use multi column characters"
 msgstr ""
 
-#: rc.c:217
+#: rc.c:218
 msgid "Use combining characters"
 msgstr ""
 
-#: rc.c:218
+#: rc.c:219
 msgid "Use Unicode language tags"
 msgstr ""
 
-#: rc.c:219
+#: rc.c:220
 msgid "Charset conversion using Unicode map"
 msgstr ""
 
-#: rc.c:220
+#: rc.c:221
 msgid "Charset conversion when loading"
 msgstr ""
 
-#: rc.c:221
+#: rc.c:222
 msgid "Adjust search string for document charset"
 msgstr ""
 
-#: rc.c:222
+#: rc.c:223
 msgid "Fix character width when conversion"
 msgstr ""
 
-#: rc.c:223
+#: rc.c:224
 msgid "Use GB 12345 Unicode map instead of GB 2312's"
 msgstr ""
 
-#: rc.c:224
+#: rc.c:225
 msgid "Use JIS X 0201 Roman for ISO-2022-JP"
 msgstr ""
 
-#: rc.c:225
+#: rc.c:226
 msgid "Use JIS C 6226:1978 for ISO-2022-JP"
 msgstr ""
 
-#: rc.c:226
+#: rc.c:227
 msgid "Use JIS X 0201 Katakana"
 msgstr ""
 
-#: rc.c:227
+#: rc.c:228
 msgid "Use JIS X 0212:1990 (Supplemental Kanji)"
 msgstr ""
 
-#: rc.c:228
+#: rc.c:229
 msgid "Use JIS X 0213:2000 (2000JIS)"
 msgstr ""
 
-#: rc.c:229
+#: rc.c:230
 msgid "Strict ISO-2022-JP/KR/CN"
 msgstr ""
 
-#: rc.c:230
+#: rc.c:231
 msgid "Treat 4 bytes char. of GB18030 as Unicode"
 msgstr ""
 
-#: rc.c:233
+#: rc.c:234
 msgid "keymap file"
 msgstr ""
 
-#: rc.c:250
+#: rc.c:251
 msgid "black"
 msgstr ""
 
-#: rc.c:251
+#: rc.c:252
 msgid "red"
 msgstr ""
 
-#: rc.c:252
+#: rc.c:253
 msgid "green"
 msgstr ""
 
-#: rc.c:253
+#: rc.c:254
 msgid "yellow"
 msgstr ""
 
-#: rc.c:254
+#: rc.c:255
 msgid "blue"
 msgstr ""
 
-#: rc.c:255
+#: rc.c:256
 msgid "magenta"
 msgstr ""
 
-#: rc.c:256
+#: rc.c:257
 msgid "cyan"
 msgstr ""
 
-#: rc.c:257
+#: rc.c:258
 msgid "white"
 msgstr ""
 
-#: rc.c:258
+#: rc.c:259
 msgid "terminal"
 msgstr ""
 
-#: rc.c:277
+#: rc.c:278
 msgid "none"
 msgstr ""
 
-#: rc.c:278
+#: rc.c:279
 msgid "current URL"
 msgstr ""
 
-#: rc.c:279
+#: rc.c:280
 msgid "link URL"
 msgstr ""
 
 #: rc.c:285
-msgid "A:relative to screen height"
+msgid "simple"
 msgstr ""
 
 #: rc.c:286
-msgid "B:fixed speed"
+msgid "normal"
+msgstr ""
+
+#: rc.c:287
+msgid "fontify"
 msgstr ""
 
 #: rc.c:293
-msgid "unspecified"
+msgid "A:relative to screen height"
 msgstr ""
 
 #: rc.c:294
+msgid "B:fixed speed"
+msgstr ""
+
+#: rc.c:301
+msgid "unspecified"
+msgstr ""
+
+#: rc.c:302
 msgid "inet inet6"
 msgstr ""
 
-#: rc.c:295
+#: rc.c:303
 msgid "inet6 inet"
 msgstr ""
 
-#: rc.c:296
+#: rc.c:304
 msgid "inet only"
 msgstr ""
 
-#: rc.c:297
+#: rc.c:305
 msgid "inet6 only"
 msgstr ""
 
-#: rc.c:304
+#: rc.c:312
 msgid "discard"
 msgstr ""
 
-#: rc.c:306
+#: rc.c:314
 msgid "accept"
 msgstr ""
 
-#: rc.c:308
+#: rc.c:316
 msgid "ask"
 msgstr ""
 
-#: rc.c:318
+#: rc.c:326
 msgid "OFF"
 msgstr ""
 
-#: rc.c:319
+#: rc.c:327
 msgid "Only ISO 2022"
 msgstr ""
 
-#: rc.c:320
+#: rc.c:328
 msgid "ON"
 msgstr ""
 
-#: rc.c:667
+#: rc.c:679
 msgid "Display Settings"
 msgstr ""
 
-#: rc.c:669
+#: rc.c:681
 msgid "Color Settings"
 msgstr ""
 
-#: rc.c:671
+#: rc.c:683
 msgid "Miscellaneous Settings"
 msgstr ""
 
-#: rc.c:672
+#: rc.c:684
 msgid "Directory Settings"
 msgstr ""
 
-#: rc.c:673
+#: rc.c:685
 msgid "External Program Settings"
 msgstr ""
 
-#: rc.c:674
+#: rc.c:686
 msgid "Network Settings"
 msgstr ""
 
-#: rc.c:675
+#: rc.c:687
 msgid "Proxy Settings"
 msgstr ""
 
-#: rc.c:677
+#: rc.c:689
 msgid "SSL Settings"
 msgstr ""
 
-#: rc.c:680
+#: rc.c:692
 msgid "Cookie Settings"
 msgstr ""
 
-#: rc.c:683
+#: rc.c:695
 msgid "Charset Settings"
 msgstr ""
 
@@ -809,6 +825,6 @@ msgstr ""
 #. * header. For example, ja.po should translate it as
 #. * "ja;q=1.0, en;q=0.5" like that.
 #.
-#: rc.c:1151
+#: rc.c:1163
 msgid "en;q=1.0"
 msgstr ""