* [PATCH] Fix spelling of "occurred"
@ 2016-06-10 14:22 Peter Colberg
2016-06-10 18:51 ` Pranit Bauva
0 siblings, 1 reply; 6+ messages in thread
From: Peter Colberg @ 2016-06-10 14:22 UTC (permalink / raw)
To: gitster; +Cc: git, Peter Colberg
Signed-off-by: Peter Colberg <peter@colberg.org>
---
config.c | 2 +-
po/bg.po | 2 +-
po/ca.po | 2 +-
po/de.po | 2 +-
po/fr.po | 2 +-
po/git.pot | 2 +-
po/ko.po | 2 +-
po/pt_PT.po | 2 +-
po/ru.po | 2 +-
po/sv.po | 2 +-
po/vi.po | 2 +-
po/zh_CN.po | 2 +-
refs.h | 2 +-
13 files changed, 13 insertions(+), 13 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"));
}
static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
diff --git a/po/bg.po b/po/bg.po
index ac6f103..462eb9a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -498,7 +498,7 @@ msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
#: config.c:1277
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
#: config.c:1601
diff --git a/po/ca.po b/po/ca.po
index 46000d7..b3dbba7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -419,7 +419,7 @@ msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr "ha ocorregut un error desconegut en llegir els fitxers de configuració"
#: config.c:1629
diff --git a/po/de.po b/po/de.po
index 0eadf34..5bf91a0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -417,7 +417,7 @@ msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
diff --git a/po/fr.po b/po/fr.po
index 55ca387..81465a9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -483,7 +483,7 @@ msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
#: config.c:1629
diff --git a/po/git.pot b/po/git.pot
index 72ef798..7a3e9ba 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -390,7 +390,7 @@ msgid "unable to parse command-line config"
msgstr ""
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
#: config.c:1629
diff --git a/po/ko.po b/po/ko.po
index 3ff3b9b..f1017b8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -460,7 +460,7 @@ msgid "unable to parse command-line config"
msgstr "명령행 설정을 파싱할 수 없습니다"
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr "설정 파일을 읽는 중 알 수 없는 오류가 생겼습니다"
#: config.c:1629
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 321b553..896eb2a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -410,7 +410,7 @@ msgid "unable to parse command-line config"
msgstr "não é possível analisar configuração de linha de comandos"
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
"ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
diff --git a/po/ru.po b/po/ru.po
index c0a838b..974b9ee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -398,7 +398,7 @@ msgid "unable to parse command-line config"
msgstr "не удалось разобрать конфигурацию из командной строки"
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
#: config.c:1629
diff --git a/po/sv.po b/po/sv.po
index 32bcaba..3d89dcc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -410,7 +410,7 @@ msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
#: config.c:1629
diff --git a/po/vi.po b/po/vi.po
index edd8e29..9ef203c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -414,7 +414,7 @@ msgid "unable to parse command-line config"
msgstr "không thể phân tích cấu hình dòng lệnh"
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình"
#: config.c:1629
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a6b06f9..3a429c8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -531,7 +531,7 @@ msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
#: config.c:1629
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.
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Fix spelling of "occurred"
2016-06-10 14:22 [PATCH] Fix spelling of "occurred" Peter Colberg
@ 2016-06-10 18:51 ` Pranit Bauva
2016-06-10 19:05 ` [PATCH v2] " Peter Colberg
0 siblings, 1 reply; 6+ messages in thread
From: Pranit Bauva @ 2016-06-10 18:51 UTC (permalink / raw)
To: Peter Colberg; +Cc: Junio C Hamano, Git List
Hey Peter,
On Fri, Jun 10, 2016 at 7:52 PM, Peter Colberg <peter@colberg.org> wrote:
> Signed-off-by: Peter Colberg <peter@colberg.org>
> ---
> config.c | 2 +-
> po/bg.po | 2 +-
> po/ca.po | 2 +-
> po/de.po | 2 +-
> po/fr.po | 2 +-
> po/git.pot | 2 +-
> po/ko.po | 2 +-
> po/pt_PT.po | 2 +-
> po/ru.po | 2 +-
> po/sv.po | 2 +-
> po/vi.po | 2 +-
> po/zh_CN.po | 2 +-
> refs.h | 2 +-
> 13 files changed, 13 insertions(+), 13 deletions(-)
> ...[snip]
You only have to change the spelling mistake in config.c and refs.h .
Our translators take care of everything else.
Thanks for your contribution.
Regards,
Pranit Bauva
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] Fix spelling of "occurred"
2016-06-10 18:51 ` Pranit Bauva
@ 2016-06-10 19:05 ` Peter Colberg
2016-06-10 21:15 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Peter Colberg @ 2016-06-10 19:05 UTC (permalink / raw)
To: gitster; +Cc: git, Peter Colberg
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"));
}
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.
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] Fix spelling of "occurred"
2016-06-10 19:05 ` [PATCH v2] " Peter Colberg
@ 2016-06-10 21:15 ` Junio C Hamano
2016-06-10 22:04 ` Peter Colberg
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2016-06-10 21:15 UTC (permalink / raw)
To: Peter Colberg; +Cc: git
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.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] Fix spelling of "occurred"
2016-06-10 21:15 ` Junio C Hamano
@ 2016-06-10 22:04 ` Peter Colberg
2016-06-10 22:22 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Peter Colberg @ 2016-06-10 22:04 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Fri, Jun 10, 2016 at 02:15:58PM -0700, Junio C Hamano wrote:
> 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.
Thanks, I will send [PATCH v3] when the next release cycle begins.
Peter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] Fix spelling of "occurred"
2016-06-10 22:04 ` Peter Colberg
@ 2016-06-10 22:22 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2016-06-10 22:22 UTC (permalink / raw)
To: Peter Colberg; +Cc: git
Peter Colberg <peter@colberg.org> writes:
> On Fri, Jun 10, 2016 at 02:15:58PM -0700, Junio C Hamano wrote:
>> 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.
>
> Thanks, I will send [PATCH v3] when the next release cycle begins.
There may not be a need for resend, though. I already split them
into two and queued to my tree (two patches, pc/occurred topic
ending at 3a39f61e0).
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-10 22:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-10 14:22 [PATCH] Fix spelling of "occurred" Peter Colberg
2016-06-10 18:51 ` Pranit Bauva
2016-06-10 19:05 ` [PATCH v2] " Peter Colberg
2016-06-10 21:15 ` Junio C Hamano
2016-06-10 22:04 ` Peter Colberg
2016-06-10 22:22 ` Junio C Hamano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.