kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to version 4.10.

Browse source 
PR:		10245
Submitted by:	maintainer
This commit is contained in:
Steve Price 1999-03-15 01:45:43 +00:00
parent 1bceb7791d
commit 386876662e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=17201
18 changed files with 2295 additions and 1663 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chinese/pine4/Makefile
View file

@ -1,14 +1,14 @@
# New ports collection makefile for: pine
# http://www.washington.edu/pine/
# Version required: 4.05
# Version required: 4.10
# Date created: 15 July 1998
# Whom: Liang Tai-hwa <avatar@www.mmlab.cse.yzu.edu.tw>
# Whom: Tai-hwa Liang <avatar@www.mmlab.cse.yzu.edu.tw>
#
# $Id: Makefile,v 1.7 1998/08/24 01:24:38 steve Exp $
#
DISTNAME= pine4.05
PKGNAME= zh-pine-4.05
DISTNAME= pine4.10
PKGNAME= zh-pine-4.10
CATEGORIES= chinese mail news
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/

2
chinese/pine4/distinfo
View file

@ -1 +1 @@
MD5 (pine4.05.tar.gz) = 84dc37198853959188a551eb4ee8aa00
MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd

91
chinese/pine4/files/patch-aj
View file

@ -1,6 +1,6 @@
--- pico/composer.c.orig Wed Aug 19 10:37:25 1998
+++ pico/composer.c Wed Aug 19 10:45:17 1998
@@ -136,12 +136,12 @@
--- pico/composer.c.orig Thu Dec 24 05:03:58 1998
+++ pico/composer.c Wed Feb 24 02:12:51 1999
@@ -133,12 +133,12 @@
static KEYMENU menu_header[] = {
@ -19,7 +19,7 @@
};
#define SEND_KEY 1
#define RICH_KEY 2
@@ -245,7 +245,7 @@
@@ -262,7 +262,7 @@
if(strlen(addrbuf) + strlen(buf) >= addrbuflen){
addrbuflen += NLINE * 4;
if(!(addrbuf = (char *)realloc(addrbuf, addrbuflen))){
@ -28,7 +28,7 @@
(void *) addrbuflen);
return(ABORT);
}
@@ -312,7 +312,7 @@
@@ -329,7 +329,7 @@
* get first chunk of memory, and tie it to structure...
*/
if((curline = HALLOC()) == NULL){
@ -37,7 +37,7 @@
return(FALSE);
}
longest = term.t_ncol - e->prlen - 1;
@@ -694,7 +694,7 @@
@@ -711,7 +711,7 @@
}
else{
(*term.t_beep)();
@ -46,7 +46,7 @@
}
break;
@@ -707,12 +707,12 @@
@@ -724,12 +724,12 @@
err = NULL;
if(headents[ods.cur_e].is_attach){
if(SyncAttach() < 0){
@ -58,10 +58,10 @@
headents[ods.cur_e].break_on_comma, 0) == -1)
- emlwrite("\007Format lines failed!", NULL);
+ emlwrite("\007版面整理失敗!", NULL);
UpdateHeader();
UpdateHeader(0);
PaintHeader(COMPOSER_TOP_LINE, FALSE);
PaintBody(1);
@@ -966,7 +966,7 @@
@@ -998,7 +998,7 @@
if(FormatLines(headents[ods.cur_e].hd_text, buf,
term.t_ncol - headents[ods.cur_e].prlen,
headents[ods.cur_e].break_on_comma,0)==-1){
@ -69,8 +69,8 @@
+ emlwrite("\007版面整理失敗!", NULL);
}
UpdateHeader();
@@ -1025,7 +1025,7 @@
UpdateHeader(0);
@@ -1057,7 +1057,7 @@
if(FormatLines(ods.cur_l, bufp,
(term.t_ncol-headents[ods.cur_e].prlen),
headents[ods.cur_e].break_on_comma, 0) == -1){
@ -79,7 +79,7 @@
NULL);
(*term.t_beep)();
break;
@@ -1106,10 +1106,10 @@
@@ -1193,10 +1193,10 @@
default : /* huh? */
bleep:
if(ch&CTRL)
@ -92,7 +92,7 @@
case NODATA:
break;
@@ -1149,14 +1149,14 @@
@@ -1236,14 +1236,14 @@
if(gripe){
char xx[81];
@ -111,7 +111,7 @@
strcat(xx, ".");
emlwrite(xx, NULL);
}
@@ -1191,7 +1191,7 @@
@@ -1278,7 +1278,7 @@
if(FormatLines(headents[ods.cur_e].hd_text, "",
term.t_ncol-headents[new_e].prlen,
headents[ods.cur_e].break_on_comma, 0) == -1)
@ -120,7 +120,7 @@
}
} else if(headents[ods.cur_e].builder) { /* expand addresses */
int mangled = 0;
@@ -1262,8 +1262,8 @@
@@ -1349,8 +1349,8 @@
if(!(new_l = prev_sel_hline(&new_e, ods.cur_l))){ /* all the way up! */
ods.p_line = COMPOSER_TOP_LINE;
if(gripe)
@ -131,7 +131,7 @@
return(0);
}
@@ -1292,7 +1292,7 @@
@@ -1379,7 +1379,7 @@
if(FormatLines(headents[ods.cur_e].hd_text, "",
term.t_ncol - headents[ods.cur_e].prlen,
headents[ods.cur_e].break_on_comma,0) == -1)
@ -140,7 +140,7 @@
}
}
else if(headents[ods.cur_e].builder){
@@ -1371,7 +1371,7 @@
@@ -1458,7 +1458,7 @@
lp = lp->next;
}
else{
@ -149,7 +149,7 @@
return(0);
}
}
@@ -1385,12 +1385,12 @@
@@ -1472,12 +1472,12 @@
/* validate the new attachment, and reformat if needed */
if(status = SyncAttach()){
if(status < 0)
@ -164,7 +164,7 @@
return(0);
}
}
@@ -1466,7 +1466,7 @@
@@ -1553,7 +1553,7 @@
if (term.t_nrow < 6 && ch != NODATA){
(*term.t_beep)();
@ -173,7 +173,7 @@
continue;
}
@@ -1537,13 +1537,13 @@
@@ -1624,13 +1624,13 @@
if(headents[ods.cur_e].only_file_chars
&& !fallowc((unsigned char) ch)){
/* no garbage in filenames */
@ -189,7 +189,7 @@
continue;
}
@@ -1689,7 +1689,7 @@
@@ -1779,7 +1779,7 @@
headents[ods.cur_e].dirty = 1;
}
else
@ -198,7 +198,7 @@
continue;
case (CTRL|'F') :
@@ -1740,7 +1740,7 @@
@@ -1830,7 +1830,7 @@
continue;
if(headents[ods.cur_e].is_attach && intag(strng, ods.p_off)){
@ -207,7 +207,7 @@
continue;
}
@@ -1754,7 +1754,7 @@
@@ -1844,7 +1844,7 @@
}
if(headents[ods.cur_e].is_attach && intag(strng, ods.p_off-1)){
@ -216,7 +216,7 @@
continue;
}
@@ -1965,7 +1965,7 @@
@@ -2141,7 +2141,7 @@
if(nlp == NULL){ /* no place to add below? */
if((lp = HALLOC()) == NULL){
@ -225,7 +225,7 @@
free(buf);
return(-1);
}
@@ -2000,7 +2000,7 @@
@@ -2174,7 +2174,7 @@
if(strlen(buf) && !nlp){
if((lp = HALLOC()) == NULL){
@ -234,7 +234,7 @@
free(buf);
return(-1);
}
@@ -2286,14 +2286,14 @@
@@ -2461,14 +2461,14 @@
if(level < 0 || !headents[level].name){
(*term.t_beep)();
@ -251,9 +251,9 @@
+ (Pmaster->pine_flags & MDHDRONLY) ? "地址簿"
+ : "編輯器",
headents[level].name);
saved_state = save_pico_state();
(*Pmaster->helper)(headents[level].help, buf, 1);
ttresize();
@@ -2923,7 +2923,7 @@
@@ -3110,7 +3110,7 @@
}
if((sbuf=(char *)malloc((unsigned) i)) == NULL){
@ -262,7 +262,7 @@
return(-1);
}
@@ -2980,7 +2980,7 @@
@@ -3167,7 +3167,7 @@
if(!arg){
headarg = arg = (BUILDER_ARG *)malloc(sizeof(BUILDER_ARG));
if(!arg){
@ -271,7 +271,7 @@
return(-1);
}
else{
@@ -2993,7 +2993,7 @@
@@ -3180,7 +3180,7 @@
else{
nextarg = (BUILDER_ARG *)malloc(sizeof(BUILDER_ARG));
if(!nextarg){
@ -280,7 +280,7 @@
return(-1);
}
else{
@@ -3009,7 +3009,7 @@
@@ -3196,7 +3196,7 @@
if(!e->sticky){
line = e->hd_text;
if(!(arg->tptr=(char *)malloc(strlen(line->text) + 1))){
@ -289,7 +289,7 @@
return(-1);
}
else
@@ -3026,7 +3026,7 @@
@@ -3213,7 +3213,7 @@
if(!headarg){
headarg = (BUILDER_ARG *)malloc(sizeof(BUILDER_ARG));
if(!headarg){
@ -298,7 +298,7 @@
return(-1);
}
else{
@@ -3335,7 +3335,7 @@
@@ -3522,7 +3522,7 @@
if(ksize()){
if((bp = buf = (char *)malloc(ksize()+5)) == NULL){
@ -307,7 +307,7 @@
return(FALSE);
}
}
@@ -3369,7 +3369,7 @@
@@ -3556,7 +3556,7 @@
work_buf_len = strlen(ods.cur_l->text) + buf_len;
work_buf = (char *) malloc((work_buf_len + 1) * sizeof(char));
if (work_buf == NULL) {
@ -316,7 +316,7 @@
return(FALSE);
}
@@ -3578,9 +3578,9 @@
@@ -3765,9 +3765,9 @@
if(Pmaster && Pmaster->exit_label)
menu_header[SEND_KEY].label = Pmaster->exit_label;
else if(gmode & (MDVIEW | MDHDRONLY))
@ -328,7 +328,7 @@
if(gmode & MDVIEW){
menu_header[CUT_KEY].name = NULL;
@@ -3601,7 +3601,7 @@
@@ -3788,14 +3788,14 @@
menu_header[RICH_KEY].name = NULL;
}
else{
@ -337,7 +337,24 @@
menu_header[RICH_KEY].name = "^R";
}
@@ -3680,7 +3680,7 @@
if(gmode & MDHDRONLY){
if(headents[ods.cur_e].fileedit){
menu_header[PONE_KEY].name = "^_";
- menu_header[PONE_KEY].label = "Edit File";
+ menu_header[PONE_KEY].label = "½s¿èÀÉ®×";
}
else
menu_header[PONE_KEY].name = NULL;
@@ -3804,7 +3804,7 @@
}
else{
menu_header[PONE_KEY].name = "^O";
- menu_header[PONE_KEY].label = "Postpone";
+ menu_header[PONE_KEY].label = "¼È½w";
KS_OSDATASET(&menu_header[PONE_KEY],KS_OSDATAGET(&headents[ods.cur_e]));
menu_header[ATT_KEY].name = "^J";
@@ -3876,7 +3876,7 @@
*headents[i].realaddr = bufp;
}
else{

69
chinese/pine4/files/patch-ao
View file

@ -1,5 +1,5 @@
--- pico/file.c.orig Fri Aug 28 07:02:07 1998
+++ pico/file.c Tue Sep 22 18:45:49 1998
--- pico/file.c.orig Sat Jan 30 03:59:32 1999
+++ pico/file.c Mon Feb 22 22:11:27 1999
@@ -63,17 +63,17 @@
return(s);
@ -15,7 +15,7 @@
return(0);
}
if((gmode&MDTREE) && !in_oper_tree(fname)){
if((gmode & MDTREE) && !in_oper_tree(fname)){
- emlwrite("Can't read file from outside of %s", opertree);
+ emlwrite("無法讀取 %s 以外的檔案", opertree);
return(0);
@ -37,7 +37,7 @@
KS_OSDATASET(&menu_ins[last_menu], KS_NONE);
}
@@ -159,43 +159,42 @@
@@ -159,44 +159,43 @@
if(gmode & MDCMPLT){
menu_ins[++last_menu].name = msg ? "" : "TAB";
menu_ins[last_menu].key = (CTRL|'I');
@ -51,13 +51,13 @@
- sprintf(prompt, "%s to insert from %s %s: ",
- msg ? "Number of message" : "File",
- (msg || (gmode&MDCURDIR)) ? "current"
+ sprintf(prompt, "自%s%s插入的%s：",
+ (msg || (gmode&MDCURDIR)) ? "目前的"
: (gmode&MDTREE) ? opertree
- : "home",
(msg || (gmode&MDCURDIR))
- ? "current"
- : ((gmode & MDTREE) || opertree[0]) ? opertree : "home",
- msg ? "folder" : "directory");
+ : "家",
+ ? "¥Ø«eªº"
+ : ((gmode & MDTREE) || opertree[0]) ? opertree : "®a",
+ msg ? "檔案匣" : "目錄", msg ? "信件編號" : "檔案");
s = mlreplyd(prompt, fname, NLINE, QDEFLT, msg ? NULL : menu_ins);
/* something to read and it was edited or the default accepted */
@ -75,7 +75,8 @@
+ emlwrite("在限制模式中無法插入檔案",NULL);
}
else{
if(gmode&MDTREE && !compresspath(opertree, fname, NLINE)){
if((gmode & MDTREE)
&& !compresspath(opertree, fname, NLINE)){
emlwrite(
- "Can't insert file from outside of %s: too many ..'s",
+ "無法在 %s 以外的地方插入檔案：太多 .. 了",
@ -84,13 +85,13 @@
else{
fixpath(fname, NLINE);
if((gmode&MDTREE) && !in_oper_tree(fname))
if((gmode & MDTREE) && !in_oper_tree(fname))
- emlwrite("Can't insert file from outside of %s",
+ emlwrite("無法在 %s 以外的地方插入檔案",
opertree);
else
retval = ifile(fname);
@@ -250,7 +249,7 @@
@@ -252,7 +251,7 @@
break;
case (CTRL|'T'):
if(msg){
@ -99,7 +100,7 @@
}
else{
if(*fname && isdir(fname, NULL, NULL))
@@ -264,7 +263,7 @@
@@ -267,7 +266,7 @@
if((s = FileBrowse(dir, NLINE, fname, NLINE,
NULL, FB_READ)) == 1){
if(gmode&MDSCUR){
@ -108,7 +109,7 @@
NULL);
sleep(2);
}
@@ -305,7 +304,7 @@
@@ -308,7 +307,7 @@
if(gmode&MDSCUR){
emlwrite(
@ -117,15 +118,9 @@
NULL);
return(0);
}
@@ -403,17 +402,17 @@
@@ -408,20 +407,20 @@
strcpy(curbp->b_fname, fname);
if ((gmode&MDTREE) && !in_oper_tree(fname)) {
- emlwrite("Can't read file from outside of %s", opertree);
+ emlwrite("無法讀取 %s 以外的檔案", opertree);
s = FIOERR;
}
else if ((s=ffropen(fname)) != FIOSUC){ /* Hard file open. */
if ((s=ffropen(fname)) != FIOSUC){ /* Hard file open. */
if(s == FIOFNF) /* File not found. */
- emlwrite("New file", NULL);
+ emlwrite("新檔", NULL);
@ -138,6 +133,16 @@
nline = 0L;
done = newline = 0;
while(!done)
if((s = ffgetline(line, NLINE, 1)) == FIOEOF){
curbp->b_flag &= ~(BFTEMP|BFCHG);
gotobob(FALSE, 1);
- sprintf(line,"Read %d line%s",
- nline, (nline > 1) ? "s" : "");
+ sprintf(line,"Ū¨ú²Ä %d ¦æ",
+ nline);
emlwrite(line, NULL);
break;
}
@@ -479,14 +478,14 @@
fname[0] = '\0';
@ -159,7 +164,7 @@
@@ -497,7 +496,7 @@
}
case TRUE:
if(gmode&MDTREE && !compresspath(opertree, fname, NFILEN)){
if((gmode & MDTREE) && !compresspath(opertree, fname, NFILEN)){
- emlwrite("Can't write outside of %s: too many ..'s",
+ emlwrite("無法寫入 %s 以外的檔案：太多 .. 了",
opertree);
@ -168,13 +173,13 @@
@@ -505,7 +504,7 @@
else{
fixpath(fname, NFILEN); /* fixup ~ in file name */
if((gmode&MDTREE) && !in_oper_tree(fname)){
if((gmode & MDTREE) && !in_oper_tree(fname)){
- emlwrite("Can't write outside of %s", opertree);
+ emlwrite("無法寫入 %s 以外的檔案", opertree);
sleep(2);
continue;
}
@@ -586,12 +585,12 @@
@@ -589,12 +588,12 @@
strcpy(fname, shows);
}
else {
@ -189,7 +194,7 @@
sleep(3);
}
refresh(FALSE, 1);
@@ -629,7 +628,7 @@
@@ -632,7 +631,7 @@
return(ABORT);
}
}
@ -198,7 +203,7 @@
if ((s=writeout(fname, 0)) != -1) {
if(!(gmode&MDTOOL)){
@@ -646,9 +645,9 @@
@@ -649,9 +648,9 @@
}
if(s > 1)
@ -210,7 +215,7 @@
}
return ((s == -1) ? FALSE : TRUE);
}
@@ -674,12 +673,12 @@
@@ -677,12 +676,12 @@
if ((curbp->b_flag&BFCHG) == 0) /* Return, no changes. */
return (TRUE);
if (curbp->b_fname[0] == 0) { /* Must have a name. */
@ -225,7 +230,7 @@
if ((s=writeout(curbp->b_fname, 0)) != -1) {
curbp->b_flag &= ~BFCHG;
wp = wheadp; /* Update mode lines. */
@@ -690,10 +689,10 @@
@@ -693,10 +692,10 @@
wp = wp->w_wndp;
}
if(s > 1){
@ -238,7 +243,7 @@
}
return (s);
}
@@ -812,7 +811,7 @@
@@ -815,7 +814,7 @@
curbp->b_flag &= ~BFTEMP; /* and are not temporary*/
curbp->b_linecnt = -1; /* must be recalculated */
@ -247,7 +252,7 @@
done = newline = 0;
nline = 0L;
while(!done)
@@ -822,7 +821,7 @@
@@ -825,7 +824,7 @@
else
forwchar(FALSE, 1);
@ -256,7 +261,7 @@
emlwrite(line, NULL);
break;
}
@@ -910,7 +909,7 @@
@@ -913,7 +912,7 @@
strcat(fn, S_FILESEP);
}
else{

14
chinese/pine4/files/patch-au
View file

@ -1,5 +1,5 @@
--- pine/osdep/os-bsf.h.orig Tue Sep 22 11:19:52 1998
+++ pine/osdep/os-bsf.h Tue Sep 22 11:23:50 1998
--- pine/osdep/os-bsf.h.orig Thu Oct 8 05:51:40 1998
+++ pine/osdep/os-bsf.h Mon Feb 22 22:21:57 1999
@@ -74,7 +74,7 @@
default-composer-hdrs or customized-hdrs to get at it. Instead of
defining NEVER_ALLOW_CHANGING_FROM, an easier way of preventing From
@ -7,14 +7,14 @@
- /usr/local/lib/pine.conf.fixed file.
+ @@PREFIX@@/etc/pine.conf.fixed file.
----*/
/* #define NEVER_ALLOW_CHANGING_FROM /* probably not needed */
/* #define NEVER_ALLOW_CHANGING_FROM */
@@ -87,7 +87,7 @@
NOTE: You'll also have to make sure the appropriate osdep/postreap.*
file is included in the os-*.ic file for your system.
----*/
-/* #define BACKGROUND_POST /* comment out to disable posting from child */
+#define BACKGROUND_POST /* comment out to disable posting from child */
-/* #define BACKGROUND_POST */
+/* #define BACKGROUND_POST /* comment out to disable posting from child */
@ -33,8 +33,8 @@
/*----------------------------------------------------------------------
If no nntp-servers are defined, this program will be used to post news.
----*/
-#define SENDNEWS "/usr/local/news/inews -h" /* news posting cmd */
+#define SENDNEWS "/usr/local/news/lib/inews -h" /* For NN inews */
-#define SENDNEWS "/usr/local/news/inews -h"
+#define SENDNEWS "/usr/local/news/inews -h" /* For NN inews */
+/*#define SENDNEWS "/usr/local/bin/inews -h" /* For INN inews */
+/*#define SENDNEWS "/usr/local/bin/inews -h" /* For Cnews inews */

572
chinese/pine4/files/patch-av
View file

File diff suppressed because it is too large Load diff

177
chinese/pine4/files/patch-aw
View file

@ -1,5 +1,5 @@
--- pine/adrbkcmd.c.orig Wed Sep 16 06:11:08 1998
+++ pine/adrbkcmd.c Tue Sep 22 18:58:32 1998
--- pine/adrbkcmd.c.orig Sat Jan 30 03:57:55 1999
+++ pine/adrbkcmd.c Mon Feb 22 22:36:14 1999
@@ -112,23 +112,23 @@
static struct key abook_view_keys[] =
{HELP_MENU,
@ -121,28 +121,26 @@
*/
static struct headerentry headents_for_edit[]={
{"Nickname : ", "Nickname", h_composer_abook_nick, 12, 0, NULL,
- verify_nick, NULL, NULL, addr_book_nick_for_edit, "To AddrBk",
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
+ verify_nick, NULL, NULL, addr_book_nick_for_edit, "地址簿",
+ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, KS_NONE},
- verify_nick, NULL, NULL, addr_book_nick_for_edit, "To AddrBk", NULL,
+ verify_nick, NULL, NULL, addr_book_nick_for_edit, "地址簿", NULL,
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
{"Fullname : ", "Fullname", h_composer_abook_full, 12, 0, NULL,
- NULL, NULL, NULL, view_message_for_pico, "To Message",
+ NULL, NULL, NULL, view_message_for_pico, "資料匣",
- NULL, NULL, NULL, view_message_for_pico, "To Message", NULL,
+ NULL, NULL, NULL, view_message_for_pico, "資料匣", NULL,
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
{"Fcc : ", "FileCopy", h_composer_abook_fcc, 12, 0, NULL,
- NULL, NULL, NULL, folders_for_fcc, "To Fldrs",
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
+ NULL, NULL, NULL, folders_for_fcc, "資料匣",
+ 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, KS_NONE},
- NULL, NULL, NULL, folders_for_fcc, "To Fldrs", NULL,
+ NULL, NULL, NULL, folders_for_fcc, "資料匣", NULL,
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
{"Comment : ", "Comment", h_composer_abook_comment, 12, 0, NULL,
- NULL, NULL, NULL, view_message_for_pico, "To Message",
+ NULL, NULL, NULL, view_message_for_pico, "資料匣",
- NULL, NULL, NULL, view_message_for_pico, "To Message", NULL,
+ NULL, NULL, NULL, view_message_for_pico, "資料匣", NULL,
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
{"Addresses : ", "Addresses", h_composer_abook_addrs, 12, 0, NULL,
- verify_addr, NULL, NULL, addr_book_change_list, "To AddrBk",
+ verify_addr, NULL, NULL, addr_book_change_list, "地址簿",
- verify_addr, NULL, NULL, addr_book_change_list, "To AddrBk", NULL,
+ verify_addr, NULL, NULL, addr_book_change_list, "地址簿", NULL,
1, 1, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
{NULL, NULL, NO_HELP, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL,
{NULL, NULL, NO_HELP, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}
@@ -951,7 +951,7 @@
pbuf.canceltest = warped ? pico_cancel_for_adrbk_edit
@ -153,7 +151,7 @@
pbuf.resize = resize_for_pico;
pbuf.winch_cleanup = winch_cleanup;
pbuf.suspend = do_suspend;
@@ -966,7 +966,7 @@
@@ -967,7 +967,7 @@
pbuf.browse_help = h_composer_browse;
pbuf.attach_help = h_composer_ctrl_j;
pbuf.composer_help = h_composer;
@ -162,7 +160,7 @@
readonly ? 'V' : islower((unsigned char)(*cmd))
? toupper((unsigned char)*cmd)
: *cmd,
@@ -1551,12 +1551,12 @@
@@ -1559,12 +1559,12 @@
ps_global->redrawer = redraw_pico;
fix_windsize(ps_global);
@ -177,7 +175,7 @@
break;
}
@@ -1580,8 +1580,8 @@
@@ -1588,8 +1588,8 @@
char *rstr = NULL;
void (*redraw)() = ps_global->redrawer;
@ -188,7 +186,7 @@
ps_global->redrawer = redraw_pico;
fix_windsize(ps_global);
@@ -1604,7 +1604,7 @@
@@ -1612,7 +1612,7 @@
pico_cancel_for_adrbk_take(redraw_pico)
void (*redraw_pico)();
{
@ -197,7 +195,7 @@
}
@@ -1612,7 +1612,7 @@
@@ -1620,7 +1620,7 @@
pico_cancel_for_adrbk_edit(redraw_pico)
void (*redraw_pico)();
{
@ -206,7 +204,7 @@
}
@@ -1729,16 +1729,16 @@
@@ -1737,16 +1737,16 @@
if(ps_global->readonly_pinerc){
q_status_message1(SM_ORDER, 0, 3,
@ -227,7 +225,7 @@
return -1;
}
@@ -1787,7 +1787,7 @@
@@ -1796,7 +1796,7 @@
pbuf.browse_help = h_composer_browse;
pbuf.attach_help = h_composer_ctrl_j;
pbuf.composer_help = h_composer;
@ -236,7 +234,7 @@
pbuf.pine_anchor = set_titlebar(titlebar,
ps_global->mail_stream,
ps_global->context_current,
@@ -1856,8 +1856,8 @@
@@ -1916,8 +1916,8 @@
if(editor_result & COMP_CANCEL){
ret = -1;
q_status_message1(SM_ORDER, 0, 3,
@ -247,7 +245,7 @@
}
else if(editor_result & COMP_EXIT){
if(!strcmp(server, def_serv ? def_serv : "") &&
@@ -1865,8 +1865,8 @@
@@ -1925,8 +1925,8 @@
!strcmp(nickname, def_nick ? def_nick : "")){
ret = -1;
q_status_message1(SM_ORDER, 0, 3,
@ -258,7 +256,7 @@
}
else{
@@ -1936,8 +1936,8 @@
@@ -1993,8 +1993,8 @@
if(*tmp == '\0'){
q_status_message1(SM_ORDER, 0, 3,
@ -269,7 +267,7 @@
ret = -1;
goto get_out;
}
@@ -1962,8 +1962,8 @@
@@ -2019,8 +2019,8 @@
if(set_variable_list(global ? V_GLOB_ADDRBOOK : V_ADDRESSBOOK,
new_list, TRUE)){
q_status_message1(SM_ORDER, 0, 3,
@ -280,7 +278,7 @@
set_current_val(&vars[global ? V_GLOB_ADDRBOOK : V_ADDRESSBOOK],
TRUE, FALSE);
@@ -2137,7 +2137,7 @@
@@ -2191,7 +2191,7 @@
if(ps_global->readonly_pinerc){
if(err)
@ -289,7 +287,7 @@
return -1;
}
@@ -2154,10 +2154,10 @@
@@ -2208,10 +2208,10 @@
if(err){
if(pab->type & GLOBAL)
*err =
@ -302,7 +300,7 @@
}
return -1;
@@ -2210,8 +2210,8 @@
@@ -2264,8 +2264,8 @@
if(cnt > 1){
static ESCKEY_S opts[] = {
@ -313,7 +311,7 @@
{-1, 0, NULL, NULL}};
sprintf(tmp,
@@ -2229,7 +2229,7 @@
@@ -2283,7 +2283,7 @@
case 'x':
if(err)
@ -322,7 +320,7 @@
return -1;
}
@@ -2240,7 +2240,7 @@
@@ -2294,7 +2294,7 @@
case 'n':
case 'x':
if(err)
@ -331,7 +329,7 @@
return -1;
@@ -2285,7 +2285,7 @@
@@ -2339,7 +2339,7 @@
case 'x': /* Cancel */
default:
if(err)
@ -340,7 +338,7 @@
return -1;
}
@@ -2305,7 +2305,7 @@
@@ -2359,7 +2359,7 @@
case 'x':
default:
if(err)
@ -349,7 +347,7 @@
return -1;
@@ -2366,7 +2366,7 @@
@@ -2420,7 +2420,7 @@
case 'n':
default:
if(err)
@ -358,7 +356,7 @@
return -1;
}
@@ -2505,7 +2505,7 @@
@@ -2559,7 +2559,7 @@
/* this also frees old variable contents for us */
if(set_variable_list(varnum, new_list, TRUE)){
if(err)
@ -367,7 +365,7 @@
set_current_val(&vars[varnum], TRUE, FALSE);
free_list_array(&new_list);
@@ -2572,7 +2572,7 @@
@@ -2626,7 +2626,7 @@
if(ps_global->readonly_pinerc){
if(msg)
@ -376,7 +374,7 @@
return -1;
}
@@ -2582,12 +2582,12 @@
@@ -2636,12 +2636,12 @@
opts[i].ch = 'u';
opts[i].rval = 'u';
opts[i].name = "U";
@ -391,7 +389,7 @@
opts[i].ch = -1;
deefault = 'u';
@@ -2595,7 +2595,7 @@
@@ -2649,7 +2649,7 @@
if(pab->type & GLOBAL){
if(vars[V_GLOB_ADDRBOOK].is_fixed){
if(msg)
@ -400,7 +398,7 @@
return -1;
}
@@ -2615,7 +2615,7 @@
@@ -2669,7 +2669,7 @@
else{
if(vars[V_ADDRESSBOOK].is_fixed){
if(msg)
@ -409,7 +407,7 @@
return -1;
}
@@ -2654,7 +2654,7 @@
@@ -2708,7 +2708,7 @@
if(rv == 'x'){
if(msg)
@ -418,7 +416,7 @@
return -1;
}
@@ -2697,7 +2697,7 @@
@@ -2751,7 +2751,7 @@
enum {NotSet, Pers, Glob, Empty} type1, type2;
int i, j, retval = -1;
struct variable *vars = ps_global->vars;
@ -427,7 +425,7 @@
dprint(5, (debugfile, "- do_the_shuffle(%d, %d) -\n", anum1, anum2));
@@ -2711,7 +2711,7 @@
@@ -2765,7 +2765,7 @@
if(type1 == Empty){
if(msg)
*msg =
@ -436,7 +434,7 @@
return(retval);
}
@@ -2728,14 +2728,14 @@
@@ -2782,14 +2782,14 @@
if((type1 == Pers || type2 == Pers) && vars[V_ADDRESSBOOK].is_fixed){
if(msg)
@ -453,7 +451,7 @@
return(retval);
}
@@ -3207,7 +3207,7 @@
@@ -3261,7 +3261,7 @@
AdrBk_Entry *abe;
VCARD_INFO_S *vinfo;
static ESCKEY_S ab_export_opts[] = {
@ -462,7 +460,7 @@
{-1, 0, NULL, NULL},
{-1, 0, NULL, NULL}};
static ESCKEY_S vcard_or_addresses[] = {
@@ -3230,7 +3230,7 @@
@@ -3284,7 +3284,7 @@
switch(i){
case 'x':
@ -471,7 +469,7 @@
return(ret);
case 'a':
@@ -3259,7 +3259,7 @@
@@ -3313,7 +3313,7 @@
ab_export_opts[++r].ch = ctrl('I');
ab_export_opts[r].rval = 11;
ab_export_opts[r].name = "TAB";
@ -480,7 +478,7 @@
}
ab_export_opts[++r].ch = -1;
@@ -3272,7 +3272,7 @@
@@ -3326,7 +3326,7 @@
if(r < 0){
switch(r){
case -1:
@ -489,7 +487,7 @@
break;
case -2:
@@ -3656,7 +3656,7 @@
@@ -3711,7 +3711,7 @@
switch(want_to("Expand nicknames", 'y', 'x', h_ab_forward,WT_NORM)){
case 'x':
gf_clear_so_writec((STORE_S *) pb->contents.text.data);
@ -498,16 +496,16 @@
goto bomb;
case 'y':
@@ -3740,7 +3740,7 @@
@@ -3795,7 +3795,7 @@
gf_clear_so_writec((STORE_S *) pb->contents.text.data);
- pine_send(outgoing, &body, "FORWARDING ADDRESS BOOK ENTRY", NULL,
+ pine_send(outgoing, &body, "轉寄地址簿項目", NULL,
- pine_send(outgoing, &body, "FORWARDING ADDRESS BOOK ENTRY", NULL, NULL,
+ pine_send(outgoing, &body, "轉寄地址簿項目", NULL, NULL,
NULL, NULL, NULL, NULL, 0);
ps->mangled_screen = 1;
@@ -4207,8 +4207,8 @@
@@ -4262,8 +4262,8 @@
char tmp[200];
ACTION_LIST_S *action_list = NULL, *al;
static ESCKEY_S save_or_export[] = {
@ -518,7 +516,7 @@
{-1, 0, NULL, NULL}};
sprintf(tmp, "Save%s to address book or Export to filesystem ? ",
@@ -4219,7 +4219,7 @@
@@ -4274,7 +4274,7 @@
h_ab_save_exp, RB_NORM);
switch(i){
case 'x':
@ -527,7 +525,7 @@
return(0);
case 'e':
@@ -4405,7 +4405,7 @@
@@ -4457,7 +4457,7 @@
if(action_list)
fs_give((void **)&action_list);
@ -536,7 +534,7 @@
return(ret);
}
@@ -4594,7 +4594,7 @@
@@ -4638,7 +4638,7 @@
q_status_message(SM_ORDER | SM_DING, 3, 4,
"Save only partially completed");
else
@ -545,9 +543,9 @@
}
else if (how_many_to_copy + how_many_no_action -
(skip_dups ? how_many_dups : 0) > 0){
@@ -4670,15 +4670,15 @@
if(!agg && as.opened){
@@ -4715,15 +4715,15 @@
curopen = cur_is_open();
if(!agg && curopen){
static ESCKEY_S prt[] = {
- {'a', 'a', "A", "AddressBook"},
- {'e', 'e', "E", "Entry"},
@ -564,7 +562,7 @@
ps_global->mangled_footer = 1;
return 0;
@@ -4749,7 +4749,7 @@
@@ -4794,7 +4794,7 @@
switch(want_to("Expand nicknames", 'y', 'x', h_ab_forward,
WT_NORM)){
case 'x':
@ -573,17 +571,17 @@
ps_global->mangled_footer = 1;
return 0;
@@ -4973,7 +4973,7 @@
lineno = 0L;
if(as.opened)
- print_text1(" ADDRESS BOOK %s\n\n",
+ print_text1(" 地址簿 %s\n\n",
as.adrbks[as.cur].nickname);
@@ -5028,7 +5028,7 @@
dprint(2, (debugfile, "- ab_delete -\n"));
@@ -5068,7 +5068,7 @@
if(F_ON(F_CMBND_ABOOK_DISP,ps_global))
lineno = 0L - XTRA_TITLE_LINES_IN_OLD_ABOOK_DISP;
else{
- print_text1(" ADDRESS BOOK %s\n\n",
+ print_text1(" 地址簿 %s\n\n",
as.adrbks[as.cur].nickname);
lineno = 0L;
}
@@ -5134,7 +5134,7 @@
dprint(2, (debugfile, "- ab_agg_delete -\n"));
if(agg){
- sprintf(prompt, "Really delete %d selected entries", as.selections);
@ -591,16 +589,16 @@
ch = want_to(prompt, 'n', 'n', NO_HELP, WT_NORM);
if(ch == 'y'){
adrbk_cntr_t newelnum, flushelnum = NO_NEXT;
@@ -5193,7 +5193,7 @@
@@ -5301,7 +5301,7 @@
}
}
else
- cmd_cancelled("Apply command");
+ cmd_cancelled("套用命令");
- cmd_cancelled("Apply Delete command");
+ cmd_cancelled("套用刪除命令");
}
return(ret);
@@ -5241,7 +5241,7 @@
@@ -5349,7 +5349,7 @@
? (char *)rfc1522_decode((unsigned char *)tmp_20k_buf,
abe->fullname, NULL)
: abe->nickname ? abe->nickname : "";
@ -609,7 +607,7 @@
break;
case ListHead:
@@ -5249,13 +5249,13 @@
@@ -5357,13 +5357,13 @@
? (char *)rfc1522_decode((unsigned char *)tmp_20k_buf,
abe->fullname, NULL)
: abe->nickname ? abe->nickname : "";
@ -625,7 +623,7 @@
break;
}
@@ -5354,7 +5354,7 @@
@@ -5462,7 +5462,7 @@
return 0;
}
else{
@ -634,7 +632,7 @@
return 0;
}
}
@@ -5490,7 +5490,7 @@
@@ -5598,7 +5598,7 @@
if(r == 1 || r != 10 && fbuf[0] == '\0'){
ps->mangled_footer = 1;
if(error)
@ -643,7 +641,7 @@
return(ret);
}
@@ -5529,7 +5529,7 @@
@@ -5638,7 +5638,7 @@
pbuf.browse_help = h_composer_browse;
pbuf.attach_help = h_composer_ctrl_j;
pbuf.composer_help = h_composer;
@ -652,15 +650,19 @@
ps_global->mail_stream,
ps_global->context_current,
ps_global->cur_folder,
@@ -5777,13 +5777,13 @@
@@ -5895,14 +5895,14 @@
static struct key ldap_view_keys[] =
{HELP_MENU,
NULL_MENU,
- {"V","ViewLink",{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
- {"<","Results Index",{MC_EXIT,2,{'<',','}},KS_NONE},
+ {"V","檢視鏈結",{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
+ {"<","結果索引",{MC_EXIT,2,{'<',','}},KS_NONE},
PRYNTTXT_MENU,
NULL_MENU,
NULL_MENU,
- {"^B","PrevLink",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
- {"^F","NextLink",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
+ {"^B","前一鏈結",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+ {"^F","次一鏈結",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
PREVPAGE_MENU,
NEXTPAGE_MENU,
- {"C", "ComposeTo", {MC_COMPOSE,1,{'c'}}, KS_COMPOSER},
@ -668,13 +670,14 @@
FWDEMAIL_MENU,
SAVE_MENU,
WHEREIS_MENU};
@@ -5812,12 +5812,12 @@
@@ -5935,13 +5935,13 @@
memset(&sargs, 0, sizeof(SCROLL_S));
sargs.text.text = so_text(srcstore);
sargs.text.src = srctype;
- sargs.text.desc = "expanded entry";
- sargs.bar.title = "DIRECTORY ENTRY";
+ sargs.text.desc = "已展開的項目";
sargs.text.handles= handles;
- sargs.bar.title = "DIRECTORY ENTRY";
+ sargs.bar.title = "地址項目";
sargs.proc.tool = process_ldap_cmd;
sargs.proc.data.p = (void *) winning_e;
@ -684,7 +687,7 @@
sargs.keys.menu = &ldap_view_keymenu;
setbitmap(sargs.keys.bitmap);
@@ -6174,7 +6174,7 @@
@@ -6412,7 +6412,7 @@
struct headerentry *he;
void (*redraw_pico)();
{

995
chinese/pine4/files/patch-ax
View file

File diff suppressed because it is too large Load diff

96
chinese/pine4/files/patch-ay
View file

@ -1,11 +1,7 @@
--- pine/help.c.orig Wed Jul 1 06:22:26 1998
+++ pine/help.c Tue Aug 4 12:42:16 1998
@@ -50,15 +50,15 @@
static struct key help_keys[] =
{MAIN_MENU,
- {"E","Exit Help",{MC_EXIT,1,{'e'}}, KS_EXITMODE},
+ {"E","Â÷¶}",{MC_EXIT,1,{'e'}}, KS_EXITMODE},
--- pine/help.c.orig Thu Jan 7 03:50:55 1999
+++ pine/help.c Tue Feb 23 15:27:01 1999
@@ -53,12 +53,12 @@
{NULL,NULL,{MC_EXIT,1,{'e'}}, KS_EXITMODE},
{NULL,NULL,{MC_EXIT,1,{'e'}}, KS_EXITMODE},
{NULL,NULL,{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
- {"^B","PrevLink",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
@ -29,7 +25,7 @@
NULL_MENU,
NULL_MENU,
NULL_MENU,
@@ -269,7 +269,7 @@
@@ -262,7 +262,7 @@
memset(&sargs, 0, sizeof(SCROLL_S));
sargs.text.text = so_text(store);
sargs.text.src = CharStar;
@ -38,7 +34,7 @@
sargs.text.handles = handles;
if(!(sargs.bar.title = title)){
if(!struncmp(shown_text[0], "<html>", 6)){
@@ -297,7 +297,7 @@
@@ -290,7 +290,7 @@
}
if(!sargs.bar.title)
@ -47,7 +43,7 @@
}
sargs.bar.style = TextPercent;
@@ -313,13 +313,13 @@
@@ -307,18 +307,18 @@
setbitmap(sargs.keys.bitmap);
if(flags & HLPD_FROMHELP){
km.keys[HLP_EXIT_KEY].name = "P";
@ -55,6 +51,21 @@
+ km.keys[HLP_EXIT_KEY].label = "«e¤@»¡©ú";
km.keys[HLP_EXIT_KEY].bind.cmd = MC_FINISH;
km.keys[HLP_EXIT_KEY].bind.ch[0] = 'p';
km.keys[HLP_SUBEXIT_KEY].name = "E";
- km.keys[HLP_SUBEXIT_KEY].label = "Exit Help";
+ km.keys[HLP_SUBEXIT_KEY].label = "離開";
km.keys[HLP_SUBEXIT_KEY].bind.cmd = MC_EXIT;
km.keys[HLP_SUBEXIT_KEY].bind.ch[0] = 'e';
}
else if(text == h_special_help_nav){
km.keys[HLP_EXIT_KEY].name = "P";
- km.keys[HLP_EXIT_KEY].label = "Prev Help";
+ km.keys[HLP_EXIT_KEY].label = "前一說明";
km.keys[HLP_EXIT_KEY].bind.cmd = MC_FINISH;
km.keys[HLP_EXIT_KEY].bind.ch[0] = 'p';
@@ -327,12 +327,12 @@
}
else{
km.keys[HLP_EXIT_KEY].name = "E";
@ -62,8 +73,14 @@
+ km.keys[HLP_EXIT_KEY].label = "Â÷¶}";
km.keys[HLP_EXIT_KEY].bind.cmd = MC_EXIT;
km.keys[HLP_EXIT_KEY].bind.ch[0] = 'e';
clrbitn(HLP_SUBEXIT_KEY, sargs.keys.bitmap);
@@ -478,7 +478,7 @@
km.keys[HLP_SUBEXIT_KEY].name = "?";
- km.keys[HLP_SUBEXIT_KEY].label = "Help Help";
+ km.keys[HLP_SUBEXIT_KEY].label = "輔助說明";
km.keys[HLP_SUBEXIT_KEY].bind.cmd = MC_HELP;
km.keys[HLP_SUBEXIT_KEY].bind.ch[0] = '?';
}
@@ -492,7 +492,7 @@
}
sparms->keys.menu->keys[HLP_VIEW_HANDLE].name = "V";
@ -72,7 +89,16 @@
}
}
@@ -559,7 +559,7 @@
@@ -543,7 +543,7 @@
print_text(NEWLINE);
if(error = gf_pipe(helper_getc, print_char))
- q_status_message1(SM_ORDER | SM_DING, 3, 3, "Printing Error: %s", error);
+ q_status_message1(SM_ORDER | SM_DING, 3, 3, "列印錯誤：%s", error);
print_char(ctrl('L')); /* new page. */
}
@@ -573,7 +573,7 @@
#endif
if(ps_global->intr_pending){
q_status_message(SM_ORDER, 3, 3,
@ -81,7 +107,7 @@
break;
}
@@ -948,7 +948,7 @@
@@ -962,7 +962,7 @@
memset(&sargs, 0, sizeof(SCROLL_S));
sargs.text.text = tmp_text;
sargs.text.src = CharStar;
@ -90,7 +116,7 @@
sargs.bar.title = title;
sargs.start.on = LastPage;
@@ -1304,7 +1304,7 @@
@@ -1321,7 +1321,7 @@
#endif
}
else if(ch == 'x'){
@ -99,3 +125,41 @@
return(-1);
}
}
@@ -1448,13 +1448,13 @@
if(in_handle){
hp_menu[++i].type = tQueue;
hp_menu[i].label.style = lNormal;
- hp_menu[i].label.string = "View Help Section";
+ hp_menu[i].label.string = "檢視輔助說明章節";
hp_menu[i].data.val = 'V';
}
hp_menu[++i].type = tQueue;
hp_menu[i].label.style = lNormal;
- hp_menu[i].label.string = "Exit Help";
+ hp_menu[i].label.string = "離開";
hp_menu[i].data.val = 'E';
hp_menu[++i].type = tTail;
@@ -1479,18 +1479,18 @@
if(in_handle){
hp_menu[++i].type = tQueue;
hp_menu[i].label.style = lNormal;
- hp_menu[i].label.string = "View Help Section";
+ hp_menu[i].label.string = "檢視該節說明";
hp_menu[i].data.val = 'V';
}
hp_menu[++i].type = tQueue;
hp_menu[i].label.style = lNormal;
- hp_menu[i].label.string = "Previous Help Section";
+ hp_menu[i].label.string = "前一節";
hp_menu[i].data.val = 'P';
hp_menu[++i].type = tQueue;
hp_menu[i].label.style = lNormal;
- hp_menu[i].label.string = "Exit Help";
+ hp_menu[i].label.string = "離開";
hp_menu[i].data.val = 'E';
hp_menu[++i].type = tTail;

194
chinese/pine4/files/patch-ba
View file

@ -1,6 +1,6 @@
--- pine/mailcmd.c.orig Tue Sep 15 03:01:15 1998
+++ pine/mailcmd.c Tue Sep 22 19:13:41 1998
@@ -108,39 +108,39 @@
--- pine/mailcmd.c.orig Thu Feb 4 10:16:45 1999
+++ pine/mailcmd.c Wed Feb 24 21:29:19 1999
@@ -109,39 +109,39 @@
/*
* List of Select options used by apply_* functions...
*/
@ -61,7 +61,7 @@
{ -1, 0, NULL, NULL},
{ -1, 0, NULL, NULL},
{ -1, 0, NULL, NULL},
@@ -150,24 +150,24 @@
@@ -151,24 +151,24 @@
static char *sel_flag =
@ -96,7 +96,7 @@
{ctrl('W'), 14, "^W", "Toggle When"},
{KEY_UP, 12, "", ""},
{KEY_DOWN, 13, "", ""},
@@ -177,18 +177,18 @@
@@ -178,18 +178,18 @@
static char *sel_text =
#ifdef RECIPIENT
@ -123,7 +123,7 @@
#endif /* RECIPIENT */
{-1, 0, NULL, NULL}
};
@@ -242,7 +242,7 @@
@@ -243,7 +243,7 @@
case MC_HELP :
if(state->nr_mode) {
q_status_message(SM_ORDER, 0, 3,
@ -132,7 +132,7 @@
break;
}
@@ -271,7 +271,7 @@
@@ -272,7 +272,7 @@
/*------- View message text --------*/
case MC_VIEW_TEXT :
@ -141,7 +141,7 @@
state->next_screen = mail_view_screen;
#if defined(DOS) && !defined(WIN32)
flush_index_cache(); /* save room on PC */
@@ -295,10 +295,10 @@
@@ -296,10 +296,10 @@
mn_dec_cur(stream, msgmap);
if(i == mn_get_cur(msgmap))
q_status_message(SM_ORDER, 0, 2,
@ -154,7 +154,7 @@
}
break;
@@ -310,7 +310,7 @@
@@ -311,7 +311,7 @@
&& (i = mn_get_cur(msgmap)) < mn_get_total(msgmap)){
mn_inc_cur(stream, msgmap);
if(i == mn_get_cur(msgmap))
@ -163,7 +163,7 @@
}
else{
prompt[0] = '\0';
@@ -327,7 +327,7 @@
@@ -328,7 +328,7 @@
strcat(prompt, ". No more folders to TAB to.");
}
@ -172,7 +172,7 @@
prompt[0] ? prompt : NULL);
if(!IS_NEWS(stream))
@@ -474,9 +474,9 @@
@@ -475,9 +475,9 @@
}
}
else
@ -184,7 +184,7 @@
break;
}
@@ -493,9 +493,9 @@
@@ -494,9 +494,9 @@
*/
if(F_OFF(F_AUTO_OPEN_NEXT_UNREAD, state)){
static ESCKEY_S next_opt[] = {
@ -197,7 +197,7 @@
{-1, 0, NULL, NULL}
};
@@ -521,7 +521,7 @@
@@ -522,7 +522,7 @@
else
any_messages(NULL,
(mn_get_total(msgmap) > 0L)
@ -206,7 +206,7 @@
: NULL,
NULL);
}
@@ -539,7 +539,7 @@
@@ -540,7 +540,7 @@
* global "zoom mode" flag to suppress messags from the index
* should suffice.
*/
@ -215,7 +215,7 @@
if(unzoom_index(state, msgmap)){
dprint(4, (debugfile, "\n\n ---- Exiting ZOOM mode ----\n"));
q_status_message(SM_ORDER,0,2, "Index Zoom Mode is now off");
@@ -551,7 +551,7 @@
@@ -552,7 +552,7 @@
comatose(i), plural(i));
}
else
@ -224,7 +224,7 @@
}
break;
@@ -559,7 +559,7 @@
@@ -560,7 +560,7 @@
/*---------- print message on paper ----------*/
case MC_PRINTMSG :
@ -233,7 +233,7 @@
cmd_print(state, msgmap, 0, in_index);
break;
@@ -567,7 +567,7 @@
@@ -568,7 +568,7 @@
/*---------- Take Address ----------*/
case MC_TAKE :
@ -242,7 +242,7 @@
cmd_take_addr(state, msgmap, 0);
break;
@@ -575,7 +575,7 @@
@@ -576,7 +576,7 @@
/*---------- Save Message ----------*/
case MC_SAVE :
@ -251,7 +251,7 @@
cmd_save(state, msgmap, 0);
break;
@@ -583,7 +583,7 @@
@@ -584,7 +584,7 @@
/*---------- Export message ----------*/
case MC_EXPORT :
@ -260,7 +260,7 @@
cmd_export(state, msgmap, question_line, 0);
state->mangled_footer = 1;
}
@@ -596,9 +596,9 @@
@@ -597,9 +597,9 @@
dprint(2, (debugfile, "\n - expunge -\n"));
if(IS_NEWS(stream) && stream->rdonly){
if((del_count = count_flagged(stream, F_DEL)) > 0L){
@ -273,7 +273,7 @@
if(F_ON(F_FULL_AUTO_EXPUNGE, state)
|| (F_ON(F_AUTO_EXPUNGE, state)
&& (state->context_current
@@ -620,21 +620,20 @@
@@ -621,21 +621,20 @@
state->mangled_body = 1;
state->mangled_header = 1;
@ -300,7 +300,7 @@
break;
}
@@ -653,7 +652,7 @@
@@ -654,7 +653,7 @@
ret = 'y';
if(ret == 'x')
@ -309,7 +309,7 @@
if(ret != 'y')
break;
@@ -705,11 +704,11 @@
@@ -706,11 +705,11 @@
if(state->expunge_count <= 0)
if(del_count)
q_status_message1(SM_ORDER, 0, 3,
@ -323,7 +323,7 @@
break;
@@ -743,16 +742,15 @@
@@ -744,16 +743,15 @@
*/
refresh_sort(msgmap, FALSE);
state->mangled_header = 1;
@ -345,7 +345,7 @@
}
break;
@@ -760,7 +758,7 @@
@@ -761,7 +759,7 @@
/*------- Make Selection -----------*/
case MC_SELECT :
@ -354,7 +354,7 @@
aggregate_select(state, msgmap, question_line, in_index);
if(in_index && any_lflagged(msgmap, MN_SLCT) > 0L
&& !any_lflagged(msgmap, MN_HIDE)
@@ -792,7 +790,7 @@
@@ -793,7 +791,7 @@
unzoom_index(state, msgmap);
}
else
@ -363,7 +363,7 @@
}
break;
@@ -870,21 +868,21 @@
@@ -871,21 +869,21 @@
{
if(cmd == ctrl('Q') || cmd == ctrl('S'))
q_status_message1(SM_ASYNC, 0, 2,
@ -392,7 +392,7 @@
}
@@ -1157,11 +1155,9 @@
@@ -1158,11 +1156,9 @@
char *type, *cmd;
{
if(mn_get_total(map) <= 0L){
@ -406,7 +406,7 @@
return(FALSE);
}
@@ -1185,8 +1181,8 @@
@@ -1186,8 +1182,8 @@
{
if(READONLY_FOLDER || state->dead_stream){
q_status_message2(SM_ORDER | (state->dead_stream ? SM_DING : 0), 0, 3,
@ -417,7 +417,7 @@
return(FALSE);
}
@@ -1206,7 +1202,7 @@
@@ -1207,7 +1203,7 @@
cmd_cancelled(cmd)
char *cmd;
{
@ -426,7 +426,7 @@
}
@@ -1232,7 +1228,7 @@
@@ -1233,7 +1229,7 @@
dprint(4, (debugfile, "\n - delete message -\n"));
if(!(any_messages(msgmap, NULL, "to Delete")
@ -435,7 +435,7 @@
return;
if(state->io_error_on_stream) {
@@ -1242,16 +1238,15 @@
@@ -1243,16 +1239,15 @@
if(agg){
sequence = selected_sequence(state->mail_stream, msgmap, &del_count);
@ -455,7 +455,7 @@
lastmsg ? "" : long2string(msgno));
}
@@ -1311,7 +1306,7 @@
@@ -1312,7 +1307,7 @@
dprint(4, (debugfile, "\n - undelete -\n"));
if(!(any_messages(msgmap, NULL, "to Undelete")
@ -464,7 +464,24 @@
return;
if(agg){
@@ -1399,7 +1394,7 @@
@@ -1332,12 +1327,12 @@
if(del_count == 1L){
update_titlebar_status();
q_status_message(SM_ORDER, 0, 3,
- "Deletion mark removed, message won't be deleted");
+ "以移除刪除標記，信件將不會遭刪除");
}
else
- q_status_message2(SM_ORDER, 0, 3,
- "Deletion mark removed from %s message%s",
- comatose(del_count), plural(del_count));
+ q_status_message1(SM_ORDER, 0, 3,
+ "移除 %s 封信件上的刪除標記",
+ comatose(del_count));
if(state->io_error_on_stream) {
state->io_error_on_stream = 0;
@@ -1401,7 +1396,7 @@
};
if(!(any_messages(msgmap, NULL, "to Flag")
@ -473,7 +490,7 @@
return;
if(state->io_error_on_stream) {
@@ -1754,7 +1749,7 @@
@@ -1756,7 +1751,7 @@
if(msgno_any_exceptions(state->mail_stream, msgmap)
&& want_to("Saved copy will NOT include entire message! Continue",
'y', 'n', NO_HELP, WT_FLUSH_IN | WT_SEQ_SENSITIVE) != 'y'){
@ -482,7 +499,7 @@
return;
}
@@ -1877,32 +1872,32 @@
@@ -1879,32 +1874,32 @@
ekey[rc].ch = ctrl('T');
ekey[rc].rval = 2;
ekey[rc].name = "^T";
@ -520,7 +537,7 @@
}
if(saveable_count > 1){
@@ -2040,7 +2035,7 @@
@@ -2042,7 +2037,7 @@
/* else fall thru like they cancelled */
case 1 :
@ -529,9 +546,9 @@
done--;
break;
@@ -3162,16 +3157,16 @@
{
if(context && ps_global->context_list->next && context_isambig(folder)){
@@ -3172,16 +3167,16 @@
}
sprintf(tmp_20k_buf,
- "Folder \"%.15s%s\" in <%.15s%s> doesn't exist. Create",
+ "信件匣 \"%.15s%s\" 在 <%.15s%s> 不存在。要建立",
@ -549,7 +566,7 @@
return(-1);
}
@@ -3295,14 +3290,14 @@
@@ -3305,14 +3300,14 @@
export_opts[i = 0].ch = ctrl('T');
export_opts[i].rval = 10;
export_opts[i].name = "^T";
@ -566,7 +583,7 @@
}
#endif /* !(DOS || MAC) */
@@ -3310,7 +3305,7 @@
@@ -3320,7 +3315,7 @@
export_opts[i].ch = ctrl('I');
export_opts[i].rval = 11;
export_opts[i].name = "TAB";
@ -575,7 +592,7 @@
}
#if 0
@@ -3319,7 +3314,7 @@
@@ -3329,7 +3324,7 @@
export_opts[i].ch = ctrl('X');
export_opts[i].rval = 14;
export_opts[i].name = "^X";
@ -584,7 +601,7 @@
}
#endif
@@ -3333,7 +3328,7 @@
@@ -3343,7 +3338,7 @@
if(r < 0){
switch(r){
case -1:
@ -593,7 +610,7 @@
break;
case -2:
@@ -3355,7 +3350,7 @@
@@ -3365,7 +3360,7 @@
if(ps_global->restricted){
q_status_message(SM_ORDER | SM_DING, 3, 3,
@ -602,7 +619,7 @@
goto fini;
}
@@ -3374,7 +3369,7 @@
@@ -3384,7 +3379,7 @@
|| !format_message(mn_m2raw(msgmap, mn_get_cur(msgmap)),
env, b, FM_NEW_MESS | FM_NOWRAP, pc)){
q_status_message(SM_ORDER | SM_DING, 3, 3,
@ -611,7 +628,7 @@
break;
}
@@ -3387,18 +3382,18 @@
@@ -3397,18 +3392,18 @@
(void) close_system_pipe(&syspipe);
else
q_status_message(SM_ORDER | SM_DING, 3, 3,
@ -633,7 +650,7 @@
goto fini;
}
@@ -3512,7 +3507,7 @@
@@ -3522,7 +3517,7 @@
STORE_S *store = NULL;
struct variable *vars = ps->vars;
static ESCKEY_S simple_export_opts[] = {
@ -642,7 +659,7 @@
{-1, 0, NULL, NULL},
{-1, 0, NULL, NULL}};
@@ -3520,7 +3515,7 @@
@@ -3530,7 +3525,7 @@
simple_export_opts[r].ch = ctrl('I');
simple_export_opts[r].rval = 11;
simple_export_opts[r].name = "TAB";
@ -651,7 +668,7 @@
}
if(!srctext){
@@ -3593,7 +3588,7 @@
@@ -3603,7 +3598,7 @@
break;
case -1:
@ -660,7 +677,7 @@
break;
case -2:
@@ -4180,32 +4175,32 @@
@@ -4192,32 +4187,32 @@
ekey[rc].ch = (allow_list) ? ctrl('T') : 0 ;
ekey[rc].rval = (allow_list) ? 2 : 0;
ekey[rc].name = (allow_list) ? "^T" : "";
@ -698,7 +715,7 @@
}
if(ps_global->context_list->next){
@@ -4321,15 +4316,15 @@
@@ -4335,15 +4330,15 @@
newfolder);
else if(tc->use & CNTXT_INCMNG)
q_status_message1(SM_ORDER, 0, 3,
@ -718,7 +735,7 @@
newfolder);
return(NULL);
@@ -4342,7 +4337,7 @@
@@ -4356,7 +4351,7 @@
/* fall thru like they cancelled */
case 1 : /* o_e says user cancel */
@ -727,7 +744,7 @@
return(NULL);
case 2 : /* o_e says user wants list */
@@ -4578,7 +4573,7 @@
@@ -4592,7 +4587,7 @@
else if ((new_context->use & CNTXT_INCMNG)
&& (folder_index(newfolder, new_context, FI_FOLDER) < 0)){
q_status_message1(SM_ORDER, 3, 4,
@ -736,7 +753,22 @@
return(0);
}
}
@@ -4659,7 +4654,7 @@
@@ -4632,11 +4627,10 @@
clear_index_cache();
/* MUST sort before restoring msgno! */
refresh_sort(ps_global->msgmap, FALSE);
- q_status_message3(SM_ORDER, 0, 3,
- "Opened folder \"%s\" with %s message%s",
+ q_status_message2(SM_ORDER, 0, 3,
+ "信件匣 \"%s\" 已開啟，共 %s 封信件",
ps_global->inbox_name,
- long2string(mn_get_total(ps_global->msgmap)),
- plural(mn_get_total(ps_global->msgmap)));
+ long2string(mn_get_total(ps_global->msgmap)));
return(1);
}
@@ -4673,7 +4667,7 @@
}
}
@ -745,7 +777,7 @@
pretty_fn(newfolder), 70), "\"");
we_cancel = busy_alarm(1, status_msg, NULL, 1);
@@ -4742,7 +4737,7 @@
@@ -4756,7 +4750,7 @@
&& !mn_get_revsort(ps_global->msgmap)))
refresh_sort(ps_global->msgmap, FALSE);
@ -754,7 +786,7 @@
old_folder);
}
}
@@ -4823,14 +4818,13 @@
@@ -4837,14 +4831,13 @@
/* UWIN doesn't want to see this message */
if(!ps_global->nr_mode)
@ -773,7 +805,7 @@
sort_folder(ps_global->msgmap, ps_global->def_sort,
ps_global->def_sort_rev, TRUE);
@@ -4996,9 +4990,9 @@
@@ -5010,9 +5003,9 @@
char ing[4];
if(final_msg)
@ -785,7 +817,7 @@
buff1[0] = '\0';
buff2[0] = '\0';
@@ -5007,7 +5001,7 @@
@@ -5021,7 +5014,7 @@
stream->mailbox));
if(!stream->rdonly){
@ -794,7 +826,7 @@
flush_status_messages(1);
/* Save read messages? */
@@ -5047,10 +5041,8 @@
@@ -5061,10 +5054,8 @@
}
else{
sprintf(prompt_b,
@ -807,7 +839,7 @@
ret = want_to(prompt_b, 'y', 0, NO_HELP, WT_NORM);
}
@@ -5061,13 +5053,10 @@
@@ -5075,13 +5066,10 @@
if(ret == 'y'){
sprintf(buff2,
@ -822,7 +854,7 @@
long2string(delete_count));
if(final_msg)
*final_msg = cpystr(buff2);
@@ -5093,17 +5082,15 @@
@@ -5107,17 +5095,15 @@
if(ret != 'y'){
if(stream->nmsgs){
sprintf(buff2,
@ -844,7 +876,7 @@
ing, pretty_fn(folder));
}
@@ -5122,7 +5109,7 @@
@@ -5136,7 +5122,7 @@
q_status_message(SM_ORDER,
F_ON(F_AUTO_READ_MSGS,ps_global) ? 0 : 3, 5, moved_msg);
@ -853,7 +885,7 @@
ing, pretty_fn(folder));
if(F_ON(F_NEWS_CROSS_DELETE, ps_global))
@@ -5130,7 +5117,7 @@
@@ -5144,7 +5130,7 @@
}
else
sprintf(buff2,
@ -862,7 +894,7 @@
ing, pretty_fn(folder));
if(final_msg)
@@ -5430,18 +5417,18 @@
@@ -5444,18 +5430,18 @@
if(in_index && F_ON(F_PRINT_INDEX, state)){
char m[10];
static ESCKEY_S prt_opts[] = {
@ -886,7 +918,7 @@
if(agg)
restore_selected(msgmap);
@@ -5458,11 +5445,11 @@
@@ -5472,11 +5458,11 @@
}
if(do_index)
@ -901,7 +933,7 @@
if(open_printer(prompt) < 0){
if(agg)
@@ -5725,7 +5712,7 @@
@@ -5740,7 +5726,7 @@
/* else fall thru as if cancelled */
case 1 :
@ -910,7 +942,7 @@
done++;
break;
@@ -5808,7 +5795,7 @@
@@ -5823,7 +5809,7 @@
sel_opts = sel_opts2;
if(old_tot = any_lflagged(msgmap, MN_SLCT)){
i = get_lflag(state->mail_stream, msgmap, mn_get_cur(msgmap), MN_SLCT);
@ -919,7 +951,7 @@
sel_opts += 2; /* disable extra options */
switch(q = radio_buttons(sel_pmt1, q_line, sel_opts1, 'c', 'x', help,
RB_NORM)){
@@ -5852,7 +5839,7 @@
@@ -5867,7 +5853,7 @@
*/
switch(q){
case 'x': /* cancel */
@ -928,7 +960,7 @@
return;
case 'c' : /* select/unselect current */
@@ -6060,14 +6047,14 @@
@@ -6075,14 +6061,14 @@
sel_opts3[i].ch = '*';
sel_opts3[i].rval = '*';
sel_opts3[i].name = "*";
@ -945,7 +977,7 @@
}
/*
@@ -6079,7 +6066,7 @@
@@ -6094,7 +6080,7 @@
sel_opts3[i].ch = 'b';
sel_opts3[i].rval = 'b';
sel_opts3[i].name = "B";
@ -954,7 +986,7 @@
}
if(F_ON(F_ENABLE_PRYNT, state)){
@@ -6150,7 +6137,7 @@
@@ -6165,7 +6151,7 @@
break;
case 'x' : /* cancel */
@ -963,7 +995,7 @@
rv = 0;
break;
@@ -6267,7 +6254,7 @@
@@ -6282,7 +6268,7 @@
*t = '\0';
if(r == 1 || numbers[0] == '\0'){
@ -972,7 +1004,7 @@
return(1);
}
else
@@ -6393,7 +6380,7 @@
@@ -6408,7 +6394,7 @@
prompt, sel_date_opt, help, &flags);
switch (r){
case 1 :
@ -981,7 +1013,7 @@
return(1);
case 3 :
@@ -6503,15 +6490,15 @@
@@ -6518,15 +6504,15 @@
ekey[0].ch = ctrl('T');
ekey[0].name = "^T";
ekey[0].rval = 10;
@ -1000,7 +1032,7 @@
break;
case 's' :
@@ -6519,7 +6506,7 @@
@@ -6534,7 +6520,7 @@
ekey[0].ch = ctrl('X');
ekey[0].name = "^X";
ekey[0].rval = 13;
@ -1009,7 +1041,7 @@
break;
case 'a' :
@@ -6618,7 +6605,7 @@
@@ -6633,7 +6619,7 @@
}
if(type == 'x' || r == 'x'){
@ -1018,7 +1050,7 @@
return(1);
}
@@ -6799,7 +6786,7 @@
@@ -6814,7 +6800,7 @@
NO_HELP, RB_NORM);
if(s == 'x'){
@ -1027,7 +1059,7 @@
return(1);
}
else if(s == '!')
@@ -6896,7 +6883,7 @@
@@ -6911,7 +6897,7 @@
/*----- String together the prompt ------*/
tmp[1] = '\0';
@ -1036,7 +1068,7 @@
for(i = 0; state->sort_types[i] != EndofList && i < 8; i++) {
sorts[i].rval = i;
p = sorts[i].label = sort_name(state->sort_types[i]);
@@ -6913,7 +6900,7 @@
@@ -6928,7 +6914,7 @@
sorts[i].ch = 'r';
sorts[i].rval = 'r';
sorts[i].name = cpystr("R");
@ -1045,7 +1077,7 @@
sorts[++i].ch = -1;
help = h_select_sort;
@@ -6926,7 +6913,7 @@
@@ -6941,7 +6927,7 @@
}
else{
retval = 0;

112
chinese/pine4/files/patch-bc
View file

@ -1,5 +1,5 @@
--- pine/mailpart.c.orig Wed Sep 16 04:00:39 1998
+++ pine/mailpart.c Tue Sep 22 20:29:13 1998
--- pine/mailpart.c.orig Fri Feb 5 07:14:39 1999
+++ pine/mailpart.c Tue Feb 23 15:32:33 1999
@@ -142,18 +142,18 @@
{HELP_MENU,
OTHER_MENU,
@ -62,14 +62,14 @@
if(mn_total_cur(ps->msgmap) > 1L){
q_status_message(SM_ORDER | SM_DING, 0, 3,
- "Can only view one message's attachments at a time!");
- "Can only view one message's attachments at a time.");
+ "同一時間僅能檢視一封信的附件！");
return;
}
else if(ps->atmts && ps->atmts->description && !(ps->atmts + 1)->description)
q_status_message1(SM_ASYNC, 0, 3,
- "Message %s has only one part (the message body), and no attachments.",
+ "信件 %s 僅有一部分(信件本體)，沒有附件。",
+ "信件 %s 僅有一部分(信件本體)，沒有附件。",
long2string(mn_get_cur(ps->msgmap)));
/*
@ -154,7 +154,7 @@
ps_global->context_current, ps_global->cur_folder,
ps_global->msgmap, 1, FolderName,0,0);
@@ -1318,7 +1318,7 @@
@@ -1317,7 +1317,7 @@
gf_io_t pc;
STORE_S *store;
static ESCKEY_S att_save_opts[] = {
@ -163,7 +163,7 @@
{-1, 0, NULL, NULL},
{-1, 0, NULL, NULL},
{-1, 0, NULL, NULL}};
@@ -1351,7 +1351,7 @@
@@ -1346,7 +1346,7 @@
att_save_opts[++r].ch = ctrl('V');
att_save_opts[r].rval = 12;
att_save_opts[r].name = "^V";
@ -172,7 +172,7 @@
}
#endif /* !(DOS || MAC) */
@@ -1359,7 +1359,7 @@
@@ -1354,7 +1354,7 @@
att_save_opts[++r].ch = ctrl('I');
att_save_opts[r].rval = 11;
att_save_opts[r].name = "TAB";
@ -181,7 +181,7 @@
}
att_save_opts[++r].ch = -1;
@@ -1393,7 +1393,7 @@
@@ -1388,7 +1388,7 @@
if(ps_global->restricted){
q_status_message(SM_ORDER | SM_DING, 3, 3,
@ -190,7 +190,7 @@
return;
}
@@ -1401,7 +1401,7 @@
@@ -1396,7 +1396,7 @@
tfp = temp_nam(NULL, "pd");
dprint(1, (debugfile, "Download attachment called!\n"));
if(store = so_get(FileStar, tfp, WRITE_ACCESS|OWNER_ONLY)){
@ -199,7 +199,7 @@
we_cancel = init_att_progress(prompt_buf,
ps_global->mail_stream,
a->body);
@@ -1410,7 +1410,7 @@
@@ -1405,7 +1405,7 @@
if(err = detach(ps_global->mail_stream, msgno,
a->number, &len, pc, NULL))
q_status_message2(SM_ORDER | SM_DING, 3, 5,
@ -208,7 +208,7 @@
err, tfp);
/* cancel regardless, so it doesn't get in way of xfer */
@@ -1427,18 +1427,18 @@
@@ -1422,18 +1422,18 @@
(void)close_system_pipe(&syspipe);
else
q_status_message(SM_ORDER | SM_DING, 3, 3,
@ -230,7 +230,7 @@
a->number);
return;
@@ -1450,12 +1450,12 @@
@@ -1445,12 +1445,12 @@
if((store = so_get(FileStar, full_filename, WRITE_ACCESS)) == NULL){
q_status_message2(SM_ORDER | SM_DING, 3, 5,
@ -245,7 +245,7 @@
we_cancel = init_att_progress(prompt_buf, ps_global->mail_stream, a->body);
gf_set_so_writec(&pc, store);
@@ -1474,7 +1474,7 @@
@@ -1469,7 +1469,7 @@
truncate(full_filename, (over == -1) ? orig_size : 0);
q_status_message2(SM_ORDER | SM_DING, 3, 5,
@ -254,7 +254,7 @@
err, full_filename);
}
else{
@@ -1552,7 +1552,7 @@
@@ -1547,7 +1547,7 @@
MESSAGECACHE *mc;
STORE_S *so;
@ -263,7 +263,7 @@
if(save_prompt(ps_global, &cntxt, newfolder, nmsgs,
a->body->nested.msg->env, msgno, a->number)){
save_folder = (strucmp(newfolder, ps_global->inbox_name) == 0)
@@ -1574,11 +1574,11 @@
@@ -1569,11 +1569,11 @@
a->body->size.bytes, flags, date, so);
if(rv == 1)
q_status_message2(SM_ORDER, 0, 4,
@ -277,7 +277,7 @@
/* else whatever broke in save_fetch_append shoulda bitched */
so_give(&so);
@@ -1620,7 +1620,7 @@
@@ -1615,7 +1615,7 @@
if(MIME_MSG(part->body.type, part->body.subtype))
cnt++;
@ -286,7 +286,7 @@
if(save_prompt(ps_global, &cntxt, newfolder, nmsgs, NULL, 0, NULL)){
save_folder = (strucmp(newfolder, ps_global->inbox_name) == 0)
@@ -1654,11 +1654,11 @@
@@ -1649,11 +1649,11 @@
if(rv == 1)
q_status_message2(SM_ORDER, 0, 4,
@ -300,7 +300,7 @@
/* else whatever broke in save_fetch_append shoulda bitched */
if(our_stream)
@@ -1712,7 +1712,7 @@
@@ -1707,7 +1707,7 @@
ATTACH_S *ap = a;
STORE_S *store;
static ESCKEY_S opts[] = {
@ -309,7 +309,7 @@
{-1, 0, NULL, NULL},
{-1, 0, NULL, NULL}};
@@ -1720,7 +1720,7 @@
@@ -1715,7 +1715,7 @@
opts[i].ch = ctrl('I');
opts[i].rval = 11;
opts[i].name = "TAB";
@ -318,7 +318,7 @@
}
filename[0] = full_filename[0] = '\0';
@@ -1733,12 +1733,12 @@
@@ -1728,12 +1728,12 @@
if(rv < 0){
switch(rv){
case -1:
@ -333,7 +333,7 @@
ps_global->VAR_OPER_DIR);
break;
}
@@ -1752,17 +1752,17 @@
@@ -1747,17 +1747,17 @@
q_status_message(SM_ORDER | SM_DING, 3, 4, err);
else
q_status_message3(SM_ORDER, 0, 4,
@ -355,7 +355,7 @@
full_filename, error_description(errno));
}
@@ -1785,7 +1785,7 @@
@@ -1780,7 +1780,7 @@
ATTACH_S *ap;
STORE_S *store;
static ESCKEY_S opts[] = {
@ -364,7 +364,7 @@
{-1, 0, NULL, NULL},
{-1, 0, NULL, NULL}};
@@ -1793,7 +1793,7 @@
@@ -1788,7 +1788,7 @@
opts[i].ch = ctrl('I');
opts[i].rval = 11;
opts[i].name = "TAB";
@ -373,7 +373,7 @@
}
filename[0] = full_filename[0] = '\0';
@@ -1806,12 +1806,12 @@
@@ -1801,12 +1801,12 @@
if(rv < 0){
switch(rv){
case -1:
@ -388,7 +388,7 @@
ps_global->VAR_OPER_DIR);
break;
}
@@ -1833,7 +1833,7 @@
@@ -1828,7 +1828,7 @@
sprintf(tmp_20k_buf, " [Unknown Message subtype: %s ]\n",
ap->body->subtype);
if(!so_puts(store, tmp_20k_buf))
@ -397,7 +397,7 @@
}
else{
count++;
@@ -1842,29 +1842,29 @@
@@ -1837,29 +1837,29 @@
}
}
else if(!so_puts(store, "Unknown type in Digest"))
@ -434,7 +434,7 @@
full_filename, error_description(errno));
}
@@ -1933,7 +1933,7 @@
@@ -1928,7 +1928,7 @@
q_status_message2(SM_ORDER | SM_DING, 3, 3,
@ -443,7 +443,7 @@
long2string(msgno), a->number);
return(0);
}
@@ -2014,14 +2014,14 @@
@@ -2009,14 +2009,14 @@
/*----- Can't display this type ------*/
if(a->body->encoding < ENCOTHER)
q_status_message4(SM_ORDER | SM_DING, 3, 5,
@ -461,7 +461,7 @@
body_encodings[(a->body->encoding <= ENCMAX)
? a->body->encoding : ENCOTHER]);
@@ -2243,7 +2243,7 @@
@@ -2238,7 +2238,7 @@
clear_index_cache_ent(msgno);
if(store = format_text_att(msgno, a, &handles)){
@ -470,7 +470,7 @@
free_handles(&handles);
so_give(&store); /* free resources associated with store */
}
@@ -2411,22 +2411,22 @@
@@ -2406,22 +2406,22 @@
memset(&sargs, 0, sizeof(SCROLL_S));
sargs.text.text = so_text(store);
sargs.text.src = src;
@ -497,7 +497,7 @@
}
if(!handles){
@@ -2858,9 +2858,9 @@
@@ -2853,9 +2853,9 @@
sargs.text.text = so_text(store);
sargs.text.src = CharStar;
sargs.text.desc = "attachment info";
@ -509,18 +509,18 @@
scrolltool(&sargs);
@@ -2922,7 +2922,7 @@
@@ -2970,7 +2970,7 @@
else /* partially formatted outgoing message */
pine_send(outgoing, &body,
ps_global->nr_mode
- ? "SEND MESSAGE" : "FORWARD MESSAGE",
+ ? "送出信件" : "轉寄信件",
NULL, NULL, NULL, NULL, NULL, FALSE);
role, NULL, NULL, redraft_pos, NULL, NULL, FALSE);
ps_global->mangled_screen = 1;
@@ -2938,12 +2938,12 @@
mail_free_body(&body);
@@ -2988,12 +2988,12 @@
so_give((STORE_S **) &msgtext);
free_redraft_pos(&redraft_pos);
q_status_message(SM_ORDER | SM_DING, 4, 5,
- "Error fetching message contents. Can't forward message.");
+ "取得信件內容時發生錯誤。無法轉寄信件。");
@ -532,17 +532,35 @@
+ "無法配置信件文字");
mail_free_envelope(&outgoing);
}
@@ -3008,7 +3008,7 @@
free_role(&role);
@@ -3032,7 +3032,7 @@
ret = 'n';
if(ps_global->full_header)
- ret = want_to("Forward message as an attachment", 'n', 0,
+ ret = want_to("將信件以附件形式轉寄", 'n', 0,
NO_HELP, WT_SEQ_SENSITIVE);
/* Setup possible role */
if(!ps_global->anonymous && (pattern_h = open_nonempty_patterns())){
@@ -3043,7 +3043,7 @@
else{ /* cancel reply */
role = NULL;
close_patterns(&pattern_h);
- cmd_cancelled("Forward");
+ cmd_cancelled("轉寄");
mail_free_envelope(&outgoing);
so_give((STORE_S **) &msgtext);
return;
@@ -3121,7 +3121,7 @@
pine_simple_send(outgoing, &body, NULL, NULL, NULL, 1);
else /* partially formatted outgoing message */
pine_send(outgoing, &body,
- ps_global->nr_mode ? "SEND MESSAGE" : "FORWARD MESSAGE",
+ ps_global->nr_mode ? "送出信件" : "轉寄信件",
NULL, NULL, NULL, NULL, NULL, FALSE);
role, NULL, NULL, redraft_pos, NULL, NULL, FALSE);
ps_global->mangled_screen = 1;
@@ -3023,16 +3023,16 @@
@@ -3138,16 +3138,16 @@
else{
so_give((STORE_S **) &msgtext);
q_status_message(SM_ORDER | SM_DING, 4, 5,
@ -562,16 +580,16 @@
long2string(msgno));
mail_free_envelope(&outgoing);
@@ -3105,7 +3105,7 @@
tp = body_partno(stream, msgno, a->body),
msgtext, prefix, include_text)){
@@ -3256,7 +3256,7 @@
: ps_global->VAR_SIGNATURE_FILE,
&redraft_pos)){
/* partially formatted outgoing message */
- pine_send(outgoing, &body, "COMPOSE MESSAGE REPLY",
+ pine_send(outgoing, &body, "編輯信件回函",
fcc.tptr, NULL, NULL, NULL, NULL, 0);
role, fcc.tptr, NULL, redraft_pos, NULL, NULL, 0);
pine_free_body(&body);
@@ -3113,13 +3113,13 @@
@@ -3264,13 +3264,13 @@
}
else
q_status_message(SM_ORDER | SM_DING, 3, 4,
@ -587,7 +605,7 @@
}
seeyalater:
@@ -3186,7 +3186,7 @@
@@ -3340,7 +3340,7 @@
sprintf(prompt, "Pipe %sattachment %s to %s: ", raw ? "RAW " : "",
a->number, capture ? "" : "(Free Output) ");
@ -596,7 +614,7 @@
pipe_opt[2].label = capture ? "Free Output" : "Capture Output";
flags = OE_APPEND_CURRENT | OE_SEQ_SENSITIVE;
rc = optionally_enter(pipe_command, -FOOTER_ROWS(ps_global), 0,
@@ -3204,7 +3204,7 @@
@@ -3358,7 +3358,7 @@
}
else if(rc == 0){
if(pipe_command[0] == '\0'){
@ -605,7 +623,7 @@
break;
}
@@ -3278,7 +3278,7 @@
@@ -3436,7 +3436,7 @@
break;
}
else if(rc == 1){

220
chinese/pine4/files/patch-bd
View file

@ -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;

810
chinese/pine4/files/patch-bf
View file

File diff suppressed because it is too large Load diff

52
chinese/pine4/files/patch-bg
View file

@ -1,6 +1,6 @@
--- pine/pine.c.orig Wed Jul 22 06:02:36 1998
+++ pine/pine.c Tue Aug 4 12:42:20 1998
@@ -107,12 +107,12 @@
--- pine/pine.c.orig Sat Jan 30 01:59:01 1999
+++ pine/pine.c Tue Feb 23 15:50:13 1999
@@ -114,12 +114,12 @@
OTHER_MENU,
NULL_MENU,
NULL_MENU,
@ -17,7 +17,7 @@
NULL_MENU,
NULL_MENU,
@@ -122,10 +122,10 @@
@@ -129,11 +129,11 @@
COMPOSE_MENU,
LISTFLD_MENU,
GOTO_MENU,
@ -25,14 +25,16 @@
- {"J","Journal",{MC_JOURNAL,1,{'j'}},KS_REVIEW},
- {"S","Setup",{MC_SETUP,1,{'s'}},KS_NONE},
- {"A","AddrBook",{MC_ADDRBOOK,1,{'a'}},KS_ADDRBOOK},
- {"#","Role",{MC_ROLE,1,{'#'}},KS_NONE},
+ {"I","索引",{MC_INDEX,1,{'i'}},KS_FLDRINDEX},
+ {"J","日誌",{MC_JOURNAL,1,{'j'}},KS_REVIEW},
+ {"S","設定",{MC_SETUP,1,{'s'}},KS_NONE},
+ {"A","地址簿",{MC_ADDRBOOK,1,{'a'}},KS_ADDRBOOK},
NULL_MENU,
+ {"#","¨¤¦â",{MC_ROLE,1,{'#'}},KS_NONE},
NULL_MENU};
INST_KEY_MENU(main_keymenu, main_keys);
@@ -511,7 +511,7 @@
#define MAIN_HELP_KEY 0
@@ -528,7 +528,7 @@
static struct key simple_file_keys[] =
{HELP_MENU,
NULL_MENU,
@ -41,7 +43,7 @@
NULL_MENU,
NULL_MENU,
NULL_MENU,
@@ -520,15 +520,15 @@
@@ -537,15 +537,15 @@
PRYNTTXT_MENU,
WHEREIS_MENU,
FWDEMAIL_MENU,
@ -60,7 +62,7 @@
sargs.bar.style = FileTextPercent;
sargs.keys.menu = &simple_file_keymenu;
setbitmap(sargs.keys.bitmap);
@@ -709,7 +709,7 @@
@@ -761,7 +761,7 @@
if(!pine_state->VAR_INBOX_PATH || !pine_state->VAR_INBOX_PATH[0]
|| strucmp(pine_state->VAR_INBOX_PATH, "inbox") == 0){
HelpType help = NO_HELP;
@ -69,7 +71,7 @@
{-1, 0, NULL, NULL}};
pine_state->mangled_footer = 1;
@@ -719,7 +719,7 @@
@@ -771,7 +771,7 @@
rv = optionally_enter(int_mail, -FOOTER_ROWS(pine_state),
0, MAXPATH,
@ -78,7 +80,7 @@
/* ekey */ NULL, help, &flags);
if(rv == 3){
help = (help == NO_HELP) ? h_sticky_inbox : NO_HELP;
@@ -731,7 +731,7 @@
@@ -783,7 +783,7 @@
}
if(rv == 1){
@ -87,7 +89,7 @@
rv = 0; /* reset rv */
}
else if(rv == 2){
@@ -750,7 +750,7 @@
@@ -802,7 +802,7 @@
removing_leading_white_space(int_mail);
if((!pine_state->VAR_INBOX_PATH
|| strucmp(pine_state->VAR_INBOX_PATH, "inbox") == 0)
@ -96,7 +98,7 @@
'y', 'n', NO_HELP, WT_NORM) == 'y'){
set_variable(V_INBOX_PATH, int_mail, 1);
}
@@ -895,25 +895,25 @@
@@ -949,25 +949,25 @@
*news_addition;
int key_index; /* index into keymenu array for this cmd */
} mkeys[] = {
@ -130,7 +132,7 @@
NULL, MAIN_QUIT_KEY}
};
@@ -1206,7 +1206,7 @@
@@ -1295,7 +1295,7 @@
pine_state->mangled_footer = 1;
}
else{
@ -139,7 +141,7 @@
pine_state->mangled_screen = 1;
}
@@ -1234,7 +1234,7 @@
@@ -1323,7 +1323,7 @@
just_a_navigate_cmd++;
}
else
@ -148,7 +150,7 @@
break;
@@ -1250,14 +1250,14 @@
@@ -1339,14 +1339,14 @@
just_a_navigate_cmd++;
}
else
@ -165,7 +167,7 @@
pine_state->mangled_screen = 1;
break;
@@ -1486,7 +1486,7 @@
@@ -1603,7 +1603,7 @@
/* paint the titlebar if needed */
if(ps->mangled_header){
@ -174,7 +176,7 @@
ps->cur_folder, ps->msgmap, 1, FolderName, 0, 0);
ps->mangled_header = 0;
}
@@ -1651,13 +1651,13 @@
@@ -1772,14 +1772,14 @@
{
char prompt[80];
char letters[20];
@ -185,6 +187,7 @@
- char *sigedit = "Signature";
- char *abooks = "AddressBooks";
- char *clctns = "collectionList";
- char *roles = "Roles";
+ char *printer = "印表機";
+ char *passwd = "設定新密碼";
+ char *config = "環境設定";
@ -192,10 +195,11 @@
+ char *sigedit = "編輯簽名檔";
+ char *abooks = "地址簿";
+ char *clctns = "總集列表";
+ char *roles = "¨¤¦â";
#ifdef ENABLE_LDAP
char *dir = "Directory";
#endif
@@ -1735,13 +1735,13 @@
@@ -1864,13 +1864,13 @@
}
sprintf(prompt,
@ -212,7 +216,7 @@
s = 'e';
}
@@ -1854,14 +1854,14 @@
@@ -1996,14 +1996,14 @@
HELP_MENU,
NULL_MENU,
{"E",NULL,{MC_EXIT,1,{'e',ctrl('M'),ctrl('J')}},KS_NONE},
@ -229,7 +233,7 @@
NULL_MENU};
INST_KEY_MENU(nuov_keymenu, nuov_keys);
#define NUOV_EXIT 2
@@ -1950,13 +1950,13 @@
@@ -2100,13 +2100,13 @@
memset(&sargs, 0, sizeof(SCROLL_S));
sargs.text.text = so_text(store);
sargs.text.src = CharStar;
@ -244,9 +248,9 @@
- sargs.help.title = "MAIN PINE HELP";
+ sargs.help.title = "PINE 的主要輔助說明";
sargs.resize_exit = 1;
sargs.force_h = 1;
sargs.keys.menu = &km;
@@ -1967,11 +1967,11 @@
km = nuov_keymenu;
@@ -2116,11 +2116,11 @@
setbitmap(sargs.keys.bitmap);
if(ps->phone_home){
@ -260,7 +264,7 @@
km.keys[NUOV_EXIT].bind.nch = 3;
clrbitn(NUOV_VIEW, sargs.keys.bitmap);
}
@@ -2029,7 +2029,7 @@
@@ -2201,7 +2201,7 @@
break;
case MC_RELNOTES :
@ -269,7 +273,7 @@
ps_global->mangled_screen = 1;
break;
@@ -2148,7 +2148,7 @@
@@ -2320,7 +2320,7 @@
dprint(1, (debugfile, "\n\n ---- QUIT SCREEN ----\n"));
if(!pine_state->nr_mode && F_OFF(F_QUIT_WO_CONFIRM,pine_state)

79
chinese/pine4/files/patch-bi
View file

@ -1,6 +1,6 @@
--- pine/reply.c.orig Wed Jul 15 08:40:00 1998
+++ pine/reply.c Tue Aug 4 12:42:21 1998
@@ -88,9 +88,9 @@
--- pine/reply.c.orig Thu Jan 28 06:32:10 1999
+++ pine/reply.c Tue Feb 23 15:55:36 1999
@@ -107,9 +107,9 @@
/*
* Little defs to keep the code a bit neater...
*/
@ -10,19 +10,28 @@
+#define FRM_PMT "使用 \"Reply-To:\" 地址代替 \"From:\" 地址"
+#define ALL_PMT "回覆給所有的收信者"
+#define NEWS_PMT "回覆至新聞組群，回函給作者或兩者皆要？"
#define SIGDASHES "-- "
/*
* standard type of storage object used for body parts...
@@ -411,7 +411,7 @@
@@ -293,7 +293,7 @@
else{ /* cancel reply */
role = NULL;
close_patterns(&pattern_h);
- cmd_cancelled("Reply");
+ cmd_cancelled("回覆");
goto done_early;
}
@@ -558,7 +558,7 @@
#endif
/* partially formatted outgoing message */
- pine_send(outgoing, &body, "COMPOSE MESSAGE REPLY",
+ pine_send(outgoing, &body, "編輯信件回函",
fcc.tptr, &reply, NULL, NULL, NULL, 0);
role, fcc.tptr, &reply, redraft_pos, NULL, NULL, 0);
done:
pine_free_body(&body);
@@ -485,7 +485,7 @@
@@ -636,7 +636,7 @@
(ADDRESS *) NULL, env->from, 0);
if(ret == 'x') {
@ -31,7 +40,7 @@
return(0);
}
@@ -534,7 +534,7 @@
@@ -685,7 +685,7 @@
|| (*saved_cc || *saved_resent))){
*flags &= ~RSF_QUERY_REPLY_ALL;
if((ret=want_to(ALL_PMT,'n','x',NO_HELP,WT_SEQ_SENSITIVE)) == 'x'){
@ -40,7 +49,7 @@
return(0);
}
else if(ret == 'y')
@@ -1099,8 +1099,8 @@
@@ -1406,8 +1406,8 @@
{
int ret, edited = 0;
static ESCKEY_S rtq_opts[] = {
@ -51,7 +60,7 @@
{-1, 0, NULL, NULL}, /* may be overridden below */
{-1, 0, NULL, NULL}
};
@@ -1110,19 +1110,18 @@
@@ -1417,19 +1417,18 @@
return(1);
while(1){
@ -77,7 +86,7 @@
}
else
rtq_opts[2].ch = -1;
@@ -1133,7 +1132,7 @@
@@ -1440,7 +1439,7 @@
rtq_opts, edited ? 'y' : 'n',
'x', NO_HELP, RB_SEQ_SENSITIVE)){
case 'x':
@ -86,7 +95,7 @@
return(-1);
case 'r':
@@ -1152,7 +1151,7 @@
@@ -1459,7 +1458,7 @@
switch(optionally_enter(buf, ps->ttyo->screen_rows > 4
? -FOOTER_ROWS(ps_global) : -1,
@ -95,7 +104,7 @@
NULL, NO_HELP, &flags)){
case 0: /* entry successful, continue */
if(flags & OE_USER_MODIFIED){
@@ -1165,7 +1164,7 @@
@@ -1472,7 +1471,7 @@
break;
case 1:
@ -104,7 +113,7 @@
case -1:
return(-1);
@@ -1518,9 +1517,9 @@
@@ -2476,9 +2475,9 @@
ENVELOPE *env, *outgoing;
{
int ret = 1;
@ -117,7 +126,7 @@
{-1, 0, NULL, NULL} };
if(env->newsgroups && *env->newsgroups && !reply_poster_followup(env))
@@ -1544,7 +1543,7 @@
@@ -2502,7 +2501,7 @@
case 'x' : /* cancel or unknown response */
default :
@ -126,7 +135,7 @@
ret = 0;
break;
}
@@ -1552,7 +1551,7 @@
@@ -2510,7 +2509,7 @@
if(ret > 1){
if(env->followup_to){
q_status_message(SM_ORDER, 2, 3,
@ -135,21 +144,39 @@
outgoing->newsgroups = cpystr(env->followup_to);
}
else if(!outgoing->newsgroups)
@@ -1710,7 +1709,7 @@
* up...
*/
@@ -3148,7 +3147,7 @@
: 0;
if(ret == 'x'){
- q_status_message(SM_ORDER, 0, 3, "Forward message cancelled");
+ q_status_message(SM_ORDER, 0, 3, "¨ú®ø«H¥óÂà±H");
goto clean_early;
- cmd_cancelled("Forward");
+ cmd_cancelled("轉寄");
so_give((STORE_S **)&msgtext);
goto clean;
}
else if(ret == 'y'){ /* attach message[s]!!! */
@@ -1842,7 +1841,7 @@
@@ -3163,7 +3162,7 @@
else{ /* cancel reply */
role = NULL;
close_patterns(&pattern_h);
- cmd_cancelled("Forward");
+ cmd_cancelled("轉寄");
so_give((STORE_S **)&msgtext);
goto clean;
}
@@ -3360,7 +3359,7 @@
pine_simple_send(outgoing, &body, NULL, NULL, NULL, 1);
else /* partially formatted outgoing message */
pine_send(outgoing, &body,
- ps->nr_mode ? "SEND MESSAGE" : "FORWARD MESSAGE",
+ ps->nr_mode ? "送出信件" : "轉寄信件",
NULL, NULL, NULL, NULL, NULL, FALSE);
role, NULL, NULL, redraft_pos, NULL, NULL, FALSE);
clean:
@@ -3383,7 +3382,7 @@
mail_gc(ps->mail_stream, GC_TEXTS);
#endif
q_status_message(SM_ORDER | SM_DING, 4, 5,
- "Error fetching message contents. Can't forward message.");
+ "擷取信件內容時發生錯誤。無法轉寄信件。");
goto clean;
}

56
chinese/pine4/files/patch-bj
View file

@ -1,6 +1,6 @@
--- pine/screen.c.orig Fri Jun 5 04:09:17 1998
+++ pine/screen.c Tue Aug 4 12:42:21 1998
@@ -433,7 +433,7 @@
--- pine/screen.c.orig Wed Jan 13 10:51:51 1999
+++ pine/screen.c Tue Feb 23 15:57:08 1999
@@ -435,7 +435,7 @@
static struct key cancel_keys[] =
@ -9,7 +9,7 @@
{NULL,NULL,KS_NONE}, {NULL,NULL,KS_NONE},
{NULL,NULL,KS_NONE}, {NULL,NULL,KS_NONE},
{NULL,NULL,KS_NONE}, {NULL,NULL,KS_NONE},
@@ -1124,10 +1124,10 @@
@@ -1128,10 +1128,10 @@
as.page_column = -1;
is_context = strlen(as.context_name);
sprintf(version, "PINE %s", pine_version);
@ -22,7 +22,7 @@
ss_len = strlen(ss_string);
tit_len = strlen(as.title); /* fixed title field width */
@@ -1144,17 +1144,17 @@
@@ -1148,17 +1148,17 @@
/*
* set location field's length and value based on requested style
*/
@ -44,7 +44,7 @@
break;
case MessageNumber : /* "<loc_label> xxx of xxx DEL" */
num_len = digit_count(mn_get_total(as.msgmap));
@@ -1162,7 +1162,7 @@
@@ -1166,7 +1166,7 @@
as.cur_mess_col = sc - (2 * num_len) - 10;
as.del_column = as.cur_mess_col + num_len
+ digit_count(as.current_msg) + 5;
@ -53,7 +53,7 @@
strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
strcpy(tmp_20k_buf + 1500, comatose(mn_get_total(as.msgmap))),
BAR_STATUS(as.msg_state));
@@ -1174,7 +1174,7 @@
@@ -1178,7 +1178,7 @@
as.percent_column = as.cur_mess_col + num_len
+ digit_count(as.current_msg) + 7;
as.del_column = as.percent_column + 4;
@ -62,7 +62,7 @@
strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
strcpy(tmp_20k_buf + 1500, comatose(mn_get_total(as.msgmap))),
percentage(as.current_line, as.total_lines, 1),
@@ -1185,7 +1185,7 @@
@@ -1189,7 +1189,7 @@
case FileTextPercent :
as.page_column = sc - (14 + 2*(num_len = digit_count(as.total_lines)));
loc_len = 17 + 2*num_len;
@ -71,7 +71,7 @@
num_len, as.current_line,
num_len, as.total_lines,
percentage(as.current_line, as.total_lines, 1));
@@ -1259,7 +1259,7 @@
@@ -1264,7 +1264,7 @@
ss_string);
}
else{
@ -80,25 +80,25 @@
if(fold_len + ss_len + 8 < avail) /* all of folder fit? */
sprintf(fold_tmp, fmt, as.folder_name, ss_string);
else if((fold_len/2) + ss_len + 8 < avail)
@@ -1307,7 +1307,7 @@
as.current_msg = mn_get_cur(as.msgmap);
if(as.style == MsgTextPercent){
- PutLine5(0, as.cur_mess_col, "%s of %s %s %s%s",
+ PutLine5(0, as.cur_mess_col, "%s ¤§ %s %s %s%s",
strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
strcpy(tmp_20k_buf + 1500,
comatose(mn_get_total(as.msgmap))),
@@ -1317,7 +1317,7 @@
as.del_column += delta;
as.percent_column += delta;
} else {
- PutLine4(0, as.cur_mess_col, "%s of %s %s%s",
+ PutLine4(0, as.cur_mess_col, "%s ¤§ %s %s%s",
strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
strcpy(tmp_20k_buf + 1500,
comatose(mn_get_total(as.msgmap))),
@@ -1420,7 +1420,7 @@
@@ -1313,7 +1313,7 @@
StartInverse();
if(delta) {
if(as.style == MsgTextPercent){
- PutLine5(0, as.cur_mess_col, "%s of %s %s %s%s",
+ PutLine5(0, as.cur_mess_col, "%s ¤§ %s %s %s%s",
strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
strcpy(tmp_20k_buf + 1500,
comatose(mn_get_total(as.msgmap))),
@@ -1324,7 +1324,7 @@
as.percent_column += delta;
}
else{
- PutLine4(0, as.cur_mess_col, "%s of %s %s%s",
+ PutLine4(0, as.cur_mess_col, "%s ¤§ %s %s%s",
strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
strcpy(tmp_20k_buf + 1500,
comatose(mn_get_total(as.msgmap))),
@@ -1426,7 +1426,7 @@
as.current_line = new_line_number;

403
chinese/pine4/files/patch-bk
View file

@ -1,6 +1,6 @@
--- pine/send.c.orig Wed Sep 16 03:12:31 1998
+++ pine/send.c Tue Sep 22 11:56:19 1998
@@ -211,18 +211,18 @@
--- pine/send.c.orig Fri Feb 5 02:17:39 1999
+++ pine/send.c Wed Feb 24 21:36:10 1999
@@ -222,17 +222,17 @@
* Various useful strings
*/
#define INTRPT_PMT \
@ -18,14 +18,22 @@
#define POST_PMT \
- "Posted message may go to thousands of readers. Really post"
+ "這篇文章可能被數以千計的讀者閱\讀，確定要刊登嗎"
#define INTR_DEL_FAIL \
"Undelete messages to remain postponed, and then continue message"
-#define INTR_DEL_PMT "Deleted messages will be removed from folder. Delete"
+#define INTR_DEL_PMT "刪除的信件將被移出檔案匣。確定刪除嗎"
#define INTR_DEL_PMT \
- "Deleted messages will be removed from folder after use. Proceed"
+ "刪除的信件於 Pine 使用後將被移出檔案匣。確定刪除嗎"
#if defined(DOS) || defined(OS2)
#define POST_PERM_GRIPE \
@@ -382,14 +382,14 @@
@@ -277,7 +277,7 @@
#define REDRAFT_PPND 0x01
#define REDRAFT_DEL 0x02
-#define COMPOSE_MAIL_TITLE "COMPOSE MESSAGE"
+#define COMPOSE_MAIL_TITLE "編輯信件"
/*
* Phone home hash controls
@@ -443,14 +443,14 @@
mail_close(stream);
if(ret == 'x'){
q_status_message(SM_ORDER, 0, 3,
@ -42,7 +50,7 @@
file_path);
if(stream)
mail_close(stream);
@@ -469,14 +469,14 @@
@@ -532,14 +532,14 @@
if(ret == 'x'){
q_status_message(SM_ORDER, 0, 3,
@ -59,7 +67,7 @@
if(stream)
mail_close(stream);
}
@@ -562,7 +562,7 @@
@@ -627,7 +627,7 @@
if(ret == 'x'){
q_status_message(SM_ORDER, 0, 3,
@ -68,7 +76,7 @@
done++;
}
}
@@ -572,7 +572,7 @@
@@ -637,7 +637,7 @@
}
else{
q_status_message1(SM_ORDER | SM_DING, 3, 3,
@ -77,34 +85,59 @@
if(stream)
mail_close(stream);
}
@@ -646,7 +646,7 @@
fs_give((void **)&tmp_fcc);
}
@@ -677,7 +677,7 @@
else{ /* cancel reply */
role = NULL;
close_patterns(&pattern_h);
- cmd_cancelled("Composition");
+ cmd_cancelled("編輯文章");
return;
}
- pine_send(outgoing, &body, "COMPOSE MESSAGE", fcc,
+ pine_send(outgoing, &body, "編輯信件", fcc,
reply, redraft_pos, lcc, custom, fcc_is_sticky);
@@ -685,7 +685,7 @@
}
if(reply){
@@ -713,7 +713,7 @@
if(role)
- q_status_message1(SM_ORDER, 3, 4, "Composing using role \"%s\"",
+ q_status_message1(SM_ORDER, 3, 4, "以 \"%s\" 的角色編輯",
role->nick);
/*
@@ -830,8 +830,8 @@
*/
if(!stream->nmsgs){
q_status_message(SM_ORDER | SM_DING, 3, 5,
- "Empty folder. No messages really postponed!");
+ "空的信件匣。沒有信件真正被暫緩！");
return(redraft_cleanup(stream, TRUE));
q_status_message1(SM_ORDER | SM_DING, 3, 5,
- "Empty folder! No messages really %s!",
- (REDRAFT_PPND&flags) ? "postponed" : "interrupted");
+ "空的信件匣。沒有信件真正被%s！",
+ (REDRAFT_PPND&flags) ? "暫緩" : "中斷");
return(redraft_cleanup(stream, FALSE, flags));
}
else if(stream == ps_global->mail_stream){
@@ -749,7 +749,7 @@
@@ -857,10 +857,10 @@
if(count_flagged(stream, F_DEL)
&& want_to(INTR_DEL_PMT, 'n', 0, NO_HELP, WT_NORM) == 'n'){
q_status_message1(SM_ORDER, 3, 3,
- "Undelete %s, and then continue message",
+ "自%s復原刪除，並繼續該信件",
(REDRAFT_PPND&flags)
- ? "messages to remain postponed"
- : "form letters you want to keep");
+ ? "繼續暫緩的信件中"
+ : "您想保留的信件中");
continue;
}
@@ -871,7 +871,7 @@
mn_give(&msgmap);
if(rv){
- q_status_message(SM_ORDER, 0, 3, "Composition cancelled");
+ q_status_message(SM_ORDER, 0, 3, "取消編輯");
(void) redraft_cleanup(stream, FALSE);
(void) redraft_cleanup(stream, FALSE, flags);
return(0); /* special case */
}
@@ -992,7 +992,7 @@
@@ -1145,7 +1145,7 @@
if(b->type == TYPEMULTIPART){
if(strucmp(b->subtype, "mixed")){
q_status_message1(SM_INFO, 3, 4,
@ -113,16 +146,16 @@
b->subtype);
fs_give((void **)&b->subtype);
b->subtype = cpystr("mixed");
@@ -1000,7 +1000,7 @@
@@ -1153,7 +1153,7 @@
}
else{
q_status_message2(SM_ORDER | SM_DING, 3, 4,
- "Unable to resume type %s/%s message",
+ "無法繼續形態為 %s/%s 的信件",
body_types[b->type], b->subtype);
return(redraft_cleanup(stream, TRUE));
return(redraft_cleanup(stream, TRUE, flags));
}
@@ -1014,7 +1014,7 @@
@@ -1167,7 +1167,7 @@
set_mime_type_by_grope(&part->body, NULL);
if(part->body.type != TYPETEXT){
q_status_message2(SM_ORDER | SM_DING, 3, 4,
@ -130,17 +163,21 @@
+ "無法繼續；第一部份非純文字：%s/%s",
body_types[part->body.type],
part->body.subtype);
return(redraft_cleanup(stream, TRUE));
@@ -1075,7 +1075,7 @@
return(redraft_cleanup(stream, TRUE, flags));
@@ -1229,9 +1229,9 @@
if(stream == ps_global->mail_stream){
q_status_message1(SM_ORDER, 3, 7,
- "No more postponed messages, returning to \"%s\"",
+ "沒有遭暫緩的信件了，回到 \"%s\"",
q_status_message2(SM_ORDER, 3, 7,
- "No more %s, returning to \"%s\"",
- (REDRAFT_PPND&flags) ? "postponed messages"
- : "form letters",
+ "沒有%s了，回到 \"%s\"",
+ (REDRAFT_PPND&flags) ? "遭暫緩的信件"
+ : " form letter ",
ps_global->inbox_name);
do_broach_folder(ps_global->inbox_name,
ps_global->context_list);
@@ -1096,7 +1096,7 @@
@@ -1252,7 +1252,7 @@
if(!(rv = mail_delete(stream, mbox)))
q_status_message1(SM_ORDER|SM_DING, 3, 3,
@ -149,7 +186,7 @@
fs_give((void **) &mbox);
success = rv > 0L;
@@ -1119,7 +1119,7 @@
@@ -1275,7 +1275,7 @@
{
if(background_posting(FALSE)){
q_status_message1(SM_ORDER, 0, 3,
@ -158,7 +195,7 @@
type);
return(failure);
}
@@ -1342,7 +1342,7 @@
@@ -1498,7 +1498,7 @@
if(rc == 1 || (rc == 0 && !answer)) {
q_status_message(SM_ORDER, 3, 4,
@ -167,7 +204,7 @@
return(0);
}
@@ -1431,7 +1431,7 @@
@@ -1587,7 +1587,7 @@
if(rc == 1 || (rc == 0 && !answer)) {
q_status_message(SM_ORDER, 3, 4,
@ -176,7 +213,7 @@
return(0);
}
@@ -1487,7 +1487,7 @@
@@ -1643,7 +1643,7 @@
if(rc == 1 || (rc == 0 && answer[0] == '\0')) {
q_status_message(SM_ORDER, 3, 4,
@ -185,57 +222,57 @@
return(0);
}
@@ -1514,31 +1514,31 @@
@@ -1670,31 +1670,31 @@
*/
static struct headerentry he_template[]={
{"From : ", "From", h_composer_from, 10, 0, NULL,
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
+ build_address, NULL, NULL, addr_book_compose, "地址簿",
- build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL,
+ build_address, NULL, NULL, addr_book_compose, "地址簿", NULL,
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
{"Reply-To: ", "Reply To", h_composer_reply_to, 10, 0, NULL,
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
+ build_address, NULL, NULL, addr_book_compose, "地址簿",
- build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL,
+ build_address, NULL, NULL, addr_book_compose, "地址簿", NULL,
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
{"To : ", "To", h_composer_to, 10, 0, NULL,
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
+ build_address, NULL, NULL, addr_book_compose, "地址簿",
- build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL,
+ build_address, NULL, NULL, addr_book_compose, "地址簿", NULL,
0, 1, 0, 0, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
{"Cc : ", "Cc", h_composer_cc, 10, 0, NULL,
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
+ build_address, NULL, NULL, addr_book_compose, "地址簿",
- build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL,
+ build_address, NULL, NULL, addr_book_compose, "地址簿", NULL,
0, 1, 0, 0, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
{"Bcc : ", "Bcc", h_composer_bcc, 10, 0, NULL,
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
+ build_address, NULL, NULL, addr_book_compose, "地址簿",
- build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL,
+ build_address, NULL, NULL, addr_book_compose, "地址簿", NULL,
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
{"Newsgrps: ", "Newsgroups", h_composer_news, 10, 0, NULL,
- news_build, NULL, NULL, news_group_selector, "To NwsGrps",
+ news_build, NULL, NULL, news_group_selector, "新聞組群列表",
- news_build, NULL, NULL, news_group_selector, "To NwsGrps", NULL,
+ news_build, NULL, NULL, news_group_selector, "新聞組群列表", NULL,
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_NONE},
{"Fcc : ", "Fcc", h_composer_fcc, 10, 0, NULL,
- NULL, NULL, NULL, folders_for_fcc, "To Fldrs",
+ NULL, NULL, NULL, folders_for_fcc, "資料匣列表",
- NULL, NULL, NULL, folders_for_fcc, "To Fldrs", NULL,
+ NULL, NULL, NULL, folders_for_fcc, "資料匣列表", NULL,
0, 0, 0, 1, 1, 1, 0, 0, 0, 0, KS_NONE},
{"Lcc : ", "Lcc", h_composer_lcc, 10, 0, NULL,
- build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"To AddrBk",
+ build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"地址簿",
- build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"To AddrBk", NULL,
+ build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"地址簿", NULL,
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_NONE},
{"Attchmnt: ", "Attchmnt", h_composer_attachment, 10, 0, NULL,
- NULL, NULL, NULL, NULL, "To Files",
+ NULL, NULL, NULL, NULL, "檔案列表",
- NULL, NULL, NULL, NULL, "To Files", NULL,
+ NULL, NULL, NULL, NULL, "檔案列表", NULL,
0, 1, 1, 0, 0, 1, 0, 0, 0, 0, KS_NONE},
{"Subject : ", "Subject", h_composer_subject, 10, 0, NULL,
valid_subject, NULL, NULL, NULL, NULL,
@@ -1573,7 +1573,7 @@
valid_subject, NULL, NULL, NULL, NULL, NULL,
@@ -1729,7 +1729,7 @@
static struct headerentry he_custom_addr_templ={
NULL, NULL, h_composer_custom_addr,10, 0, NULL,
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
+ build_address, NULL, NULL, addr_book_compose, "地址簿",
- build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL,
+ build_address, NULL, NULL, addr_book_compose, "地址簿", NULL,
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK};
static struct headerentry he_custom_free_templ={
NULL, NULL, h_composer_custom_free,10, 0, NULL,
@@ -1856,7 +1856,7 @@
@@ -2012,7 +2012,7 @@
default:
q_status_message1(SM_ORDER,3,3,
@ -244,7 +281,7 @@
break;
}
}
@@ -1866,7 +1866,7 @@
@@ -2022,7 +2022,7 @@
ekey[0].ch = ctrl('T');
ekey[0].rval = 2;
ekey[0].name = "^T";
@ -253,7 +290,7 @@
ekey[1].ch = -1;
/*----------------------------------------------------------------------
@@ -1977,12 +1977,12 @@
@@ -2133,12 +2133,12 @@
opts[i].ch = 'y';
opts[i].rval = 'y';
opts[i].name = "Y";
@ -268,7 +305,7 @@
verbose_requested = 0;
if(F_ON(F_VERBOSE_POST, ps_global)){
@@ -2029,7 +2029,7 @@
@@ -2185,7 +2185,7 @@
dsn_show = (dsn_requested & DSN_SHOW);
sprintf(tmp_20k_buf,
"%s%s%s%s%s%sto \"%s\" ? ",
@ -277,16 +314,16 @@
(verbose_requested || dsn_show)
? "(" : "",
(verbose_requested)
@@ -2166,7 +2166,7 @@
@@ -2323,7 +2323,7 @@
if(!(outgoing->to || outgoing->cc || outgoing->bcc
|| local_so)){
|| lmc.so)){
q_status_message(SM_ORDER, 3, 5,
- "No recipients specified!");
+ "尚未指定收件人！");
continue;
}
@@ -2191,7 +2191,7 @@
@@ -2348,7 +2348,7 @@
}
else if(result == 0){
q_status_message(SM_ORDER,3,5,
@ -295,7 +332,7 @@
retval = -1;
dprint(1,
(debugfile, "explicit fcc write failed!\n"));
@@ -2209,7 +2209,7 @@
@@ -2366,7 +2366,7 @@
}
}
else{
@ -304,7 +341,7 @@
retval = -1;
}
}
@@ -2237,7 +2237,7 @@
@@ -2394,7 +2394,7 @@
break;
case 1:
@ -313,7 +350,7 @@
done++;
retval = -1;
break;
@@ -2488,7 +2488,7 @@
@@ -2656,7 +2656,7 @@
break;
case 'x': /* ^C */
@ -322,7 +359,7 @@
dprint(4, (debugfile, "=== send: cancelled\n"));
pbuf = save_previous_pbuf;
return;
@@ -2879,7 +2879,7 @@
@@ -3065,7 +3065,7 @@
default:
q_status_message1(SM_ORDER,3,7,
@ -331,8 +368,8 @@
(void *)pf->type);
break;
}
@@ -2906,7 +2906,7 @@
#endif
@@ -3092,7 +3092,7 @@
!(role && role->from))){
if(pf->canedit || !he->rich_header)
q_status_message(SM_ORDER, 3, 3,
- "Not allowed to change header \"From\"");
@ -340,7 +377,7 @@
memset(he, 0, (size_t)sizeof(*he));
pf->he = NULL;
@@ -3254,7 +3254,7 @@
@@ -3438,7 +3438,7 @@
? "CANCEL" : "HUH?"));
if((editor_result & COMP_CANCEL)
&& F_ON(F_QUELL_DEAD_LETTER, ps_global)){
@ -349,7 +386,7 @@
break;
}
@@ -3278,7 +3278,7 @@
@@ -3462,7 +3462,7 @@
&& (check_addresses(&header) == CA_BAD)){
/*--- Addresses didn't check out---*/
q_status_message(SM_ORDER, 7, 7,
@ -358,8 +395,8 @@
continue;
}
@@ -3336,7 +3336,7 @@
if(!so_puts(local_so, tmp_20k_buf)){
@@ -3521,7 +3521,7 @@
if(!so_puts(lmc.so, tmp_20k_buf)){
if(editor_result & COMP_CANCEL)
q_status_message2(SM_ORDER | SM_DING, 3, 3,
- "Can't write \"%s\": %s",
@ -367,7 +404,7 @@
folder, error_description(errno));
else
dprint(1, (debugfile, "* * * CAN'T WRITE %s: %s\n",
@@ -3349,7 +3349,7 @@
@@ -3534,7 +3534,7 @@
if(!ps_global->VAR_POSTPONED_FOLDER
|| !ps_global->VAR_POSTPONED_FOLDER[0]){
q_status_message(SM_ORDER | SM_DING, 3, 3,
@ -376,7 +413,7 @@
continue;
}
@@ -3379,7 +3379,7 @@
@@ -3564,7 +3564,7 @@
}
else{
strcpy(folder, ps_global->VAR_POSTPONED_FOLDER);
@ -384,8 +421,8 @@
+ strcpy(label, "暫緩信件");
}
local_so = open_fcc(folder,&fcc_cntxt, 1, NULL, NULL);
@@ -3521,10 +3521,10 @@
lmc.so = open_fcc(folder,&fcc_cntxt, 1, NULL, NULL);
@@ -3706,10 +3706,10 @@
&& ps_global->VAR_FORM_FOLDER[0]
&& !strcmp(folder, ps_global->VAR_FORM_FOLDER))
q_status_message(SM_ORDER, 0, 3,
@ -398,7 +435,7 @@
break; /* postpone went OK, get out of here */
}
@@ -3534,15 +3534,15 @@
@@ -3719,15 +3719,15 @@
if(fcc_result && folder)
lc = last_cmpnt(folder);
@ -417,7 +454,7 @@
body_start = 1;
continue; /* postpone failed, jump back in to composer */
}
@@ -3558,14 +3558,14 @@
@@ -3743,7 +3743,7 @@
/* --- If posting, confirm with user ----*/
if(outgoing->newsgroups && *outgoing->newsgroups
&& want_to(POST_PMT, 'n', 'n', NO_HELP, WT_NORM) == 'n'){
@ -426,17 +463,25 @@
dprint(4, (debugfile, "no post, continuing\n"));
continue;
}
if(!(outgoing->to || outgoing->cc || outgoing->bcc || lcc_addr
|| outgoing->newsgroups || (fcc && fcc[0]))){
- q_status_message(SM_ORDER, 3, 4, "No recipients specified!");
+ q_status_message(SM_ORDER, 3, 4, "尚未指定收件者！");
dprint(4, (debugfile, "no recip, continuing\n"));
continue;
}
@@ -3607,8 +3607,8 @@
@@ -3752,13 +3752,13 @@
|| outgoing->newsgroups)){
if(fcc && fcc[0]){
if(F_OFF(F_AUTO_FCC_ONLY, ps_global) &&
- want_to("No recipients, really copy only to Fcc ",
+ want_to("尚未指定收件者，真的僅複製到 Fcc 中嗎",
'n', 'n', h_send_fcc_only, WT_NORM) != 'y')
continue;
}
else{
q_status_message(SM_ORDER, 3, 4,
- "No recipients specified!");
+ "尚未指定收件者！");
dprint(4, (debugfile, "no recip, continuing\n"));
continue;
}
@@ -3802,8 +3802,8 @@
&& !filter_message_text(sending_filter_requested, outgoing,
*body, &orig_so)){
*body, &orig_so, &header)){
q_status_message1(SM_ORDER, 3, 3,
- "Problem filtering! Nothing sent%s.",
- fcc ? " or saved to fcc" : "");
@ -445,7 +490,7 @@
continue;
}
@@ -3699,7 +3699,7 @@
@@ -3894,7 +3894,7 @@
}
else if(!(result & (P_MAIL_BITS | P_NEWS_BITS))){
q_status_message(SM_ORDER, 3, 5,
@ -454,7 +499,7 @@
dprint(1, (debugfile,
"explicit fcc write failed!\n"));
result |= P_FCC_LOSE;
@@ -3766,7 +3766,7 @@
@@ -3961,7 +3961,7 @@
}
else if(!(result & (P_MAIL_BITS | P_NEWS_BITS))){
q_status_message(SM_ORDER,3,5,
@ -463,7 +508,7 @@
dprint(1, (debugfile, "explicit fcc write failed!\n"));
result |= P_FCC_LOSE;
}
@@ -3852,8 +3852,8 @@
@@ -4048,8 +4048,8 @@
postpone_prompt()
{
int ret = 1;
@ -474,7 +519,7 @@
{-1, 0, NULL, NULL} };
return(radio_buttons(PSTPN_FORM_PMT, -FOOTER_ROWS(ps_global),
@@ -4005,23 +4005,23 @@
@@ -4201,23 +4201,23 @@
char *buf;
int *goodorbad;
{
@ -506,7 +551,7 @@
(result & P_FCC_WIN) ? "\"" : "",
(result & P_FCC_WIN) ? fcc_name : "",
(result & P_FCC_WIN) ? "\"" : "");
@@ -4060,7 +4060,7 @@
@@ -4256,7 +4256,7 @@
|| (F_ON(F_COMPOSE_REJECTS_UNQUAL, ps_global)
&& a->host[0] == '@'))){
q_status_message2(SM_ORDER, 4, 7,
@ -515,7 +560,7 @@
a->mailbox,
(a->host[0] == '.')
? a->host
@@ -4070,7 +4070,7 @@
@@ -4266,7 +4266,7 @@
else if(ps_global->restricted
&& !address_is_us(*pf->addr, ps_global)){
q_status_message(SM_ORDER, 3, 3,
@ -524,7 +569,7 @@
return(CA_BAD);
}
else if(a->mailbox && strucmp(a->mailbox, "mailer-daemon") == 0
@@ -4220,7 +4220,7 @@
@@ -4417,7 +4417,7 @@
if(!(n > 0L && n <= mn_get_total(ps_global->msgmap)
&& (e = mail_fetchstructure(ps_global->mail_stream,
mn_m2raw(ps_global->msgmap, n), &b)))){
@ -533,7 +578,7 @@
flush_status_messages(0);
return(0L);
}
@@ -4235,7 +4235,7 @@
@@ -4432,7 +4432,7 @@
/* actually write message text */
if(!format_message(mn_m2raw(ps_global->msgmap, n), e, b,
FM_NEW_MESS | FM_DISPLAY, f)){
@ -542,7 +587,7 @@
flush_status_messages(0);
rv = 0L;
}
@@ -4348,12 +4348,12 @@
@@ -4545,12 +4545,12 @@
opts[i].ch = 'y';
opts[i].rval = 'y';
opts[i].name = "Y";
@ -557,7 +602,7 @@
if(filters){
/* set global_filter_pointer to desired filter or NULL if none */
@@ -4361,12 +4361,12 @@
@@ -4558,12 +4558,12 @@
opts[i].ch = ctrl('P');
opts[i].rval = 10;
opts[i].name = "^P";
@ -572,36 +617,50 @@
if(F_ON(F_FIRST_SEND_FILTER_DFLT, ps_global))
filters = filters->next;
@@ -4436,23 +4436,23 @@
p = NULL;
@@ -4647,11 +4647,11 @@
lparen = 0;
dsn_show = (dsn_requested & DSN_SHOW);
- sprintf(tmp_20k_buf, "Send message%s%s%s%s%s%s%s%s%s%s%s%s? ",
+ sprintf(tmp_20k_buf, "送出信件%s%s%s%s%s%s%s%s%s%s%s%s? ",
(filters || verbose_requested || background_requested
|| dsn_show)
? " (" : "",
- (filters && filters->filter) ? "filtered thru \"" : "",
+ (filters && filters->filter) ? "經由過濾器 \"" : "",
(filters)
? (filters->filter
? filters->filter
- : "unfiltered")
+ : "未經過濾")
: "",
(filters && filters->filter) ? "\"" : "",
(filters && (verbose_requested || background_requested))
? " " : "",
(verbose_requested || background_requested)
? "in " : "",
- (verbose_requested) ? "verbose " : "",
- (background_requested) ? "background " : "",
+ (verbose_requested) ? "顯示細節 " : "",
+ (background_requested) ? "背景送出 " : "",
(verbose_requested || background_requested)
? "mode" : "",
(dsn_show
@@ -4467,11 +4467,11 @@
- strcpy(tmp_20k_buf, "Send message");
- optp = &tmp_20k_buf[12];
+ strcpy(tmp_20k_buf, "送出信件");
+ optp = &tmp_20k_buf[8];
if(F_ON(F_NO_FCC_ATTACH, ps_global) && !lmc.text_only)
- sstrcpy(&optp, " and Fcc Atmts");
+ sstrcpy(&optp, " 與 Fcc 附件？");
if(filters){
if(!lparen){
@@ -4663,12 +4663,12 @@
*optp++ = ' ';
if(filters->filter){
- sstrcpy(&optp, "filtered thru \"");
+ sstrcpy(&optp, "經由過濾器 \"");
sstrcpy(&optp, filters->filter);
*optp++ = '\"';
}
else
- sstrcpy(&optp, "unfiltered");
+ sstrcpy(&optp, "未經過濾");
}
if(verbose_requested || background_requested){
@@ -4682,10 +4682,10 @@
sstrcpy(&optp, "in ");
if(verbose_requested)
- sstrcpy(&optp, "verbose ");
+ sstrcpy(&optp, "顯示細節 ");
if(background_requested)
- sstrcpy(&optp, "background ");
+ sstrcpy(&optp, "背景送出 ");
sstrcpy(&optp, "mode");
}
@@ -4727,11 +4727,11 @@
*p = ' ';
if(verbose_label)
@ -613,9 +672,9 @@
- ? "Foreground" : "Background";
+ ? "前景" : "背景";
if(F_ON(F_DSN, ps_global)){
if(dsn_requested & DSN_SHOW){
@@ -4495,11 +4495,11 @@
if(fcc_label)
opts[fcc_label].label = lmc.text_only ? "Fcc Attchmnts"
@@ -4763,11 +4763,11 @@
break;
}
else if(rv == 'n'){ /* Declined! */
@ -628,8 +687,8 @@
+ rstr = "取消送件";
break;
}
else if(rv == 10) /* PREVIOUS filter */
@@ -4681,7 +4681,7 @@
else if(rv == 10){ /* PREVIOUS filter */
@@ -4954,7 +4954,7 @@
if(body->type != TYPEOTHER){
rv = 1;
q_status_message3(SM_ORDER, 0, 3,
@ -638,7 +697,7 @@
body_types[body->type],
body->subtype ? body->subtype : rfc822_default_subtype(body->type));
}
@@ -4730,7 +4730,7 @@
@@ -5003,7 +5003,7 @@
(void) close_system_pipe(&syspipe);
if((l = name_file_size(fname)) < 0L){
q_status_message2(SM_ORDER | SM_DING, 3, 4,
@ -647,7 +706,7 @@
fnp = error_description(errno));
dprint(1, (debugfile,
"!!! Upload cmd \"%s\" failed for \"%s\": %s\n",
@@ -4742,7 +4742,7 @@
@@ -5015,7 +5015,7 @@
return(l >= 0);
}
else
@ -656,7 +715,7 @@
return(0);
}
@@ -4795,7 +4795,7 @@
@@ -5068,7 +5068,7 @@
else if(reply->flags == REPLY_MSGNO)
return;
@ -665,16 +724,16 @@
if(!stream){
if(stream = mail_open(NULL, reply->mailbox, OP_SILENT)){
ourstream++;
@@ -4873,7 +4873,7 @@
@@ -5164,7 +5164,7 @@
so_give(&tmpf_so);
}
else
- errstr = "Can't create space for filter temporary file.";
+ errstr = "無法建立過濾器的暫存檔。";
}
if(!errstr){
@@ -4897,13 +4897,13 @@
else if(include_hdrs){
/*
@@ -5222,13 +5222,13 @@
so_give(&tmpf_so);
}
else
@ -691,7 +750,7 @@
}
else
errstr = gf_filter(cmd, key ? filter_session_key() : NULL,
@@ -4914,7 +4914,7 @@
@@ -5242,7 +5242,7 @@
if(errstr){
int ch;
@ -700,7 +759,7 @@
fflush(stdout);
while((ch = read_char(300)) != ctrl('M')
&& ch != NO_OP_IDLE)
@@ -5007,7 +5007,7 @@
@@ -5338,7 +5338,7 @@
if(tmp_so)
so_give(&tmp_so);
@ -709,7 +768,7 @@
errstr);
dprint(1, (debugfile, "Filter FAILED: %s\n", errstr));
}
@@ -5092,11 +5092,11 @@
@@ -5423,11 +5423,11 @@
loser = pine_simple_send(outgoing, &body, NULL, NULL, NULL, 0);
@ -723,7 +782,7 @@
mail_free_envelope(&outgoing);
pine_free_body(&body);
@@ -5180,7 +5180,7 @@
@@ -5511,7 +5511,7 @@
if(!pf){
q_status_message(SM_ORDER,3,3,
@ -732,7 +791,7 @@
return(0);
}
@@ -5189,7 +5189,7 @@
@@ -5520,7 +5520,7 @@
gf_filter_init(); /* zero piped byte count, 'n */
send_bytes_to_send = send_body_size(body); /* count body bytes */
ps_global->c_client_error[0] = error_buf[0] = '\0';
@ -741,7 +800,7 @@
send_bytes_to_send ? sent_percent : NULL, 1);
/* try posting via local "<mta> <-t>" if specified */
@@ -5374,7 +5374,7 @@
@@ -5705,7 +5705,7 @@
struct headerentry *last_he = NULL;
sprintf(error_buf,
@ -750,7 +809,7 @@
(sending_stream && sending_stream->reply) ? ": ": ".",
(sending_stream && sending_stream->reply)
? sending_stream->reply : "");
@@ -5447,7 +5447,7 @@
@@ -5778,7 +5778,7 @@
TIME_STAMP("smtp done", 1);
}
else if(!error_mess)
@ -759,16 +818,16 @@
ps_global->c_client_error);
if(verbose_file){
@@ -5455,7 +5455,7 @@
@@ -5786,7 +5786,7 @@
TIME_STAMP("verbose start", 1);
fclose(verbose_send_output);
verbose_send_output = NULL;
- q_status_message(SM_ORDER, 0, 3, "Verbose SMTP output received");
+ q_status_message(SM_ORDER, 0, 3, "收到詳細的 SMTP 輸出訊息");
display_output_file(verbose_file, "Verbose SMTP Interaction",NULL, 1);
display_output_file(verbose_file, "Verbose SMTP Interaction",
NULL, DOF_BRIEF);
TIME_STAMP("verbose end", 1);
}
@@ -5544,12 +5544,12 @@
@@ -5876,12 +5876,12 @@
if(folder_index(fcc, *fcc_cntxt, FI_FOLDER) < 0){
if(ps_global->context_list->next)
sprintf(tmp_20k_buf,
@ -783,7 +842,7 @@
strsquish(tmp_20k_buf + 500, fcc, 40));
if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){
@@ -5586,7 +5586,7 @@
@@ -5918,7 +5918,7 @@
ok++;
}
else{
@ -792,7 +851,7 @@
strsquish(tmp_20k_buf + 500, fcc, 40));
if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){
/*
@@ -5620,8 +5620,8 @@
@@ -5952,8 +5952,8 @@
if(ok == 0){
if(ps_global->mm_log_error){
@ -803,7 +862,7 @@
l1 = strlen(s1);
l2 = strlen(s2);
@@ -5639,10 +5639,10 @@
@@ -5971,10 +5971,10 @@
}
else
@ -816,7 +875,7 @@
q_status_message(SM_ORDER | SM_DING, 3, 3, errstr);
}
@@ -5690,7 +5690,7 @@
@@ -6022,7 +6022,7 @@
if(label && *label){
char msg_buf[80];
@ -825,7 +884,7 @@
we_cancel = busy_alarm(1, msg_buf, NULL, 1);
}
else
@@ -5726,7 +5726,7 @@
@@ -6058,7 +6058,7 @@
we_cancel = 0;
q_status_message1(SM_ORDER | SM_DING, 3, 5,
@ -834,7 +893,7 @@
dprint(1, (debugfile, "ERROR appending %s in \"%s\"",
fcc, cntxt ? cntxt->context : "NULL"));
return(0);
@@ -6209,7 +6209,7 @@
@@ -6548,7 +6548,7 @@
if((file_contents = (void *)so_get(FileStar, pa->filename,
READ_ACCESS)) == NULL){
q_status_message2(SM_ORDER | SM_DING, 3, 4,
@ -843,7 +902,7 @@
error_description(errno), pa->filename);
display_message('x');
continue;
@@ -6736,13 +6736,17 @@
@@ -7083,13 +7083,17 @@
body->subtype = cpystr("octet-stream");
}
@ -868,9 +927,9 @@
}
}
@@ -6912,6 +6916,9 @@
value = rfc1522_encode(tmp_20k_buf, (unsigned char *) text,
ps_global->VAR_CHAR_SET);
@@ -7260,6 +7264,9 @@
ps_global->VAR_CHAR_SET,
encode_whole_header(field, header));
+ if (!strcmp(field, "Subject"))
+ value = text;
@ -878,7 +937,7 @@
if(value && value == text){ /* no encoding was done, have to fold */
int fold_by, len;
char *actual_field;
@@ -7254,7 +7261,7 @@
@@ -7713,7 +7720,7 @@
break;
default:
@ -887,7 +946,7 @@
break;
}
}
@@ -7573,7 +7580,8 @@
@@ -8034,7 +8041,8 @@
switch (body->encoding) { /* all else needs filtering */
case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
@ -897,7 +956,7 @@
break;
case ENCBINARY: /* encode binary into BASE64 */
@@ -7587,7 +7595,7 @@
@@ -8048,7 +8056,7 @@
if(encode_error = gf_pipe(gc, l_putc)){ /* shove body part down pipe */
q_status_message1(SM_ORDER | SM_DING, 3, 4,
@ -906,7 +965,7 @@
display_message('x');
}
@@ -7656,7 +7664,7 @@
@@ -8136,7 +8144,7 @@
&& !(so_puts(so, "Content-Transfer-Encoding: ")
&& so_puts(so, body_encodings[(body->encoding==ENCBINARY)
? ENCBASE64
@ -915,7 +974,7 @@
? ENCQUOTEDPRINTABLE
: (body->encoding <= ENCMAX)
? body->encoding
@@ -8279,7 +8287,7 @@
@@ -8801,7 +8809,7 @@
|| (forbid = pine_header_forbidden(name))){
if(forbid)
q_status_message1(SM_ORDER, 3, 3,
@ -924,7 +983,7 @@
*t = save;
continue;
@@ -8396,7 +8404,7 @@
@@ -8947,7 +8955,7 @@
if(ps_global->post){
if(gripe)
q_status_message(SM_ORDER|SM_DING, 3, 3,

8
chinese/pine4/pkg-descr
View file

@ -16,8 +16,8 @@ Also included in dot.pinerc.pgp.sample are example entries needed to
add to your .pinerc to activate the pgp add on scripts pgpdecode,
pgpencode, and pgpsign.
dot.pinerc.sample is an example configuration file can be put into your home
directory as .pinerc.
dot.pinerc.sample is an example configuration file(include PGP support) can be
put into your home directory as .pinerc.
Pine on WWW: http://www.washington.edu/pine/
@ -27,7 +27,7 @@ which is maintained by:
- Adrian Penisoara (Ady)
pine@freebsd.ady.ro
zh-pine 4.04 ports for FreeBSD is maintained by:
zh-pine 4.10 ports for FreeBSD is maintained by:
- Liang Tai Hwa
- Tai-hwa Liang
avatar@www.mmlab.cse.yzu.edu.tw