Strings corrections from Malcolm Parsons

Fix the spelling and grammar in various comments, variable names, comment
descriptions, and documentation.

AUTHORS

@@ -341,6 +341,9 @@ M. K. Srikant <srix@vsnl.com>
 M. Levinson <levinsm@users.sourceforge.net>
 	Python scripting fixes
 
+Malcolm Parsons <malcolm.parsons@gmail.com>
+	Typo fixes
+
 Marco Bodrato <bodrato@linuz.sns.it>
 	Twinterm support
 

contrib/ruby/hooks.rb

@@ -50,7 +50,7 @@ end
 
 
 # Called when the user decides to load some document by following a link,
-# entering an URL in the goto URL dialog, loading frames from a frameset (?)
+# entering a URL in the goto URL dialog, loading frames from a frameset (?)
 # etc.
 #
 # Arguments:
@@ -63,7 +63,7 @@ def ELinks::follow_url_hook(url)
 end
 
 
-# Called when a HTML document has been loaded - before the document rendering
+# Called when an HTML document has been loaded - before the document rendering
 # begins. Makes it possible to fix up bad HTML code, remove tags etc.
 #
 # Arguments:

doc/events.txt

@@ -138,7 +138,7 @@ Name:		follow-url
 Managed By:	The scripting subsystem/backends
 Triggered When:
 
- The user decides to load some document by following a link, entering an URL
+ The user decides to load some document by following a link, entering a URL
  in the goto URL dialog, loading frames from a frameset (?) etc.
 
 Arguments:

doc/introduction.txt

@@ -172,7 +172,7 @@ Symbol		Description
 'S'		Whether an SSL connection was used.
 'i'/'I'		The state of insert mode for text-input form-fields: 'i'     \
 		means modeless, 'I' means insert mode is on.
-'J'		A JavaScript error has occured.
+'J'		A JavaScript error has occurred.
 'P'		A JavaScript pop-up window was blocked.
 -		Unused.
 -		Unused.

doc/man/man5/elinks.conf.5

@@ -194,11 +194,11 @@ Number of tries to establish a connection\&. Zero means try forever\&.
 
 .TP
 connection\&.try_ipv4 [0|1] (default: 1)
-Whether to try to connect to a host over IPv4\&. Note that if connection\&.try_ipv6 is enabled too, it takes precedence\&. And better do not touch this at all unless you are sure what are you doing\&. Note that you can also force a given protocol to be used on a per\-connection basis by using an URL in the style of e\&.g\&. http4://elinks\&.cz/\&.
+Whether to try to connect to a host over IPv4\&. Note that if connection\&.try_ipv6 is enabled too, it takes precedence\&. And better do not touch this at all unless you are sure what are you doing\&. Note that you can also force a given protocol to be used on a per\-connection basis by using a URL in the style of e\&.g\&. http4://elinks\&.cz/\&.
 
 .TP
 connection\&.try_ipv6 [0|1] (default: 1)
-Whether to try to connect to a host over IPv6\&. Note that you can also force a given protocol to be used on a per\-connection basis by using an URL in the style of e\&.g\&. http6://elinks\&.cz/\&.
+Whether to try to connect to a host over IPv6\&. Note that you can also force a given protocol to be used on a per\-connection basis by using a URL in the style of e\&.g\&. http6://elinks\&.cz/\&.
 
 .TP
 connection\&.unrestartable_receive_timeout <num> (default: 600)
@@ -250,7 +250,7 @@ When enabled, we'll require three dots in cookies domain for all non\-internatio
 
 .TP
 cookies\&.save [0|1] (default: 1)
-Whether cookies should be loaded from and save to disk\&.
+Whether cookies should be loaded from and saved to disk\&.
 
 .TP
 cookies\&.resave [0|1] (default: 1)
@@ -478,7 +478,7 @@ Define how to handle links having target=_blank set:
 
 .TP
 document\&.browse\&.links\&.use_tabindex [0|1] (default: 1)
-Whether to navigate links using tabindex specified ordering\&. The TABINDEX attribute in HTML elements specifies the order in which links should receive focus when using the keyboard to navigating the document\&.
+Whether to navigate links using tabindex specified ordering\&. The TABINDEX attribute in HTML elements specifies the order in which links should receive focus when using the keyboard to navigate the document\&.
 
 .TP
 document\&.browse\&.links\&.missing_fragment [0|1] (default: 1)
