Various spelling updates by David Lawrence Ramsey

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@639 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

po/fi.po

@@ -221,7 +221,7 @@ msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kopioi rivi leiketilasta nykyiselle riville"
 
 #: global.c:212
-msgid "Show the posititon of the cursor"
+msgid "Show the position of the cursor"
 msgstr "Nyt kohdistimen sijainti"
 
 #: global.c:213

po/fr.po

@@ -229,7 +229,7 @@ msgid "Uncut from the cutbuffer into the current line"
 msgstr "Copie la chane en mmoire vers la ligne courante"
 
 #: global.c:212
-msgid "Show the posititon of the cursor"
+msgid "Show the position of the cursor"
 msgstr "Affiche la position du curseur"
 
 #: global.c:213

po/gl.po

@@ -219,7 +219,7 @@ msgid "Uncut from the cutbuffer into the current line"
 msgstr "Pegar do buffer de cortado na lia actual"
 
 #: global.c:212
-msgid "Show the posititon of the cursor"
+msgid "Show the position of the cursor"
 msgstr "Amosa-la posicin do cursor"
 
 #: global.c:213

po/hu.po

@@ -222,7 +222,7 @@ msgid "Uncut from the cutbuffer into the current line"
 msgstr "A cutbufferben lv sor beillesztse az aktulis sorba"
 
 #: global.c:212
-msgid "Show the posititon of the cursor"
+msgid "Show the position of the cursor"
 msgstr "A kurzor helynek mutatsa"
 
 #: global.c:213

po/id.po

@@ -222,7 +222,7 @@ msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
 #: global.c:212
-msgid "Show the posititon of the cursor"
+msgid "Show the position of the cursor"
 msgstr "Tampilkan posisi kursor"
 
 #: global.c:213

po/it.po

@@ -225,7 +225,7 @@ msgid "Uncut from the cutbuffer into the current line"
 msgstr "Uncut dal cutbuffer dentro la linea corrente"
 
 #: global.c:212
-msgid "Show the posititon of the cursor"
+msgid "Show the position of the cursor"
 msgstr "Mostra la posizione del cursore"
 
 #: global.c:213

rcfile.c

@@ -58,8 +58,8 @@ rcoption rcopts[NUM_RCOPTS] =
 {"nohelp", NO_HELP}, 
 {"suspend", SUSPEND}};
 
-/* We have an error in some part of the rcfile, put it on stderr and
-  make the usr hit return to continue starting up nano */
+/* We have an error in some part of the rcfile; put it on stderr and
+  make the user hit return to continue starting up nano */
 void rcfile_error(char *msg, ...)
 {
     va_list ap;
@@ -75,7 +75,7 @@ void rcfile_error(char *msg, ...)
 
 }
 
-/* Just print the error (one of many perhaps) but don't abort, yet */
+/* Just print the error (one of many, perhaps) but don't abort, yet */
 void rcfile_msg(int *errors, char *msg, ...)
 {
     va_list ap;
@@ -91,7 +91,7 @@ void rcfile_msg(int *errors, char *msg, ...)
 
 }
 
