aboutsummaryrefslogtreecommitdiff
path: root/chinese/pine4/files/patch-bd
diff options
context:
space:
mode:
Diffstat (limited to 'chinese/pine4/files/patch-bd')
-rw-r--r--chinese/pine4/files/patch-bd220
1 files changed, 120 insertions, 100 deletions
diff --git a/chinese/pine4/files/patch-bd b/chinese/pine4/files/patch-bd
index 08e112efd180..4a01615b4505 100644
--- a/chinese/pine4/files/patch-bd
+++ b/chinese/pine4/files/patch-bd
@@ -1,6 +1,6 @@
---- pine/mailview.c.orig Thu Sep 17 05:56:10 1998
-+++ pine/mailview.c Tue Sep 22 19:30:34 1998
-@@ -145,8 +145,8 @@
+--- pine/mailview.c.orig Tue Feb 2 01:26:04 1999
++++ pine/mailview.c Tue Feb 23 15:45:46 1999
+@@ -157,8 +157,8 @@
static struct key view_keys[] =
{HELP_MENU,
OTHER_MENU,
@@ -11,7 +11,7 @@
PREVMSG_MENU,
NEXTMSG_MENU,
PREVPAGE_MENU,
-@@ -171,11 +171,11 @@
+@@ -183,11 +183,11 @@
HELP_MENU,
OTHER_MENU,
@@ -27,7 +27,7 @@
JUMP_MENU,
TAB_MENU,
HDRMODE_MENU,
-@@ -192,7 +192,7 @@
+@@ -204,7 +204,7 @@
#define FLAG_KEY 34
#define VIEW_PIPE_KEY 35
@@ -36,7 +36,7 @@
{HELP_MENU,
WHEREIS_MENU,
QUIT_MENU,
-@@ -216,7 +216,7 @@
+@@ -228,7 +228,7 @@
NEXTMSG_MENU,
PREVPAGE_MENU,
NEXTPAGE_MENU,
@@ -45,7 +45,7 @@
JUMP_MENU,
PRYNTTXT_MENU,
SAVE_MENU,
-@@ -238,7 +238,7 @@
+@@ -250,7 +250,7 @@
static struct key simple_text_keys[] =
{HELP_MENU,
NULL_MENU,
@@ -54,7 +54,7 @@
NULL_MENU,
NULL_MENU,
NULL_MENU,
-@@ -247,7 +247,7 @@
+@@ -259,7 +259,7 @@
PRYNTTXT_MENU,
WHEREIS_MENU,
FWDEMAIL_MENU,
@@ -63,7 +63,7 @@
INST_KEY_MENU(simple_text_keymenu, simple_text_keys);
-@@ -388,7 +388,7 @@
+@@ -403,7 +403,7 @@
* we were viewing. If so, make sure we don't just come back.
*/
if(mn_get_total(ps->msgmap) <= 0L || !ps->mail_stream){
@@ -72,7 +72,7 @@
ps->next_screen = mail_index_screen;
break;
}
-@@ -402,7 +402,7 @@
+@@ -417,7 +417,7 @@
body = NULL;
if(!(env = mail_fetchstructure(ps->mail_stream, raw_msgno, &body))
|| !(mc = mail_elt(ps->mail_stream, raw_msgno))){
@@ -81,7 +81,7 @@
comatose(mn_get_cur(ps->msgmap)));
dprint(1, (debugfile, "!!!! ERROR fetching %s of msg %ld\n",
env ? "elt" : "env", mn_get_cur(ps->msgmap)));
-@@ -457,7 +457,7 @@
+@@ -472,7 +472,7 @@
memset(&scrollargs, 0, sizeof(SCROLL_S));
scrollargs.text.text = so_text(store);
scrollargs.text.src = src;
@@ -90,7 +90,7 @@
/*
* make first selectable handle the default
-@@ -477,11 +477,11 @@
+@@ -492,11 +492,11 @@
else
scrollargs.body_valid = 1;
@@ -104,7 +104,7 @@
scrollargs.keys.menu = &view_keymenu;
scrollargs.keys.what = save_what;
setbitmap(scrollargs.keys.bitmap);
-@@ -1214,7 +1214,7 @@
+@@ -1237,7 +1237,7 @@
/*---- format and copy envelope ----*/
if(ps_global->full_header)
q_status_message(SM_INFO, 0, 3,
@@ -113,7 +113,7 @@
HD_INIT(&h, ps_global->VAR_VIEW_HEADERS, ps_global->view_all_except,
FE_DEFAULT);
-@@ -1253,7 +1253,7 @@
+@@ -1276,7 +1276,7 @@
if(append_file_name)
fs_give((void **)&append_file_name);
@@ -122,7 +122,7 @@
error_description(errno));
return(0);
}
-@@ -1547,7 +1547,7 @@
+@@ -1570,7 +1570,7 @@
write_error:
if(!(flgs & FM_DISPLAY))
@@ -131,7 +131,7 @@
decode_err ? decode_err : error_description(errno));
return(0);
-@@ -1885,12 +1885,12 @@
+@@ -1908,12 +1908,12 @@
char prompt[256], tmp[MAILTMPLEN];
int rc, flags, local_h;
static ESCKEY_S launch_opts[] = {
@@ -148,16 +148,21 @@
{-1, 0, NULL, NULL}};
if(handle->type == URL){
-@@ -1920,7 +1920,7 @@
+@@ -1939,11 +1939,11 @@
+ if(!local_h){
+ if(ps_global->vars[V_BROWSER].is_fixed){
+ q_status_message(SM_ORDER, 3, 4,
+- "URL-Viewer is disabled by sys-admin");
++ "URL 檢視程式已被系統管理員關閉");
return(0);
}
else{
-- if(want_to("No URL-Viewer application defined! Define now",
+- if(want_to("No URL-Viewer application defined. Define now",
+ if(want_to("尚未定義 URL 檢視程式!現在定義",
'y', 0, NO_HELP, WT_SEQ_SENSITIVE) == 'y'){
/* Prompt for the displayer? */
tmp[0] = '\0';
-@@ -1964,7 +1964,7 @@
+@@ -1987,7 +1987,7 @@
}
else{
q_status_message1(SM_ORDER | SM_DING, 2, 2,
@@ -166,7 +171,7 @@
error_description(errno));
continue;
}
-@@ -1994,8 +1994,8 @@
+@@ -2017,8 +2017,8 @@
return(1);
while(1){
@@ -177,9 +182,9 @@
(handle->type == URL) ? "\"" : "",
(handle->type == URL) ? handle->h.url.path : "",
(handle->type == URL)
-@@ -2606,11 +2606,11 @@
+@@ -2723,11 +2723,11 @@
mode = PIPE_RESET | PIPE_USER ;
- if(syspipe = open_system_pipe(cmd, NULL, NULL, mode)){
+ if(syspipe = open_system_pipe(cmd, NULL, NULL, mode, 0)){
close_system_pipe(&syspipe);
- q_status_message(SM_ORDER, 0, 4, "VIEWER command completed");
+ q_status_message(SM_ORDER, 0, 4, "檢視器命令完成");
@@ -191,7 +196,7 @@
}
else if(f = url_local_handler(handle->h.url.path)){
if((*f)(handle->h.url.path) > 1)
-@@ -2618,7 +2618,7 @@
+@@ -2735,7 +2735,7 @@
}
else
q_status_message1(SM_ORDER, 2, 2,
@@ -200,7 +205,7 @@
handle->h.url.path);
return(rv);
-@@ -2630,7 +2630,7 @@
+@@ -2747,7 +2747,7 @@
int return_value;
{
q_status_message(SM_ORDER | SM_DING, 3, 3,
@@ -209,7 +214,7 @@
return(return_value);
}
-@@ -2920,7 +2920,7 @@
+@@ -3046,7 +3046,7 @@
}
else
q_status_message(SM_ORDER | SM_DING, 3, 4,
@@ -218,7 +223,7 @@
if(outgoing)
mail_free_envelope(&outgoing);
-@@ -2984,7 +2984,7 @@
+@@ -3113,7 +3113,7 @@
else if(errstr)
q_status_message(SM_ORDER|SM_DING, 3, 3, errstr);
else
@@ -227,7 +232,7 @@
break;
-@@ -3007,7 +3007,7 @@
+@@ -3136,7 +3136,7 @@
if(uid_val != ps_global->mail_stream->uid_validity){
/* Complain! */
q_status_message(SM_ORDER|SM_DING, 3, 3,
@@ -236,7 +241,7 @@
}
if(uid){
-@@ -3023,7 +3023,7 @@
+@@ -3152,7 +3152,7 @@
if(i > mn_get_total(ps_global->msgmap))
q_status_message(SM_ORDER, 2, 3,
@@ -245,7 +250,7 @@
}
else if(search){
/*
-@@ -3044,9 +3044,9 @@
+@@ -3173,9 +3173,9 @@
if(i = any_lflagged(ps_global->msgmap, MN_SLCT)){
extern long zoom_index();
@@ -258,7 +263,7 @@
/* Zoom the index! */
zoom_index(ps_global, ps_global->msgmap);
}
-@@ -3185,9 +3185,9 @@
+@@ -3314,9 +3314,9 @@
if(auth && *auth != '*')
q_status_message1(SM_ORDER, 3, 3,
@@ -271,7 +276,7 @@
/*
* At this point our structure should contain the
-@@ -3272,7 +3272,7 @@
+@@ -3401,7 +3401,7 @@
if(i > mn_get_total(ps_global->msgmap))
q_status_message(SM_ORDER, 2, 3,
@@ -280,7 +285,7 @@
}
break;
-@@ -3386,7 +3386,7 @@
+@@ -3515,7 +3515,7 @@
}
else
q_status_message1(SM_ORDER | SM_DING, 0, 3,
@@ -289,7 +294,7 @@
return(1);
}
-@@ -3413,7 +3413,7 @@
+@@ -3542,7 +3542,7 @@
dprint(2, (debugfile, "-- bogus url \"%s\": %s\n",
url ? url : "<NULL URL>", reason));
if(url)
@@ -298,7 +303,7 @@
(void *) (strchr(url, ':') - url), url, reason);
return(0);
-@@ -3554,7 +3554,7 @@
+@@ -3684,7 +3684,7 @@
write_error:
if(style == QStatus)
@@ -307,7 +312,7 @@
error_description(errno));
return(1);
-@@ -3805,7 +3805,7 @@
+@@ -3935,7 +3935,7 @@
gf_set_so_readc(&tmp_gc, df_store);
if(errstr = dfilter(display_filter, tmp_store, tmp_pc, NULL)){
q_status_message1(SM_ORDER | SM_DING, 3, 3,
@@ -316,7 +321,7 @@
rv = FHT_WRTERR;
}
else
-@@ -3815,7 +3815,7 @@
+@@ -3945,7 +3945,7 @@
}
else{
q_status_message1(SM_ORDER | SM_DING, 3, 3,
@@ -325,7 +330,7 @@
rv = FHT_WRTERR;
}
}
-@@ -3841,7 +3841,7 @@
+@@ -3971,7 +3971,7 @@
if(errstr = gf_pipe(tmp_gc, final_pc)){
rv = FHT_WRTERR;
q_status_message1(SM_ORDER | SM_DING, 3, 3,
@@ -334,7 +339,7 @@
}
}
-@@ -3984,7 +3984,7 @@
+@@ -4115,7 +4115,7 @@
format_newsgroup_string("Newsgroups: ", e->newsgroups, prefix, pc);
if(e->ngbogus)
q_status_message(SM_ORDER, 0, 3,
@@ -343,7 +348,7 @@
}
if((which & FE_FOLLOWUPTO) && e->followup_to)
-@@ -4624,7 +4624,7 @@
+@@ -4756,7 +4756,7 @@
}
if(!sparms->bar.title)
@@ -352,16 +357,16 @@
if(sparms->bar.style == TitleBarNone)
sparms->bar.style = MsgTextPercent;
-@@ -4773,7 +4773,7 @@
+@@ -4914,7 +4914,7 @@
}
- if(first_view && num_display_lines >= get_scroll_text_lines())
+ if(first_view && num_display_lines >= scroll_text_lines())
- q_status_message1(SM_INFO, 0, 1, "ALL of %s", STYLE_NAME(sparms));
-+ q_status_message1(SM_INFO, 0, 1, "%s 全部", STYLE_NAME(sparms));
++ q_status_message1(SM_INFO, 0, 1, "%s全部", STYLE_NAME(sparms));
force = 0; /* may not need to next time around */
-@@ -4898,7 +4898,7 @@
+@@ -5047,7 +5047,7 @@
whereis_pos.row = 0;
if(sparms->help.text == NO_HELP || ps_global->nr_mode){
q_status_message(SM_ORDER, 0, 5,
@@ -370,7 +375,7 @@
break;
}
-@@ -4937,12 +4937,12 @@
+@@ -5086,12 +5086,12 @@
cur_top_line -= scroll_lines;
if(cur_top_line <= 0){
cur_top_line = 0;
@@ -379,31 +384,31 @@
STYLE_NAME(sparms));
}
}
- else
-- q_status_message1(SM_ORDER, 0, 1, "Already at start of %s",
-+ q_status_message1(SM_ORDER, 0, 1, "已經在%s的起始",
- STYLE_NAME(sparms));
- break;
+ else{
+- q_status_message1(SM_ORDER, 0, 1, "Already at start of %s",
++ q_status_message1(SM_ORDER, 0, 1, "已經在%s的起始",
+ STYLE_NAME(sparms));
-@@ -4956,12 +4956,12 @@
+ /* hilite last available handle */
+@@ -5117,12 +5117,12 @@
cur_top_line += scroll_lines;
- if(cur_top_line + num_display_lines >= get_scroll_text_lines())
+ if(cur_top_line + num_display_lines >= scroll_text_lines())
- q_status_message1(SM_INFO, 0, 1, "END of %s",
+ q_status_message1(SM_INFO, 0, 1, "%s結尾",
STYLE_NAME(sparms));
}
else if(!sparms->end_scroll
- || !(done = (*sparms->end_scroll)(sparms)))
-- q_status_message1(SM_ORDER, 0, 1, "Already at end of %s",
-+ q_status_message1(SM_ORDER, 0, 1, "已經在%s的結尾",
- STYLE_NAME(sparms));
-
- break;
-@@ -4978,11 +4978,11 @@
+ || !(done = (*sparms->end_scroll)(sparms))){
+- q_status_message1(SM_ORDER, 0, 1, "Already at end of %s",
++ q_status_message1(SM_ORDER, 0, 1, "已經在%s的結尾",
+ STYLE_NAME(sparms));
+ /* hilite last available handle */
+ if(sparms->text.handles){
+@@ -5184,11 +5184,11 @@
+ whereis_pos.row = 0;
cur_top_line++;
- if(cur_top_line + num_display_lines
- >= get_scroll_text_lines())
+ if(cur_top_line + num_display_lines >= scroll_text_lines())
- q_status_message1(SM_INFO, 0, 1, "END of %s",
+ q_status_message1(SM_INFO, 0, 1, "%s結尾",
STYLE_NAME(sparms));
@@ -414,7 +419,7 @@
STYLE_NAME(sparms));
}
-@@ -4999,11 +4999,11 @@
+@@ -5243,11 +5243,11 @@
if(cur_top_line){
cur_top_line--;
if(cur_top_line == 0)
@@ -428,25 +433,25 @@
STYLE_NAME(sparms));
}
-@@ -5034,7 +5034,7 @@
+@@ -5281,7 +5281,7 @@
}
- q_status_message(SM_ORDER, 0, 1,
-- "Already on last selectable item");
-+ "已經在最後一個可選擇的項目上");
+ q_status_message1(SM_ORDER, 0, 1,
+- "Already on last item in %s",
++ "已經在%s中最後一個可選擇的項目上",
+ STYLE_NAME(sparms));
}
- break;
-@@ -5064,7 +5064,7 @@
+@@ -5315,7 +5315,7 @@
}
- q_status_message(SM_ORDER, 0, 1,
-- "Already on first selectable item");
-+ "已經在第一個可選擇的項目上");
+ q_status_message1(SM_ORDER, 0, 1,
+- "Already on first item in %s",
++ "已經在%s中第一個可選擇的項目上",
+ STYLE_NAME(sparms));
}
- break;
-@@ -5083,7 +5083,7 @@
+@@ -5335,7 +5335,7 @@
break;
case -1 :
@@ -455,7 +460,7 @@
break;
default :
-@@ -5170,14 +5170,14 @@
+@@ -5434,8 +5434,8 @@
q_status_message(SM_ORDER, 0, 3, tmp_20k_buf);
else
q_status_message2(SM_ORDER, 0, 3,
@@ -464,6 +469,10 @@
+ "%s在畫面上第 %s 行找到",
+ result ? "重頭搜尋。" : "",
int2string(whereis_pos.row));
+
+ if(key){
+@@ -5452,9 +5452,9 @@
+ }
}
else if(found_on == -1)
- cmd_cancelled("Search");
@@ -471,19 +480,19 @@
else
- q_status_message(SM_ORDER | SM_DING, 0, 3, "Word not found");
+ q_status_message(SM_ORDER | SM_DING, 0, 3, "找不到該字");
+ }
break;
+@@ -5548,7 +5548,7 @@
+ break;
-@@ -5257,7 +5257,7 @@
- break;
-
- case -1 :
-- cmd_cancelled("View");
-+ cmd_cancelled("檢視");
- break;
+ case -1 :
+- cmd_cancelled("View");
++ cmd_cancelled("檢視");
+ break;
- default :
-@@ -5522,13 +5522,13 @@
+ default :
+@@ -5836,13 +5836,13 @@
int rc, flags;
static char search_string[MAX_SEARCH+1] = { '\0' };
static ESCKEY_S word_search_key[] = { { 0, 0, "", "" },
@@ -500,7 +509,7 @@
help = NO_HELP;
nsearch_string[0] = '\0';
-@@ -5543,13 +5543,13 @@
+@@ -5857,13 +5857,13 @@
continue;
}
else if(rc == 10){
@@ -513,28 +522,39 @@
else if(rc == 11){
- strcpy(report, "Searched to Last Line.");
+ strcpy(report, "搜尋至最後一行。");
- cursor_pos->row = max(get_scroll_text_lines() - 1, 0);
+ cursor_pos->row = max(scroll_text_lines() - 1, 0);
cursor_pos->col = 0;
return(cursor_pos->row);
-@@ -6411,10 +6411,10 @@
- if(*msg_p[0])
- for(i = 0; i < msg_q; i++)
- q_status_message2(SM_ORDER, 3, 4,
-- "%s Result: %s", title, msg_p[i]);
-+ "%s 結果:%s", title, msg_p[i]);
- else
- q_status_message2(SM_ORDER, 0, 4, "%s%s", title,
-- alt_msg ? alt_msg : " command completed");
-+ alt_msg ? alt_msg : " 命令完成");
- }
- else{
- SCROLL_S sargs;
-@@ -6425,7 +6425,7 @@
+@@ -6808,12 +6808,12 @@
+ if(*msg_p[0])
+ for(i = 0; i < msg_q; i++)
+ q_status_message2(SM_ORDER, 3, 4,
+- "%s Result: %s", title, msg_p[i]);
++ "%s 結果:%s", title, msg_p[i]);
+ else
+ q_status_message2(SM_ORDER, 0, 4, "%s%s", title,
+ alt_msg
+ ? alt_msg
+- : " command completed with no output");
++ : " 命令已完成(沒有輸出)");
+
+ fclose(f);
+ f = NULL;
+@@ -6826,7 +6826,7 @@
+ q_status_message2(SM_ORDER, 0, 4, "%s%s", title,
+ alt_msg
+ ? alt_msg
+- : " command completed with no output");
++ : " 命令已完成(沒有輸出)");
+ fclose(f);
+ f = NULL;
+ }
+@@ -6841,7 +6841,7 @@
memset(&sargs, 0, sizeof(SCROLL_S));
sargs.text.text = f;
sargs.text.src = FileStar;
-- sargs.text.desc = "help text";
-+ sargs.text.desc = "輔助說明文字";
+- sargs.text.desc = "output";
++ sargs.text.desc = "輸出";
sargs.bar.title = title;
sargs.bar.style = TextPercent;
sargs.help.text = h_simple_text_view;