@@ -508,7 +508,7 @@ When following a link the user ID part of the URI is checked and if a maliciousl
 
 .TP
 document\&.browse\&.links\&.wraparound [0|1] (default: 0)
-When pressing 'down' on the last link, jump at the first one, and vice versa\&.
+When pressing 'down' on the last link, jump to the first one, and vice versa\&.
 
 .TP
 document\&.browse\&.scrolling
@@ -558,7 +558,7 @@ Enable searching with regular expressions:
 
 .TP
 document\&.browse\&.search\&.show_hit_top_bottom [0|1] (default: 1)
-Whether to show a dialog when the search hits top or bottom of the document\&.
+Whether to show a dialog when the search hits the top or bottom of the document\&.
 
 .TP
 document\&.browse\&.search\&.wraparound [0|1] (default: 1)
@@ -628,7 +628,7 @@ Memory cache size (in bytes)\&.
 
 .TP
 document\&.cache\&.cache_redirects [0|1] (default: 0)
-Cache even redirects sent by server (usually thru HTTP by a 302 HTTP code and a Location header)\&. This was the original behaviour for a quite some time, but it causes problems in a situation very common to various web login systems \- frequently, when accessing certain location, they will redirect you to a login page if they don't receive an auth cookie, the login page then gives you the cookie and redirects you back to the original page, but there you have already cached redirect back to the login page! If this option has value of 0, this malfunction is fixed, but occasionally you may get superfluous (depends on how you take it ;\-) requests to the server\&. If this option has value of 1, experienced users can still workaround it by clever combination of usage of reload, jumping around in session history and hitting ctrl+enter\&. Note that this option is checked when retrieving the information from cache, not when saving it to cache \- thus if you will enable it, even previous redirects will be taken from cache instead of asking the server\&.
+Cache even redirects sent by server (usually thru HTTP by a 302 HTTP code and a Location header)\&. This was the original behaviour for quite some time, but it causes problems in a situation very common to various web login systems \- frequently, when accessing a certain location, they will redirect you to a login page if they don't receive an auth cookie, the login page then gives you the cookie and redirects you back to the original page, but there you have already cached redirect back to the login page! If this option has value of 0, this malfunction is fixed, but occasionally you may get superfluous (depends on how you take it ;\-) requests to the server\&. If this option has value of 1, experienced users can still workaround it by clever combination of usage of reload, jumping around in session history and hitting ctrl+enter\&. Note that this option is checked when retrieving the information from cache, not when saving it to cache \- thus if you enable it, even previous redirects will be taken from cache instead of asking the server\&.
 
 .TP
 document\&.cache\&.ignore_cache_control [0|1] (default: 1)
@@ -688,7 +688,7 @@ Increase the contrast between the foreground and background colors to ensure rea
 
 .TP
 document\&.colors\&.ensure_contrast [0|1] (default: 1)
-Makes sure that the back\- and foreground color are never equal\&.
+Makes sure that the back\- and foreground colors are never equal\&.
 
 .TP
 document\&.colors\&.use_document_colors <num> (default: 2)
@@ -967,7 +967,7 @@ Options for information files in ~/\&.elinks\&.
 
 .TP
 infofiles\&.save_interval <num> (default: 300)
-Interval at which to trigger information files in ~/\&.elinks to be saved to disk if they has changed (seconds; 0 to disable)
+Interval at which to trigger information files in ~/\&.elinks to be saved to disk if they have changed (seconds; 0 to disable)
 
 .TP
 infofiles\&.secure_save [0|1] (default: 1)
@@ -1053,7 +1053,7 @@ Prioritize entries by the order of the files in the mailcap path\&. This means t
 
 .TP
 mime\&.mimetypes
-Options for the support of mime\&.types files\&. These files can be used to find the content type of an URL by looking at the extension of the file name\&.
+Options for the support of mime\&.types files\&. These files can be used to find the content type of a URL by looking at the extension of the file name\&.
 
 .TP
 mime\&.mimetypes\&.enable [0|1] (default: 1)
@@ -1193,7 +1193,7 @@ Whether to allow reading from non\-regular files\&. Note this can be dangerous;
 
 .TP
 protocol\&.file\&.show_hidden_files [0|1] (default: 1)
