diff --git a/doc/ncdu.pod b/doc/ncdu.pod index 74758218d0466e3b4896ae42be53a402144d5f5b..3783d3c6ce1ee79ff994d78de093e84f0dcd2bd5 100644 --- a/doc/ncdu.pod +++ b/doc/ncdu.pod @@ -273,11 +273,11 @@ flags have the following meaning: =item ! -An error occured while reading this directory. +An error occurred while reading this directory. =item . -An error occured while reading a subdirectory, so the indicated size may not be +An error occurred while reading a subdirectory, so the indicated size may not be correct. =item < @@ -286,7 +286,7 @@ File or directory is excluded from the statistics by using exlude patterns. =item > -Directory is on an other filesystem. +Directory is on another filesystem. =item @ diff --git a/src/delete.c b/src/delete.c index 82e5e9957bd1a196258e986ca9a4960ade606544..4f93a1847127bc16059e02a0370e413ae4ad4621 100644 --- a/src/delete.c +++ b/src/delete.c @@ -195,7 +195,7 @@ static int delete_dir(struct dir *dr) { r = unlink(dr->name); delete_nxt: - /* error occured, ask user what to do */ + /* error occurred, ask user what to do */ if(r == -1 && !ignoreerr) { state = DS_FAILED; lasterrno = errno; diff --git a/src/dir.h b/src/dir.h index 3be4a1cb828294bdd99a156afe96e590935f7593..b7e43d1abec2eebd52505f322ddb3504df7abcfe 100644 --- a/src/dir.h +++ b/src/dir.h @@ -123,7 +123,7 @@ void dir_curpath_set(const char *); void dir_curpath_enter(const char *); void dir_curpath_leave(); -/* Sets the path where the last error occured, or reset on NULL. */ +/* Sets the path where the last error occurred, or reset on NULL. */ void dir_setlasterr(const char *); /* Error message on fatal error, or NULL if there hasn't been a fatal error yet. */ diff --git a/src/dir_common.c b/src/dir_common.c index 5eb2a20e82b345120caab5440477210c606df7e9..508205117f0db242e3ca059bd135672952df6d32 100644 --- a/src/dir_common.c +++ b/src/dir_common.c @@ -36,7 +36,7 @@ struct dir_output dir_output; char *dir_fatalerr; /* Error message on a fatal error. (NULL if there was no fatal error) */ int dir_ui; /* User interface to use */ static int confirm_quit_while_scanning_stage_1_passed; /* Additional check before quitting */ -static char *lasterr; /* Path where the last error occured. */ +static char *lasterr; /* Path where the last error occurred. */ static int curpathl; /* Allocated length of dir_curpath */ static int lasterrl; /* ^ of lasterr */ diff --git a/src/dir_import.c b/src/dir_import.c index a9d1b2279a030133f0c69723de0ee57dc56d2a94..b523849377c74df2ddace35383da26a9e76a82b7 100644 --- a/src/dir_import.c +++ b/src/dir_import.c @@ -81,7 +81,7 @@ struct ctx { /* Fills readbuf with data from the stream. *buf will have at least n (< * READ_BUF_SIZE) bytes available, unless the stream reached EOF or an error - * occured. If the file data contains a null-type, this is considered an error. + * occurred. If the file data contains a null-type, this is considered an error. * Returns 0 on success, non-zero on error. */ static int fill(int n) { int r; diff --git a/src/dir_scan.c b/src/dir_scan.c index 2b0f85e59df8fa4da40175c928b4c836455fdb70..f226114365f1b0514901dda0222651566ccce401 100644 --- a/src/dir_scan.c +++ b/src/dir_scan.c @@ -84,7 +84,7 @@ static void stat_to_dir(struct stat *fs) { /* Reads all filenames in the currently chdir'ed directory and stores it as a * nul-separated list of filenames. The list ends with an empty filename (i.e. * two nuls). . and .. are not included. Returned memory should be freed. *err - * is set to 1 if some error occured. Returns NULL if that error was fatal. + * is set to 1 if some error occurred. Returns NULL if that error was fatal. * The reason for reading everything in memory first and then walking through * the list is to avoid eating too many file descriptors in a deeply recursive * directory. */ diff --git a/src/dirlist.c b/src/dirlist.c index 5cfe52a4b8d7c42e6fe336500806036c9f494330..3b4c655755e5f7eab035a8bf9ea6c698fb388665 100644 --- a/src/dirlist.c +++ b/src/dirlist.c @@ -306,7 +306,7 @@ void dirlist_select(struct dir *d) { * 1 = selected has moved down * -1 = selected has moved up * -2 = selected = first item in the list (faster version of '1') - * -3 = top should be considered as invalid (after sorting or opening an other dir) + * -3 = top should be considered as invalid (after sorting or opening another dir) * -4 = an item has been deleted * -5 = hidden flag has been changed * diff --git a/src/global.h b/src/global.h index 33865eab78345db6be5f07b128e67f115e744b63..effd86f0538356588c112b1e3e02546384efef9e 100644 --- a/src/global.h +++ b/src/global.h @@ -45,7 +45,7 @@ #define FF_DIR 0x01 #define FF_FILE 0x02 #define FF_ERR 0x04 /* error while reading this item */ -#define FF_OTHFS 0x08 /* excluded because it was an other filesystem */ +#define FF_OTHFS 0x08 /* excluded because it was another filesystem */ #define FF_EXL 0x10 /* excluded using exlude patterns */ #define FF_SERR 0x20 /* error in subdirectory */ #define FF_HLNKC 0x40 /* hard link candidate (file with st_nlink > 1) */ diff --git a/src/help.c b/src/help.c index ab6697a432ce12c085ae96c785959ac62522b7b7..1c46b0f381712aca2aa3eb2309e58749364a3c8a 100644 --- a/src/help.c +++ b/src/help.c @@ -97,10 +97,10 @@ void help_draw() { ncaddch(10, 4, 'H'); ncaddch(11, 4, 'e'); uic_set(UIC_DEFAULT); - ncaddstr( 5, 7, "An error occured while reading this directory"); - ncaddstr( 6, 7, "An error occured while reading a subdirectory"); + ncaddstr( 5, 7, "An error occurred while reading this directory"); + ncaddstr( 6, 7, "An error occurred while reading a subdirectory"); ncaddstr( 7, 7, "File or directory is excluded from the statistics"); - ncaddstr( 8, 7, "Directory was on an other filesystem"); + ncaddstr( 8, 7, "Directory was on another filesystem"); ncaddstr( 9, 7, "This is not a file nor a dir (symlink, socket, ...)"); ncaddstr(10, 7, "Same file was already counted (hard link)"); ncaddstr(11, 7, "Empty directory");