-/* Parse the next word from the string.  Returns NULL of we hit EOL */
+/* Parse the next word from the string.  Returns NULL if we hit EOL */
 char *parse_next_word(char *ptr)
 {
     while (*ptr != ' ' && *ptr != '\n' && ptr != '\0')

search.c

@@ -66,7 +66,7 @@ void search_init_globals(void)
 
 /* Set up the system variables for a search or replace.  Returns -1 on
    abort, 0 on success, and 1 on rerun calling program 
-   Return -2 to run opposite program (searchg -> replace, replace -> search)
+   Return -2 to run opposite program (search -> replace, replace -> search)
 
    replacing = 1 if we call from do_replace, 0 if called from do_search func.
 */
@@ -261,14 +261,14 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
     for (tmp = fileptr->data; tmp != found; tmp++)
 	current_x_find++;
 
-    /* Ensure we haven't wrap around again! */
+    /* Ensure we haven't wrapped around again! */
     if ((search_last_line) && (current_x_find >= beginx)) {
 	if (!quiet)
 	    not_found_msg(needle);
 	return NULL;
     }
 
-    /* Set globals now that we are sure we found something */
+    /* Set globals, now that we are sure we found something */
     current = fileptr;
     current_x = current_x_find;
 
@@ -353,9 +353,9 @@ void print_replaced(int num)
 
 void replace_abort(void)
 {
-    /* Identicle to search_abort, so we'll call it here.  If it
+    /* Identical to search_abort, so we'll call it here.  If it
        does something different later, we can change it back.  For now
-       it's just a waste to duplicat code */
+       it's just a waste to duplicate code */
     search_abort();
     placewewant = xplustabs();
 }
@@ -434,7 +434,7 @@ char *replace_line(void)
 	search_match_count = regmatches[0].rm_eo - regmatches[0].rm_so;
 	new_line_size = replace_regexp(NULL, 0);
 	/* If they specified an invalid subexpression in the replace
-	 * text, return NULL indicating an error */
+	 * text, return NULL, indicating an error */
 	if (new_line_size < 0)
 	    return NULL;
     } else {
@@ -463,7 +463,7 @@ char *replace_line(void)
 
     /* The tail of the original line */
     /* This may expose other bugs, because it no longer
-       goes through each character on the string
+       goes through each character in the string
        and tests for string goodness.  But because
        we can assume the invariant that current->data
        is less than current_x + strlen(last_search) long,
@@ -513,7 +513,7 @@ int do_replace_loop(char *prevanswer, filestruct *begin, int *beginx,
 	if (!fileptr)
 	    break;
 
-	/* Make sure only wholewords are found */
+	/* Make sure only whole words are found */
 	if (wholewords)
 	{
 	    /* start of line or previous character not a letter */
@@ -610,7 +610,7 @@ int do_replace(void)
 	return 0;
     }
 
-    /* Again, there was a previous string but they deleted it and hit enter */
+    /* Again, there was a previous string, but they deleted it and hit enter */
     if (!ISSET(PICO_MODE) && !strcmp(answer, "")) {
 	statusbar(_("Replace Cancelled"));
 	replace_abort();

utils.c

@@ -53,7 +53,7 @@ char *strcasestr(char *haystack, char *needle)
 {
     char *localneedle, *localhaystack, *found, *tmp, *tmp2;
 
-    /* Make a copy of the search string and searcgh space */
+    /* Make a copy of the search string and search space */
     localneedle = nmalloc(strlen(needle) + 2);
     localhaystack = nmalloc(strlen(haystack) + 2);
 
@@ -133,7 +133,7 @@ void *nrealloc(void *ptr, size_t howmuch)
     return r;
 }
 
-/* Copy one malloced string to another pointer.
+/* Copy one malloc()ed string to another pointer.
 
    Should be used as dest = mallocstrcpy(dest, src);
 */

winio.c

@@ -38,7 +38,7 @@
 
 /* winio.c statics */
 static int statblank = 0;	/* Number of keystrokes left after
-				   we call statubar() before we
+				   we call statusbar(), before we
 				   actually blank the statusbar */
 
 /* Local Function Prototypes for only winio.c */
@@ -66,7 +66,7 @@ int do_last_line(void)
     return 1;
 }
 
-/* Like xplustabs, but for a specifc index of a speficific filestruct */
+/* Like xplustabs, but for a specific index of a specific filestruct */
 int xpt(filestruct * fileptr, int index)
 {
     int i, tabs = 0;
@@ -82,7 +82,7 @@ int xpt(filestruct * fileptr, int index)
 	    else
 		tabs += tabsize - (tabs % tabsize);
 	} else if (fileptr->data[i] & 0x80)
-	    /* Make 8 bit chars only 1 collumn! */
+	    /* Make 8 bit chars only 1 column! */
 	    ;
 	else if (fileptr->data[i] < 32)
 	    tabs++;
@@ -149,7 +149,7 @@ int strlenpt(char *buf)
 	    else
 		tabs += tabsize - (tabs % tabsize);
 	} else if (buf[i] & 0x80)
-	    /* Make 8 bit chars only 1 collumn! */
+	    /* Make 8 bit chars only 1 column! */
 	    ;
 	else if (buf[i] < 32)
 	    tabs++;
@@ -159,7 +159,7 @@ int strlenpt(char *buf)
 }
 
 
-/* resets current_y based on the position of current and puts the cursor at 
+/* resets current_y, based on the position of current, and puts the cursor at 
    (current_y, current_x) */
 void reset_cursor(void)
 {
@@ -254,7 +254,7 @@ void nanoget_repaint(char *buf, char *inputbuf, int x)
 #endif
 }
 