-When set to false, files with name starting with a dot will be hidden in local directories listing\&.
+When set to false, files with name starting with a dot will be hidden in local directory listings\&.
 
 .TP
 protocol\&.file\&.try_encoding_extensions [0|1] (default: 1)
@@ -2482,11 +2482,11 @@ Make dialogs drop shadows (the shadows are solid, you can adjust their color by
 
 .TP
 ui\&.dialogs\&.underline_hotkeys [0|1] (default: 0)
-Whether to underline hotkeys in menus to make them more visible\&. Requires the underlining is enabled for the terminal\&.
+Whether to underline hotkeys in menus to make them more visible\&. Requires that underlining is enabled for the terminal\&.
 
 .TP
 ui\&.dialogs\&.underline_button_shortcuts [0|1] (default: 0)
-Whether to underline button shortcuts to make them more visible\&. Requires the underlining is enabled for the terminal\&.
+Whether to underline button shortcuts to make them more visible\&. Requires that underlining is enabled for the terminal\&.
 
 .TP
 ui\&.leds
@@ -2552,7 +2552,7 @@ Whether display tab bar at top like other browsers do\&.
 
 .TP
 ui\&.tabs\&.wraparound [0|1] (default: 1)
-When moving right from the last tab, jump at the first one, and vice versa\&.
+When moving right from the last tab, jump to the first one, and vice versa\&.
 
 .TP
 ui\&.tabs\&.confirm_close [0|1] (default: 0)

doc/perl.pod

@@ -12,7 +12,7 @@ documents.
 
 The interface consists of two largely separate and independent parts. The first
 one is where ELinks is the active party, calling Perl I<hooks> upon certain
-events (going to an URL, about to render an HTML document, exiting) and
+events (going to a URL, about to render an HTML document, exiting) and
 conniving the hook results. This part of the interface is not subject of this
 document, however. There is no document dedicated to this so far, however the
 example Perl hooks file (I<contrib/perl/hooks.pl> in the source distribution)

src/bfu/hierbox.c

@@ -164,7 +164,7 @@ hierbox_ev_kbd(struct dialog_data *dlg_data)
 		if (!selected) return EVENT_PROCESSED;
 
 		/* Special trick: if the folder is already
-		 * folded, jump at the parent folder, so the
+		 * folded, jump to the parent folder, so the
 		 * next time when user presses the key, the
 		 * whole parent folder will be closed. */
 		if (list_empty(selected->child)

src/bfu/leds.c

@@ -309,7 +309,7 @@ menu_leds_info(struct terminal *term, void *xxx, void *xxxx)
 			" |||||`- Unused\n"
 			" ||||`-- Unused\n"
 			" |||`--- A JavaScript pop-up window was blocked\n"
-			" ||`---- A JavaScript error has occured\n"
+			" ||`---- A JavaScript error has occurred\n"
 			" |`----- The state of insert mode for text-input form-fields\n"
 			" |       'i' means modeless, 'I' means insert mode is on\n"
 			" `------ Whether an SSL connection was used\n"

src/config/conf.c

@@ -387,7 +387,7 @@ parse_config_file(struct option *options, unsigned char *name,
 		  int is_system_conf)
 {
 	int line = 1;
-	int error_occured = 0;
+	int error_occurred = 0;
 	enum parse_error err = 0;
 	enum verbose_level verbose = get_cmd_opt_int("verbose");
 	unsigned char error_msg[][40] = {
@@ -433,13 +433,13 @@ parse_config_file(struct option *options, unsigned char *name,
 			if (verbose >= VERBOSE_WARNINGS) {
 				fprintf(stderr, "%s:%d: %s\n",
 					name, line, error_msg[err]);
-				error_occured = 1;
+				error_occurred = 1;
 			}
 			err = 0;
 		}
 	}
 
-	if (!error_occured) return;
+	if (!error_occurred) return;
 
 	/* If an error occurred make sure that the user is notified and is able
 	 * to see it. First sound the bell. Then, if the text viewer is going to

src/config/options.inc

@@ -102,7 +102,7 @@ static struct option_info config_options_info[] = {
 		"it takes precedence. And better do not touch this\n"
 		"at all unless you are sure what are you doing.\n"
 		"Note that you can also force a given protocol\n"
-		"to be used on a per-connection basis by using an URL\n"
+		"to be used on a per-connection basis by using a URL\n"
 		"in the style of e.g. http4://elinks.cz/.")),
 #else
 	INIT_OPT_BOOL("connection", N_("Try IPv4 when connecting"),
@@ -110,7 +110,7 @@ static struct option_info config_options_info[] = {
 		N_("Whether to try to connect to a host over IPv4.\n"
 		"Do not touch this option.\n"
 		"Note that you can also force a given protocol\n"
-		"to be used on a per-connection basis by using an URL\n"
+		"to be used on a per-connection basis by using a URL\n"
 		"in the style of e.g. http4://elinks.cz/.")),
 #endif
 
@@ -119,7 +119,7 @@ static struct option_info config_options_info[] = {
 		"try_ipv6", 0, 1,
 		N_("Whether to try to connect to a host over IPv6.\n"
 		"Note that you can also force a given protocol\n"
-		"to be used on a per-connection basis by using an URL\n"
+		"to be used on a per-connection basis by using a URL\n"
 		"in the style of e.g. http6://elinks.cz/.")),
 #endif
 
@@ -326,7 +326,7 @@ static struct option_info config_options_info[] = {
 		N_("Whether to navigate links using tabindex specified ordering.\n"
 		"The TABINDEX attribute in HTML elements specifies the order\n"
 		"in which links should receive focus when using the keyboard\n"
-		"to navigating the document.")),
+		"to navigate the document.")),
 
 	INIT_OPT_BOOL("document.browse.links", N_("Missing fragment reporting"),
 		"missing_fragment", 0, 1,
@@ -350,7 +350,7 @@ static struct option_info config_options_info[] = {
 	 * for now as it doesn't work. */
 	INIT_OPT_BOOL("document.browse.links", N_("Wrap-around links cycling"),
 		"wraparound", /* 0 */ 0, 0,
-		N_("When pressing 'down' on the last link, jump at the first one, and\n"
+		N_("When pressing 'down' on the last link, jump to the first one, and\n"
 		"vice versa.")),
 
 
@@ -400,7 +400,7 @@ static struct option_info config_options_info[] = {
 
 	INIT_OPT_BOOL("document.browse.search", N_("Show search hit top or bottom dialogs"),
 		"show_hit_top_bottom", 0, 1,
-		N_("Whether to show a dialog when the search hits top or bottom of the\n"
+		N_("Whether to show a dialog when the search hits the top or bottom of the\n"
 		"document.")),
 
 	INIT_OPT_BOOL("document.browse.search", N_("Wraparound"),
@@ -461,9 +461,9 @@ static struct option_info config_options_info[] = {
 		"cache_redirects", 0, 0,
 		N_("Cache even redirects sent by server (usually thru HTTP by a 302\n"
 		"HTTP code and a Location header). This was the original behaviour\n"
-		"for a quite some time, but it causes problems in a situation very\n"
+		"for quite some time, but it causes problems in a situation very\n"
 		"common to various web login systems - frequently, when accessing\n"
-		"certain location, they will redirect you to a login page if they\n"
+		"a certain location, they will redirect you to a login page if they\n"
 		"don't receive an auth cookie, the login page then gives you the\n"
 		"cookie and redirects you back to the original page, but there you\n"
 		"have already cached redirect back to the login page! If this\n"
@@ -473,7 +473,7 @@ static struct option_info config_options_info[] = {
 		"still workaround it by clever combination of usage of reload,\n"
 		"jumping around in session history and hitting ctrl+enter.\n"
 		"Note that this option is checked when retrieving the information\n"
-		"from cache, not when saving it to cache - thus if you will enable\n"
+		"from cache, not when saving it to cache - thus if you enable\n"
 		"it, even previous redirects will be taken from cache instead of\n"
 		"asking the server.")),
 
@@ -584,7 +584,7 @@ static struct option_info config_options_info[] = {
 
 	INIT_OPT_BOOL("document.colors", N_("Ensure contrast"),
 		"ensure_contrast", 0, 1,
-		N_("Makes sure that the back- and foreground color are never "
+		N_("Makes sure that the back- and foreground colors are never "
 		"equal.")),
 
 	/* If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -718,7 +718,7 @@ static struct option_info config_options_info[] = {
 		"display_sups", 0, 1,
 		N_("Display superscripts (as ^thing).")),
 
-	INIT_OPT_INT("document.html", N_("Rendering of html link element"),
+	INIT_OPT_INT("document.html", N_("Rendering of HTML link element"),
 		"link_display", 0, 0, 5, 2,
 		N_("How to render <link> tags from the HTML header:\n"
 		"0 is nothing\n"
@@ -784,7 +784,7 @@ static struct option_info config_options_info[] = {
 	INIT_OPT_INT("infofiles", N_("Save interval"),
 		"save_interval", 0, 0, INT_MAX, 300,
 		N_("Interval at which to trigger information files in ~/.elinks\n"
-		"to be saved to disk if they has changed (seconds; 0 to disable)")),
+		"to be saved to disk if they have changed (seconds; 0 to disable)")),
 
 	INIT_OPT_BOOL("infofiles", N_("Use secure file saving"),
 		"secure_save", 0, 1,
@@ -1182,12 +1182,12 @@ static struct option_info config_options_info[] = {
 	INIT_OPT_BOOL("ui.dialogs", N_("Underline menu hotkeys"),
 		"underline_hotkeys", 0, 0,
 		N_("Whether to underline hotkeys in menus to make them more\n"
-		"visible. Requires the underlining is enabled for the terminal.")),
+		"visible. Requires that underlining is enabled for the terminal.")),
 
 	INIT_OPT_BOOL("ui.dialogs", N_("Underline button shortcuts"),
 		"underline_button_shortcuts", 0, 0,
 		N_("Whether to underline button shortcuts to make them more\n"
-		"visible. Requires the underlining is enabled for the terminal.")),
+		"visible. Requires that underlining is enabled for the terminal.")),
 
 
 	INIT_OPT_TREE("ui", N_("Timer options"),
@@ -1238,7 +1238,7 @@ static struct option_info config_options_info[] = {
 
 	INIT_OPT_BOOL("ui.tabs", N_("Wrap-around tabs cycling"),
 		"wraparound", 0, 1,
-		N_("When moving right from the last tab, jump at the first one, and\n"
+		N_("When moving right from the last tab, jump to the first one, and\n"
 		"vice versa.")),
 
 	INIT_OPT_BOOL("ui.tabs", N_("Confirm tab closing"),

src/cookies/cookies.c

@@ -116,7 +116,7 @@ static struct option_info cookies_options[] = {
 
 	INIT_OPT_BOOL("cookies", N_("Saving"),
 		"save", 0, 1,
-		N_("Whether cookies should be loaded from and save to disk.")),
+		N_("Whether cookies should be loaded from and saved to disk.")),
 
 	INIT_OPT_BOOL("cookies", N_("Resaving"),
 		"resave", 0, 1,

src/dialogs/menu.c

@@ -246,7 +246,7 @@ tab_menu(struct session *ses, int x, int y, int place_above_cursor)
 		}
 #endif
 
-		add_menu_action(&menu, N_("Toggle ~html/plain"), ACT_MAIN_TOGGLE_HTML_PLAIN);
+		add_menu_action(&menu, N_("Toggle ~HTML/plain"), ACT_MAIN_TOGGLE_HTML_PLAIN);
 		add_menu_action(&menu, N_("~Reload"), ACT_MAIN_RELOAD);
 
 		if (ses->doc_view && document_has_frames(ses->doc_view->document)) {
@@ -415,7 +415,7 @@ static struct menu_item view_menu[] = {
 	INIT_MENU_ACTION(N_("Find ~previous"), ACT_MAIN_FIND_NEXT_BACK),
 	INIT_MENU_ACTION(N_("T~ypeahead search"), ACT_MAIN_SEARCH_TYPEAHEAD),
 	BAR_MENU_ITEM,
-	INIT_MENU_ACTION(N_("Toggle ~html/plain"), ACT_MAIN_TOGGLE_HTML_PLAIN),
+	INIT_MENU_ACTION(N_("Toggle ~HTML/plain"), ACT_MAIN_TOGGLE_HTML_PLAIN),
 	INIT_MENU_ACTION(N_("Toggle i~mages"), ACT_MAIN_TOGGLE_DISPLAY_IMAGES),
 	INIT_MENU_ACTION(N_("Toggle ~link numbering"), ACT_MAIN_TOGGLE_NUMBERED_LINKS),
 	INIT_MENU_ACTION(N_("Toggle ~document colors"), ACT_MAIN_TOGGLE_DOCUMENT_COLORS),

src/document/css/css.h

@@ -10,7 +10,7 @@ struct uri;
  * ELinks controls (which is defined by the defaults of every
  * property, they could however also be loadable at startup time,
  * e.g. when/if we will have a very generalised renderer it would be
- * possible to bypass the HTML renderer but would simply use a HTML
+ * possible to bypass the HTML renderer but would simply use an HTML
  * stylesheet like the one in CSS2 Appendix A. "A sample style sheet
  * for HTML 4.0") and one that the user controls. They should be
  * remerged when ever the user reloads the user stylesheet but else

src/document/html/parser.h

@@ -97,10 +97,10 @@ struct par_attrib {
 /* HTML parser stack mortality info */
 enum html_element_mortality_type {
 	/* Elements of this type can not be removed from the stack. This type
-	 * is created by the renderer when formatting a HTML part. */
+	 * is created by the renderer when formatting an HTML part. */
 	ELEMENT_IMMORTAL,
 	/* Elements of this type can only be removed by elements of the start
-	 * type. This type is created whenever a HTML state is created using
+	 * type. This type is created whenever an HTML state is created using
 	 * init_html_parser_state(). */
 	/* The element has been created by*/
 	ELEMENT_DONT_KILL,

src/document/html/parser/link.c

@@ -251,7 +251,7 @@ html_img_do(unsigned char *a, unsigned char *object_src,
 		if (!label)
 			label = get_attr_val(a, "title", html_context->doc_cp);
 
-		/* Little hack to preserve rendering of [   ], in directories listing,
+		/* Little hack to preserve rendering of [   ], in directory listings,
 		 * but we still want to drop extra spaces in alt or title attribute
 		 * to limit display width on certain websites. --Zas */
 		if (label && strlen(label) > 5) clr_spaces(label);

src/intl/charsets.c

@@ -1024,7 +1024,7 @@ get_entity_string(const unsigned char *str, const int strlen, int encoding)
 
 	/* Check if cached. A test on many websites (freshmeat.net + whole ELinks website
 	 * + google + slashdot + websites that result from a search for test on google,
-	 * + various ones) show a quite impressive improvment:
+	 * + various ones) show quite impressive improvment:
 	 * Top ten is:
 	 * 0: hits=2459 l=4 st='nbsp'
 	 * 1: hits=2152 l=6 st='eacute'

src/mime/backend/mimetypes.c

@@ -46,7 +46,7 @@ static struct option_info mimetypes_options[] = {
 	INIT_OPT_TREE("mime", N_("Mimetypes files"),
 		"mimetypes", 0,
 		N_("Options for the support of mime.types files. These files\n"
-		"can be used to find the content type of an URL by looking at\n"
+		"can be used to find the content type of a URL by looking at\n"
 		"the extension of the file name.")),
 
 	INIT_OPT_BOOL("mime.mimetypes", N_("Enable"),

src/network/socket.h

@@ -46,9 +46,9 @@ struct socket_operations {
 	socket_operation_T set_state;
 	/* Reset the timeout for the socket. */
 	socket_operation_T set_timeout;
-	/* Some system related error occured; advise to reconnect. */
+	/* Some system related error occurred; advise to reconnect. */
 	socket_operation_T retry;
-	/* A fatal error occured, like a memory allocation failure; advise to
+	/* A fatal error occurred, like a memory allocation failure; advise to
 	 * abort the connection. */
 	socket_operation_T done;
 };

src/network/state.c

@@ -98,7 +98,7 @@ static const struct s_msg_dsc msg_dsc[] = {
 	{S_NNTP_NEWS_SERVER,	N_("Unable to handle news: URI because no news server has been\n"
 				"been configured. Either set the option protocol.nntp.server\n"
 				"or set the NNTPSERVER environment variable.")},
-	{S_NNTP_SERVER_HANG_UP,	N_("Server hang up for some reason")},
+	{S_NNTP_SERVER_HANG_UP,	N_("Server hung up for some reason")},
 	{S_NNTP_GROUP_UNKNOWN,	N_("No such newsgroup")},
 	{S_NNTP_ARTICLE_UNKNOWN,N_("No such article")},
 	{S_NNTP_TRANSFER_ERROR,	N_("Transfer failed")},

src/protocol/auth/dialogs.c

@@ -118,7 +118,7 @@ do_auth_dialog(struct session *ses, void *data)
 	add_dlg_end(dlg, AUTH_WIDGETS_COUNT);
 
 	dlg_data = do_dialog(term, dlg, getml(dlg, (void *) NULL));
-	/* When there's some username, but no password, automagically jump at
+	/* When there's some username, but no password, automagically jump to
 	 * the password. */
 	if (dlg_data && a->user[0] && !a->password[0])
 		select_widget_by_id(dlg_data, 1);

src/protocol/file/file.c

@@ -52,7 +52,7 @@ static struct option_info file_options[] = {
 	INIT_OPT_BOOL("protocol.file", N_("Show hidden files in directory listing"),
 		"show_hidden_files", 0, 1,
 		N_("When set to false, files with name starting with a dot will be\n"
-		   "hidden in local directories listing.")),
+		   "hidden in local directory listings.")),
 
 	INIT_OPT_BOOL("protocol.file", N_("Try encoding extensions"),
 		"try_encoding_extensions", 0, 1,
@@ -173,7 +173,7 @@ add_dir_entries(struct directory_entry *entries, unsigned char *dirpath,
 	mem_free_if(entries);
 }
 
-/* Generates a HTML page listing the content of @directory with the path
+/* Generates an HTML page listing the content of @directory with the path
  * @dirpath. */
 /* Returns a connection state. S_OK if all is well. */
 static inline enum connection_state

src/protocol/proxy.h

@@ -7,7 +7,7 @@ struct uri;
 /* Checks if the passed URI has been configured to go through a proxy. The
  * fragment is removed from the returned URI. */
 /* If @connection_state is non-NULL it will be set to indicate what error
- * occured if the function returns NULL. */
+ * occurred if the function returns NULL. */
 struct uri *get_proxy_uri(struct uri *uri, enum connection_state *connection_state);
 
 /* ``Translates'' the passed URI into the URI being proxied. If it is not a

src/session/session.c

@@ -748,15 +748,15 @@ setup_first_session(struct session *ses, struct uri *uri)
 	if (!*get_opt_str("protocol.http.user_agent")) {
 		info_box(term, 0,
 			 N_("Warning"), ALIGN_CENTER,
-			 N_("You have empty string in protocol.http.user_agent - "
+			 N_("You have an empty string in protocol.http.user_agent - "
 			 "this was a default value in the past, substituted by "
 			 "default ELinks User-Agent string. However, currently "
 			 "this means that NO User-Agent HEADER "
 		 	 "WILL BE SENT AT ALL - if this is really what you want, "
-			 "set its value to \" \", otherwise please delete line "
+			 "set its value to \" \", otherwise please delete the line "
-			 "with this settings from your configuration file (if you "
+			 "with this setting from your configuration file (if you "
 			 "have no idea what I'm talking about, just do this), so "
-			 "that correct default setting will be used. Apologies for "
+			 "that the correct default setting will be used. Apologies for "
 			 "any inconvience caused."));
 	}
 
@@ -773,11 +773,11 @@ setup_first_session(struct session *ses, struct uri *uri)
 				 "the last time you upgraded ELinks. Now, only "
 				 "those options which you actually changed are "
 				 "saved to the configuration file, instead of "
-				 "just all the options. This simplifies our "
+				 "all the options. This simplifies our "
 				 "situation greatly when we see that some option "
-				 "has inappropriate default value or we need to "
+				 "has an inappropriate default value or we need to "
-				 "change semantic of some option in a subtle way. "
+				 "change the semantics of some option in a subtle way. "
-				 "Thus, we recommend you to change the value of "
+				 "Thus, we recommend you change the value of "
 				 "config.saving_style option to 3 in order to get "
 				 "the \"right\" behaviour. Apologies for any "
 				 "inconvience caused."));

src/viewer/text/marks.c

@@ -27,7 +27,7 @@
  *
  * * Make it possible to go at marks which are set in a different document than
  * the active one. This will basically need some clever hacking in the
- * KP_MARK_GOTO handler, which first needs to load the URL and *then* jump at
+ * KP_MARK_GOTO handler, which first needs to load the URL and *then* jump to
  * the exact location and just overally restore the rest of view_state. Perhaps
  * this could also be somehow nicely unified with session.goto_position? --pasky
  *