Fix EN typos
- Corrections for en_US language. - Some whitespace sanitation. git-svn-id: svn://kolibrios.org@10067 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
d7a4b62ed5
commit
ae43d8f454
@ -19,7 +19,7 @@ In panels:
|
|||||||
d) Ctrl+F6 - sorting by date of modification.
|
d) Ctrl+F6 - sorting by date of modification.
|
||||||
7) Ctrl+R - repeated loading of contents of the directory in the active panel.
|
7) Ctrl+R - repeated loading of contents of the directory in the active panel.
|
||||||
8) Delete and F8 - the deleting of the file on which is the cursor.
|
8) Delete and F8 - the deleting of the file on which is the cursor.
|
||||||
9) Insert - the selection by red colour of the file on which is the cursor and cursor update on 1 position downwards.
|
9) Insert - the selection by red color of the file on which is the cursor and cursor update on 1 position downwards.
|
||||||
10) F4 - to open the file for editing in the registered application, according to a contents of the file kfm.ini, unit " < > files association1 ".
|
10) F4 - to open the file for editing in the registered application, according to a contents of the file kfm.ini, unit " < > files association1 ".
|
||||||
11) F7 - creation of the directory in the active panel.
|
11) F7 - creation of the directory in the active panel.
|
||||||
12) F5 - copying file from the active panel in opposite.
|
12) F5 - copying file from the active panel in opposite.
|
||||||
|
@ -317,7 +317,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
|
|||||||
|
|
||||||
printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
|
printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
|
||||||
ret = scanf("%1s",answer);
|
ret = scanf("%1s",answer);
|
||||||
if (ret != 1)
|
if (ret != 1)
|
||||||
{
|
{
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
@ -536,7 +536,7 @@ int main(argc,argv)
|
|||||||
# endif
|
# endif
|
||||||
|
|
||||||
strncpy(filename_try, zipfilename,MAXFILENAME-1);
|
strncpy(filename_try, zipfilename,MAXFILENAME-1);
|
||||||
/* strncpy doesnt append the trailing NULL, of the string is too long. */
|
/* strncpy doesn't append the trailing NULL, of the string is too long. */
|
||||||
filename_try[ MAXFILENAME ] = '\0';
|
filename_try[ MAXFILENAME ] = '\0';
|
||||||
|
|
||||||
# ifdef USEWIN32IOAPI
|
# ifdef USEWIN32IOAPI
|
||||||
@ -567,7 +567,7 @@ int main(argc,argv)
|
|||||||
return do_list(uf);
|
return do_list(uf);
|
||||||
else if (opt_do_extract==1)
|
else if (opt_do_extract==1)
|
||||||
{
|
{
|
||||||
if (opt_extractdir && chdir(dirname))
|
if (opt_extractdir && chdir(dirname))
|
||||||
{
|
{
|
||||||
printf("Error changing into %s, aborting\n", dirname);
|
printf("Error changing into %s, aborting\n", dirname);
|
||||||
exit(-1);
|
exit(-1);
|
||||||
|
@ -77,7 +77,7 @@ uLong filetime(f, tmzip, dt)
|
|||||||
len = MAXFILENAME;
|
len = MAXFILENAME;
|
||||||
|
|
||||||
strncpy(name, f,MAXFILENAME-1);
|
strncpy(name, f,MAXFILENAME-1);
|
||||||
/* strncpy doesnt append the trailing NULL, of the string is too long. */
|
/* strncpy doesn't append the trailing NULL, of the string is too long. */
|
||||||
name[ MAXFILENAME ] = '\0';
|
name[ MAXFILENAME ] = '\0';
|
||||||
|
|
||||||
if (name[len - 1] == '/')
|
if (name[len - 1] == '/')
|
||||||
@ -253,7 +253,7 @@ int main(argc,argv)
|
|||||||
|
|
||||||
zipok = 1 ;
|
zipok = 1 ;
|
||||||
strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
|
strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
|
||||||
/* strncpy doesnt append the trailing NULL, of the string is too long. */
|
/* strncpy doesn't append the trailing NULL, of the string is too long. */
|
||||||
filename_try[ MAXFILENAME ] = '\0';
|
filename_try[ MAXFILENAME ] = '\0';
|
||||||
|
|
||||||
len=(int)strlen(filename_try);
|
len=(int)strlen(filename_try);
|
||||||
|
@ -19,7 +19,7 @@ Contains realization of directory handling functions:
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include "kos32sys1.h"
|
#include "kos32sys1.h"
|
||||||
#include "sys/kos_io.h"
|
#include "sys/kos_io.h"
|
||||||
|
|
||||||
/* defined in newlib headers
|
/* defined in newlib headers
|
||||||
@ -150,10 +150,10 @@ int mkdir(const char *_path, mode_t m)
|
|||||||
|
|
||||||
//debug_board_printf("mkdir start (%s)\n", _path);
|
//debug_board_printf("mkdir start (%s)\n", _path);
|
||||||
memset(di, 0, sizeof(struct fs_dirinfo));
|
memset(di, 0, sizeof(struct fs_dirinfo));
|
||||||
//di.ppath = (char*)_path; // dont work with 70.9
|
//di.ppath = (char*)_path; // don't work with 70.9
|
||||||
strcpy(di->path, _path);
|
strcpy(di->path, _path);
|
||||||
|
|
||||||
int rc = sf_file(9, di); // creat dir
|
int rc = sf_file(9, di); // create dir
|
||||||
if(rc) {
|
if(rc) {
|
||||||
fprintf(stderr, "Error %d creating dir item %s\n", rc, _path);
|
fprintf(stderr, "Error %d creating dir item %s\n", rc, _path);
|
||||||
errno = rc;
|
errno = rc;
|
||||||
@ -165,10 +165,10 @@ int mkdir(const char *_path, mode_t m)
|
|||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////
|
||||||
void __attribute__ ((noinline)) debug_board_write_str(const char* str){
|
void __attribute__ ((noinline)) debug_board_write_str(const char* str){
|
||||||
while(*str)
|
while(*str)
|
||||||
debug_board_write_byte(*str++);
|
debug_board_write_byte(*str++);
|
||||||
}
|
}
|
||||||
|
|
||||||
void __attribute__ ((noinline)) debug_board_printf(const char *format,...)
|
void __attribute__ ((noinline)) debug_board_printf(const char *format,...)
|
||||||
{
|
{
|
||||||
@ -254,4 +254,4 @@ int set_fileinfo(const char *path, fileinfo_t *info)
|
|||||||
:"r" (path), "b" (info));
|
:"r" (path), "b" (info));
|
||||||
return retval;
|
return retval;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -27,20 +27,20 @@ fixed partial
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#define FATTR FS_HIDDEN+FS_SYSTEM+FS_SUBDIR
|
#define FATTR FS_HIDDEN+FS_SYSTEM+FS_SUBDIR
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define UNZIP_INTERNAL
|
#define UNZIP_INTERNAL
|
||||||
#include "unzip.h"
|
#include "unzip.h"
|
||||||
|
|
||||||
// Siemargl fork of Kolibri system API
|
// Siemargl fork of Kolibri system API
|
||||||
#include "kos32sys1.h"
|
#include "kos32sys1.h"
|
||||||
|
|
||||||
static ZCONST char CannotSetItemTimestamps[] =
|
static ZCONST char CannotSetItemTimestamps[] =
|
||||||
"warning: cannot set modif./access times for %s\n %s\n";
|
"warning: cannot set modif./access times for %s\n %s\n";
|
||||||
static ZCONST char CannotGetTimestamps[] =
|
static ZCONST char CannotGetTimestamps[] =
|
||||||
" (warning) cannot get fileinfo for %s\n";
|
" (warning) cannot get fileinfo for %s\n";
|
||||||
|
|
||||||
|
|
||||||
/********************************************************************************************************************/
|
/********************************************************************************************************************/
|
||||||
/*** Function version() */
|
/*** Function version() */
|
||||||
@ -80,7 +80,7 @@ void version(__G)
|
|||||||
|
|
||||||
} /* end function version() */
|
} /* end function version() */
|
||||||
|
|
||||||
|
|
||||||
/********************************************************************************************************************/
|
/********************************************************************************************************************/
|
||||||
/*** Function mapattr() */
|
/*** Function mapattr() */
|
||||||
/********************************************************************************************************************/
|
/********************************************************************************************************************/
|
||||||
@ -99,8 +99,8 @@ int mapattr(__G)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
} /* end function mapattr() */
|
} /* end function mapattr() */
|
||||||
|
|
||||||
|
|
||||||
/********************************************************************************************************************/
|
/********************************************************************************************************************/
|
||||||
/*** Function mapname() */
|
/*** Function mapname() */
|
||||||
/********************************************************************************************************************/
|
/********************************************************************************************************************/
|
||||||
@ -220,9 +220,9 @@ int mapname(__G__ renamed)
|
|||||||
default:
|
default:
|
||||||
/* disable control character filter when requested,
|
/* disable control character filter when requested,
|
||||||
* else allow 8-bit characters (e.g. UTF-8) in filenames:
|
* else allow 8-bit characters (e.g. UTF-8) in filenames:
|
||||||
*/
|
*/
|
||||||
if ((isprint(workch) || (128 <= workch && workch <= 254)))
|
if ((isprint(workch) || (128 <= workch && workch <= 254)))
|
||||||
*pp++ = (char)workch;
|
*pp++ = (char)workch;
|
||||||
} /* end switch */
|
} /* end switch */
|
||||||
|
|
||||||
} /* end while loop */
|
} /* end while loop */
|
||||||
@ -470,7 +470,7 @@ int checkdir(__G__ pathcomp, flag)
|
|||||||
G.buildpath.
|
G.buildpath.
|
||||||
---------------------------------------------------------------------------*/
|
---------------------------------------------------------------------------*/
|
||||||
if (FUNCTION == GETPATH) {
|
if (FUNCTION == GETPATH) {
|
||||||
// kolibri UTf8 support
|
// kolibri UTf8 support
|
||||||
#ifdef UNICODE_SUPPORT
|
#ifdef UNICODE_SUPPORT
|
||||||
if(G.native_is_utf8)
|
if(G.native_is_utf8)
|
||||||
{
|
{
|
||||||
@ -485,7 +485,7 @@ int checkdir(__G__ pathcomp, flag)
|
|||||||
strcpy(pathcomp + 1, G.buildpath);
|
strcpy(pathcomp + 1, G.buildpath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif // UNICODE_SUPPORT
|
#endif // UNICODE_SUPPORT
|
||||||
strcpy(pathcomp, G.buildpath);
|
strcpy(pathcomp, G.buildpath);
|
||||||
Trace((stderr, "getting and freeing path [%s]\n",
|
Trace((stderr, "getting and freeing path [%s]\n",
|
||||||
@ -635,26 +635,26 @@ int checkdir(__G__ pathcomp, flag)
|
|||||||
return MPN_INVALID; /* should never reach */
|
return MPN_INVALID; /* should never reach */
|
||||||
|
|
||||||
} /* end function checkdir() */
|
} /* end function checkdir() */
|
||||||
|
|
||||||
|
|
||||||
/****************************/
|
/****************************/
|
||||||
/* Function dos_to_kolibri_time() */
|
/* Function dos_to_kolibri_time() */
|
||||||
/****************************/
|
/****************************/
|
||||||
void dos_to_kolibri_time(unsigned dos_datetime, unsigned *fdat, unsigned *ftim)
|
void dos_to_kolibri_time(unsigned dos_datetime, unsigned *fdat, unsigned *ftim)
|
||||||
{
|
{
|
||||||
char* pc = (char*)fdat;
|
char* pc = (char*)fdat;
|
||||||
*pc++ = (dos_datetime >> 16) & 0x1F; // day
|
*pc++ = (dos_datetime >> 16) & 0x1F; // day
|
||||||
*pc++ = (dos_datetime >> 21) & 0xF; // month
|
*pc++ = (dos_datetime >> 21) & 0xF; // month
|
||||||
short *ps = (short*)pc;
|
short *ps = (short*)pc;
|
||||||
*ps = (dos_datetime >> 25) + 1980; // year
|
*ps = (dos_datetime >> 25) + 1980; // year
|
||||||
*ftim = 0;
|
*ftim = 0;
|
||||||
pc = (char*)ftim;
|
pc = (char*)ftim;
|
||||||
*pc++ = (dos_datetime & 0x1F) << 1; // sec
|
*pc++ = (dos_datetime & 0x1F) << 1; // sec
|
||||||
*pc++ = (dos_datetime >> 5) & 0x3F; // min
|
*pc++ = (dos_datetime >> 5) & 0x3F; // min
|
||||||
*pc = (dos_datetime >> 11) & 0x1F; // hour
|
*pc = (dos_datetime >> 11) & 0x1F; // hour
|
||||||
} /* end function dos_to_kolibri_time() */
|
} /* end function dos_to_kolibri_time() */
|
||||||
|
|
||||||
|
|
||||||
/****************************/
|
/****************************/
|
||||||
/* Function close_outfile() */
|
/* Function close_outfile() */
|
||||||
/****************************/
|
/****************************/
|
||||||
@ -667,32 +667,32 @@ void close_outfile(__G) /* GRR: change to return PK-style warning level */
|
|||||||
fclose(G.outfile);
|
fclose(G.outfile);
|
||||||
Trace((stdout, "File (%s) closed\n", FnFilter1(G.filename)));
|
Trace((stdout, "File (%s) closed\n", FnFilter1(G.filename)));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* skip restoring time stamps on user's request */
|
/* skip restoring time stamps on user's request */
|
||||||
if (uO.D_flag <= 1) {
|
if (uO.D_flag <= 1) {
|
||||||
/* set the file's access and modification times */
|
/* set the file's access and modification times */
|
||||||
/* siemargl: dont using extra fields */
|
/* siemargl: don't using extra fields */
|
||||||
unsigned ftim, fdat;
|
unsigned ftim, fdat;
|
||||||
dos_to_kolibri_time(G.lrec.last_mod_dos_datetime, &fdat, &ftim);
|
dos_to_kolibri_time(G.lrec.last_mod_dos_datetime, &fdat, &ftim);
|
||||||
|
|
||||||
fileinfo_t finfo;
|
fileinfo_t finfo;
|
||||||
if (get_fileinfo(G.filename, &finfo))
|
if (get_fileinfo(G.filename, &finfo))
|
||||||
{
|
{
|
||||||
Info(slide, 1, ((char *)slide, CannotGetTimestamps,
|
Info(slide, 1, ((char *)slide, CannotGetTimestamps,
|
||||||
FnFilter1(G.filename)));
|
FnFilter1(G.filename)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
finfo.flags = G.pInfo->file_attr;
|
finfo.flags = G.pInfo->file_attr;
|
||||||
finfo.cr_time = finfo.acc_time = finfo.mod_time = ftim;
|
finfo.cr_time = finfo.acc_time = finfo.mod_time = ftim;
|
||||||
finfo.cr_date = finfo.acc_date = finfo.mod_date = fdat;
|
finfo.cr_date = finfo.acc_date = finfo.mod_date = fdat;
|
||||||
Trace((stderr, "Trying to set fileinfo[%s] date %X, time %X, attr %X\n", FnFilter1(G.filename), fdat, ftim, finfo.flags));
|
Trace((stderr, "Trying to set fileinfo[%s] date %X, time %X, attr %X\n", FnFilter1(G.filename), fdat, ftim, finfo.flags));
|
||||||
|
|
||||||
if (set_fileinfo(G.filename, &finfo))
|
if (set_fileinfo(G.filename, &finfo))
|
||||||
{
|
{
|
||||||
Info(slide, 1, ((char *)slide, CannotSetItemTimestamps,
|
Info(slide, 1, ((char *)slide, CannotSetItemTimestamps,
|
||||||
FnFilter1(G.filename), strerror(errno)));
|
FnFilter1(G.filename), strerror(errno)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (defined(NO_FCHOWN) || defined(NO_FCHMOD))
|
#if (defined(NO_FCHOWN) || defined(NO_FCHMOD))
|
||||||
@ -706,11 +706,11 @@ void close_outfile(__G) /* GRR: change to return PK-style warning level */
|
|||||||
perror("chmod (file attributes) error");
|
perror("chmod (file attributes) error");
|
||||||
#endif
|
#endif
|
||||||
#endif /* NO_FCHOWN || NO_FCHMOD */
|
#endif /* NO_FCHOWN || NO_FCHMOD */
|
||||||
|
|
||||||
|
|
||||||
} /* end function close_outfile() */
|
|
||||||
|
} /* end function close_outfile() */
|
||||||
|
|
||||||
|
|
||||||
/**********************/
|
/**********************/
|
||||||
/* Function do_wild() */ /* for porting: dir separator; match(ignore_case) */
|
/* Function do_wild() */ /* for porting: dir separator; match(ignore_case) */
|
||||||
/**********************/
|
/**********************/
|
||||||
@ -832,49 +832,49 @@ char *do_wild(__G__ wildspec)
|
|||||||
return (char *)NULL;
|
return (char *)NULL;
|
||||||
|
|
||||||
} /* end function do_wild() */
|
} /* end function do_wild() */
|
||||||
|
|
||||||
#ifdef SET_DIR_ATTRIB
|
#ifdef SET_DIR_ATTRIB
|
||||||
int defer_dir_attribs(__G__ pd)
|
int defer_dir_attribs(__G__ pd)
|
||||||
__GDEF
|
__GDEF
|
||||||
direntry **pd;
|
direntry **pd;
|
||||||
{
|
{
|
||||||
// do nothing
|
// do nothing
|
||||||
return PK_OK;
|
return PK_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
int set_direc_attribs(__G__ d)
|
int set_direc_attribs(__G__ d)
|
||||||
__GDEF
|
__GDEF
|
||||||
direntry *d;
|
direntry *d;
|
||||||
{
|
{
|
||||||
/* skip restoring time stamps on user's request */
|
/* skip restoring time stamps on user's request */
|
||||||
if (uO.D_flag <= 0) {
|
if (uO.D_flag <= 0) {
|
||||||
/* set the file's access and modification times */
|
/* set the file's access and modification times */
|
||||||
/* siemargl: dont using extra fields */
|
/* siemargl: don't using extra fields */
|
||||||
unsigned ftim, fdat;
|
unsigned ftim, fdat;
|
||||||
dos_to_kolibri_time(G.lrec.last_mod_dos_datetime, &fdat, &ftim);
|
dos_to_kolibri_time(G.lrec.last_mod_dos_datetime, &fdat, &ftim);
|
||||||
|
|
||||||
fileinfo_t finfo;
|
fileinfo_t finfo;
|
||||||
if (get_fileinfo(G.filename, &finfo))
|
if (get_fileinfo(G.filename, &finfo))
|
||||||
{
|
{
|
||||||
Info(slide, 1, ((char *)slide, CannotGetTimestamps,
|
Info(slide, 1, ((char *)slide, CannotGetTimestamps,
|
||||||
FnFilter1(G.filename)));
|
FnFilter1(G.filename)));
|
||||||
return PK_WARN;
|
return PK_WARN;
|
||||||
}
|
}
|
||||||
finfo.flags = G.pInfo->file_attr;
|
finfo.flags = G.pInfo->file_attr;
|
||||||
finfo.cr_time = finfo.acc_time = finfo.mod_time = ftim;
|
finfo.cr_time = finfo.acc_time = finfo.mod_time = ftim;
|
||||||
finfo.cr_date = finfo.acc_date = finfo.mod_date = fdat;
|
finfo.cr_date = finfo.acc_date = finfo.mod_date = fdat;
|
||||||
Trace((stderr, "Trying to set dirinfo[%s] date %X, time %X, attr %X\n", FnFilter1(G.filename), fdat, ftim, finfo.flags));
|
Trace((stderr, "Trying to set dirinfo[%s] date %X, time %X, attr %X\n", FnFilter1(G.filename), fdat, ftim, finfo.flags));
|
||||||
|
|
||||||
if (set_fileinfo(G.filename, &finfo))
|
if (set_fileinfo(G.filename, &finfo))
|
||||||
{
|
{
|
||||||
Info(slide, 1, ((char *)slide, CannotSetItemTimestamps,
|
Info(slide, 1, ((char *)slide, CannotSetItemTimestamps,
|
||||||
FnFilter1(G.filename), strerror(errno)));
|
FnFilter1(G.filename), strerror(errno)));
|
||||||
return PK_WARN;
|
return PK_WARN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return PK_OK;
|
return PK_OK;
|
||||||
} /* end function set_direc_attribs() */
|
} /* end function set_direc_attribs() */
|
||||||
|
|
||||||
#endif // SET_DIR_ATTRIB
|
#endif // SET_DIR_ATTRIB
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user