-/* Get the input from the kb, this should only be called from statusq */
+/* Get the input from the kb; this should only be called from statusq */
 int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen, 
 	       int start_x)
 {
@@ -621,7 +621,7 @@ void set_modified(void)
 /* And so start the display update routines */
 /* Given a column, this returns the "page" it is on  */
 /* "page" in the case of the display columns, means which set of 80 */
-/* characters is viewable (ie: page 1 shows from 1 to COLS) */
+/* characters is viewable (e.g.: page 1 shows from 1 to COLS) */
 inline int get_page_from_virtual(int virtual)
 {
     int page = 2;
@@ -657,7 +657,7 @@ inline int get_page_end_virtual(int page)
 /* This takes care of the case where there is a mark that covers only */
 /* the current line. */
 
-/* It expects a line with no tab characers (ie: the type that edit_add */
+/* It expects a line with no tab characters (i.e.: the type that edit_add */
 /* deals with */
 void add_marked_sameline(int begin, int end, filestruct * fileptr, int y,
 			 int virt_cur_x, int this_page)
@@ -665,7 +665,7 @@ void add_marked_sameline(int begin, int end, filestruct * fileptr, int y,
     /*
      * The general idea is to break the line up into 3 sections: before
      * the mark, the mark, and after the mark.  We then paint each in
-     * turn (for those that are currently visible, of course
+     * turn (for those that are currently visible, of course)
      *
      * 3 start points: 0 -> begin, begin->end, end->strlen(data)
      *    in data    :    pre          sel           post        
@@ -677,7 +677,7 @@ void add_marked_sameline(int begin, int end, filestruct * fileptr, int y,
     int pre_data_len = begin, sel_data_len = end - begin, post_data_len = 0;	/* Determined from the other two */
 
     /* now fix the start locations & lengths according to the cursor's 
-     * position (ie: our page) */
+     * position (i.e.: our page) */
     if (pre_data_len < this_page_start)
 	pre_data_len = 0;
     else
@@ -731,14 +731,14 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x,
 	      int virt_mark_beginx, int this_page)
 {
 #ifndef NANO_SMALL
-    /* There are quite a few cases that could take place, we'll deal
+    /* There are quite a few cases that could take place; we'll deal
      * with them each in turn */
     if (ISSET(MARK_ISSET)
 	&& !((fileptr->lineno > mark_beginbuf->lineno
 	      && fileptr->lineno > current->lineno)
 	     || (fileptr->lineno < mark_beginbuf->lineno
 		 && fileptr->lineno < current->lineno))) {
-	/* If we get here we are on a line that is atleast
+	/* If we get here we are on a line that is at least
 	 * partially selected.  The lineno checks above determined
 	 * that */
 	if (fileptr != mark_beginbuf && fileptr != current) {
@@ -772,14 +772,14 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x,
 	    }
 	} else if (fileptr == mark_beginbuf) {
 	    /*
-	     * we're updating the line that was first marked
+	     * We're updating the line that was first marked,
 	     * but we're not currently on it.  So we want to
 	     * figure out which half to invert based on our
 	     * relative line numbers.
 	     *
-	     * i.e. If we're above the "beginbuf" line, we want to
-	     * mark the left side.  Otherwise we're below, so we
-	     * mark the right
+	     * I.e. if we're above the "beginbuf" line, we want to
+	     * mark the left side.  Otherwise, we're below, so we
+	     * mark the right.
 	     */
 	    int target;
 
@@ -833,7 +833,7 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x,
 	    }
 
 	} else if (fileptr == current) {
-	    /* we're on the cursor's line, but it's not the first
+	    /* We're on the cursor's line, but it's not the first
 	     * one we marked.  Similar to the previous logic. */
 	    int this_page_start = get_page_start_virtual(this_page),
 		this_page_end = get_page_end_virtual(this_page);
@@ -904,7 +904,7 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x,
  * Just update one line in the edit buffer.  Basically a wrapper for
  * edit_add
  *
- * index gives is a place in the string to update starting from.
+ * index gives us a place in the string to update starting from.
  * Likely args are current_x or 0.
  */
 void update_line(filestruct * fileptr, int index)
@@ -925,7 +925,7 @@ void update_line(filestruct * fileptr, int index)
 
     mvwaddstr(edit, line, 0, hblank);
 
-    /* Next, convert all the tabs to spaces so everything else is easy */
+    /* Next, convert all the tabs to spaces, so everything else is easy */
     index = xpt(fileptr, index);
 
     realdata = fileptr->data;
@@ -961,7 +961,7 @@ void update_line(filestruct * fileptr, int index)
     /* Now, Paint the line */
     if (current == fileptr && index > COLS - 2) {
 	/* This handles when the current line is beyond COLS */
-	/* It requires figureing out what page we're at      */
+	/* It requires figuring out what page we're on      */
 	page = get_page_from_virtual(index);
 	col = get_page_start_virtual(page);
 
@@ -1032,7 +1032,7 @@ void edit_refresh(void)
 }
 
 /*
- * Same as above, but touch the window first so everything is redrawn.
+ * Same as above, but touch the window first, so everything is redrawn.
  */
 void edit_refresh_clearok(void)
 {
@@ -1042,7 +1042,7 @@ void edit_refresh_clearok(void)
 }
 
 /*
- * Nice generic routine to update the edit buffer given a pointer to the
+ * Nice generic routine to update the edit buffer, given a pointer to the
  * file struct =) 
  */
 void edit_update(filestruct * fileptr, int topmidbot)
@@ -1068,7 +1068,7 @@ void edit_update(filestruct * fileptr, int topmidbot)
     edit_refresh();
 }
 
-/* This function updates current based on where current_y is, reset_cursor 
+/* This function updates current, based on where current_y is; reset_cursor 
    does the opposite */
 void update_cursor(void)
 {
@@ -1094,7 +1094,7 @@ void update_cursor(void)
 /*
  * Ask a question on the statusbar.  Answer will be stored in answer
  * global.  Returns -1 on aborted enter, -2 on a blank string, and 0
- * otherwise, the valid shortcut key caught, Def is any editable text we
+ * otherwise, the valid shortcut key caught.  Def is any editable text we
  * want to put up by default.
  *
  * New arg tabs tells whether or not to allow tab completion.
@@ -1268,7 +1268,7 @@ int do_yesno(int all, int leavecursor, char *msg, ...)
 	    break;
 	default:
 
-	    /* Look for the kbinput in the yes, no and (optinally) all str */
+	    /* Look for the kbinput in the yes, no and (optimally) all str */
 	    for (i = 0; yesstr[i] != 0 && yesstr[i] != kbinput; i++)
 		;
 	    if (yesstr[i] != 0) {
@@ -1408,7 +1408,7 @@ int do_cursorpos(void)
 }
 
 /* Our broken, non-shortcut list compliant help function.
-   But hey, it's better than nothing, and it's dynamic! */
+   But, hey, it's better than nothing, and it's dynamic! */
 int do_help(void)
 {
 #ifndef DISABLE_HELP
@@ -1427,7 +1427,7 @@ int do_help(void)
 
     if (ISSET(NO_HELP)) {
 
-	/* Well if we're going to do this, we should at least
+	/* Well, if we're going to do this, we should at least
 	   do it the right way */
 	no_help_flag = 1;
 	UNSET(NO_HELP);
@@ -1466,7 +1466,7 @@ int do_help(void)
 	    break;
 	}
 
-	/* Calculate where in the text we should be based on the page */
+	/* Calculate where in the text we should be, based on the page */
 	for (i = 1; i < page; i++) {
 	    row = 0;
 	    j = 0;
@@ -1495,7 +1495,7 @@ int do_help(void)
 	    }
 	    if (j == COLS - 5) {
 
-		/* Don't print half a word if we've run of of space */
+		/* Don't print half a word if we've run out of space */
 		while (*end != ' ' && *end != '\0') {
 		    end--;
 		    j--;
@@ -1571,7 +1571,7 @@ void dump_buffer_reverse(filestruct * inptr)
 #endif				/* DEBUG */
 }
 
-/* Fix editbot based on the assumption that edittop is correct */
+/* Fix editbot, based on the assumption that edittop is correct */
 void fix_editbot(void)
 {
     int i;
@@ -1589,7 +1589,7 @@ void do_replace_highlight(int highlight_flag, char *word)
     highlight_word = mallocstrcpy(highlight_word, &current->data[current_x]);
     highlight_word[strlen(word)] = '\0';
 
-    /* adjust output when word extends beyond screen*/
+    /* adjust output when word extends beyond screen */
 
     x = xplustabs();
     y = get_page_end_virtual(get_page_from_virtual(x)) + 1;
@@ -1718,7 +1718,7 @@ void do_credits(void)
 int             keypad_on(WINDOW * win, int newval)
 {
 
-/* This is taken right from aumix.  Don't sue me */
+/* This is taken right from aumix.  Don't sue me. */
 #ifdef HAVE_USEKEYPAD
     int             old;