Re: [PATCH v2] Fix spelling of "occurred"

[Junio C Hamano <gitster@pobox.com>]

Peter Colberg <peter@colberg.org> writes:

> Signed-off-by: Peter Colberg <peter@colberg.org>
> ---
>  config.c | 2 +-
>  refs.h   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/config.c b/config.c
> index f51c56b..d7ce34b 100644
> --- a/config.c
> +++ b/config.c
> @@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data)
>  		 * something went really wrong and we should stop
>  		 * immediately.
>  		 */
> -		die(_("unknown error occured while reading the configuration files"));
> +		die(_("unknown error occurred while reading the configuration files"));
>  }

For this one, I am tempted to say that it may be better to remove
the verb altogether, which would lead to a more concise error
message.

In any case, we need to postpone this until the next cycle, as it is
too late to change message strings now, as it would leave no time
for i18n/l10n team to adjust their work.

The other patch to the comment could be taken now if we wanted to,
though.

Thanks.

>  static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
> diff --git a/refs.h b/refs.h
> index 9230d47..56089d5 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -345,7 +345,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
>   *     msg -- a message describing the change (for the reflog).
>   *
>   *     err -- a strbuf for receiving a description of any error that
> - *         might have occured.
> + *         might have occurred.
>   *
>   * The functions make internal copies of refname and msg, so the
>   * caller retains ownership of these parameters.