{"thread":{"id":"42577","subject":"[PATCH] Fix spelling of \"occurred\"","startedAt":"2016-06-16T02:19:51Z","lastAt":"2016-06-16T02:19:52Z","messageCount":6,"participants":["Peter Colberg","Pranit Bauva","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"288926","messageId":"1465568551-5819-1-git-send-email-peter@colberg.org","threadId":"42577","inReplyTo":null,"subject":"[PATCH] Fix spelling of \"occurred\"","fromName":"Peter Colberg","fromEmail":"peter@colberg.org","sentAt":"2016-06-10T14:22:31Z","receivedAt":"2016-06-16T02:19:51Z","isPatch":true,"sender":{"key":"peter@colberg.org","avatar":"https://avatars.githubusercontent.com/u/5453048?v=4"},"body":"Signed-off-by: Peter Colberg <peter@colberg.org>\n---\n config.c    | 2 +-\n po/bg.po    | 2 +-\n po/ca.po    | 2 +-\n po/de.po    | 2 +-\n po/fr.po    | 2 +-\n po/git.pot  | 2 +-\n po/ko.po    | 2 +-\n po/pt_PT.po | 2 +-\n po/ru.po    | 2 +-\n po/sv.po    | 2 +-\n po/vi.po    | 2 +-\n po/zh_CN.po | 2 +-\n refs.h      | 2 +-\n 13 files changed, 13 insertions(+), 13 deletions(-)\n\ndiff --git a/config.c b/config.c\nindex f51c56b..d7ce34b 100644\n--- a/config.c\n+++ b/config.c\n@@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data)\n \t\t * something went really wrong and we should stop\n \t\t * immediately.\n \t\t */\n-\t\tdie(_(\"unknown error occured while reading the configuration files\"));\n+\t\tdie(_(\"unknown error occurred while reading the configuration files\"));\n }\n \n static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)\ndiff --git a/po/bg.po b/po/bg.po\nindex ac6f103..462eb9a 100644\n--- a/po/bg.po\n+++ b/po/bg.po\n@@ -498,7 +498,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"неправилни настройки от командния ред\"\n \n #: config.c:1277\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"неочаквана грешка при изчитането на конфигурационните файлове\"\n \n #: config.c:1601\ndiff --git a/po/ca.po b/po/ca.po\nindex 46000d7..b3dbba7 100644\n--- a/po/ca.po\n+++ b/po/ca.po\n@@ -419,7 +419,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"no s'ha pogut analitzar la configuració de la línia d'ordres\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"ha ocorregut un error desconegut en llegir els fitxers de configuració\"\n \n #: config.c:1629\ndiff --git a/po/de.po b/po/de.po\nindex 0eadf34..5bf91a0 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -417,7 +417,7 @@ msgstr \"\"\n \"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen.\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"\"\n \"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf.\"\n \ndiff --git a/po/fr.po b/po/fr.po\nindex 55ca387..81465a9 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -483,7 +483,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"lecture de la configuration de ligne de commande impossible\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"erreur inconnue pendant la lecture des fichiers de configuration\"\n \n #: config.c:1629\ndiff --git a/po/git.pot b/po/git.pot\nindex 72ef798..7a3e9ba 100644\n--- a/po/git.pot\n+++ b/po/git.pot\n@@ -390,7 +390,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"\"\n \n #: config.c:1629\ndiff --git a/po/ko.po b/po/ko.po\nindex 3ff3b9b..f1017b8 100644\n--- a/po/ko.po\n+++ b/po/ko.po\n@@ -460,7 +460,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"명령행 설정을 파싱할 수 없습니다\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"설정 파일을 읽는 중 알 수 없는 오류가 생겼습니다\"\n \n #: config.c:1629\ndiff --git a/po/pt_PT.po b/po/pt_PT.po\nindex 321b553..896eb2a 100644\n--- a/po/pt_PT.po\n+++ b/po/pt_PT.po\n@@ -410,7 +410,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"não é possível analisar configuração de linha de comandos\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"\"\n \"ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração\"\n \ndiff --git a/po/ru.po b/po/ru.po\nindex c0a838b..974b9ee 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -398,7 +398,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"не удалось разобрать конфигурацию из командной строки\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"произошла неизвестная ошибка при чтении файлов конфигурации\"\n \n #: config.c:1629\ndiff --git a/po/sv.po b/po/sv.po\nindex 32bcaba..3d89dcc 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -410,7 +410,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"kan inte tolka kommandoradskonfiguration\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"okänt fel uppstod vid läsning av konfigurationsfilerna\"\n \n #: config.c:1629\ndiff --git a/po/vi.po b/po/vi.po\nindex edd8e29..9ef203c 100644\n--- a/po/vi.po\n+++ b/po/vi.po\n@@ -414,7 +414,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"không thể phân tích cấu hình dòng lệnh\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình\"\n \n #: config.c:1629\ndiff --git a/po/zh_CN.po b/po/zh_CN.po\nindex a6b06f9..3a429c8 100644\n--- a/po/zh_CN.po\n+++ b/po/zh_CN.po\n@@ -531,7 +531,7 @@ msgid \"unable to parse command-line config\"\n msgstr \"无法解析命令行中的配置\"\n \n #: config.c:1281\n-msgid \"unknown error occured while reading the configuration files\"\n+msgid \"unknown error occurred while reading the configuration files\"\n msgstr \"在读取配置文件时遇到未知错误\"\n \n #: config.c:1629\ndiff --git a/refs.h b/refs.h\nindex 9230d47..56089d5 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -345,7 +345,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);\n  *     msg -- a message describing the change (for the reflog).\n  *\n  *     err -- a strbuf for receiving a description of any error that\n- *         might have occured.\n+ *         might have occurred.\n  *\n  * The functions make internal copies of refname and msg, so the\n  * caller retains ownership of these parameters.\n-- \n2.8.1\n"},{"id":"288937","messageId":"CAFZEwPMgYCau=LxdtjZ2WVJXp91mXYG5bc=0X0mo_eJ+eYqLHA@mail.gmail.com","threadId":"42577","inReplyTo":"1465568551-5819-1-git-send-email-peter@colberg.org","subject":"Re: [PATCH] Fix spelling of \"occurred\"","fromName":"Pranit Bauva","fromEmail":"pranit.bauva@gmail.com","sentAt":"2016-06-10T18:51:54Z","receivedAt":"2016-06-16T02:19:51Z","isPatch":true,"sender":{"key":"pranit.bauva@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2959938?v=4"},"body":"Hey Peter,\n\nOn Fri, Jun 10, 2016 at 7:52 PM, Peter Colberg <peter@colberg.org> wrote:\n> Signed-off-by: Peter Colberg <peter@colberg.org>\n> ---\n>  config.c    | 2 +-\n>  po/bg.po    | 2 +-\n>  po/ca.po    | 2 +-\n>  po/de.po    | 2 +-\n>  po/fr.po    | 2 +-\n>  po/git.pot  | 2 +-\n>  po/ko.po    | 2 +-\n>  po/pt_PT.po | 2 +-\n>  po/ru.po    | 2 +-\n>  po/sv.po    | 2 +-\n>  po/vi.po    | 2 +-\n>  po/zh_CN.po | 2 +-\n>  refs.h      | 2 +-\n>  13 files changed, 13 insertions(+), 13 deletions(-)\n> ...[snip]\n\nYou only have to change the spelling mistake in config.c and refs.h .\nOur translators take care of everything else.\nThanks for your contribution.\n\nRegards,\nPranit Bauva\n"},{"id":"288939","messageId":"1465585526-32187-1-git-send-email-peter@colberg.org","threadId":"42577","inReplyTo":"CAFZEwPMgYCau=LxdtjZ2WVJXp91mXYG5bc=0X0mo_eJ+eYqLHA@mail.gmail.com","subject":"[PATCH v2] Fix spelling of \"occurred\"","fromName":"Peter Colberg","fromEmail":"peter@colberg.org","sentAt":"2016-06-10T19:05:26Z","receivedAt":"2016-06-16T02:19:51Z","isPatch":true,"sender":{"key":"peter@colberg.org","avatar":"https://avatars.githubusercontent.com/u/5453048?v=4"},"body":"Signed-off-by: Peter Colberg <peter@colberg.org>\n---\n config.c | 2 +-\n refs.h   | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/config.c b/config.c\nindex f51c56b..d7ce34b 100644\n--- a/config.c\n+++ b/config.c\n@@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data)\n \t\t * something went really wrong and we should stop\n \t\t * immediately.\n \t\t */\n-\t\tdie(_(\"unknown error occured while reading the configuration files\"));\n+\t\tdie(_(\"unknown error occurred while reading the configuration files\"));\n }\n \n static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)\ndiff --git a/refs.h b/refs.h\nindex 9230d47..56089d5 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -345,7 +345,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);\n  *     msg -- a message describing the change (for the reflog).\n  *\n  *     err -- a strbuf for receiving a description of any error that\n- *         might have occured.\n+ *         might have occurred.\n  *\n  * The functions make internal copies of refname and msg, so the\n  * caller retains ownership of these parameters.\n-- \n2.8.1\n"},{"id":"288997","messageId":"xmqqd1noeodt.fsf@gitster.mtv.corp.google.com","threadId":"42577","inReplyTo":"1465585526-32187-1-git-send-email-peter@colberg.org","subject":"Re: [PATCH v2] Fix spelling of \"occurred\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-06-10T21:15:58Z","receivedAt":"2016-06-16T02:19:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Peter Colberg <peter@colberg.org> writes:\n\n> Signed-off-by: Peter Colberg <peter@colberg.org>\n> ---\n>  config.c | 2 +-\n>  refs.h   | 2 +-\n>  2 files changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/config.c b/config.c\n> index f51c56b..d7ce34b 100644\n> --- a/config.c\n> +++ b/config.c\n> @@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data)\n>  \t\t * something went really wrong and we should stop\n>  \t\t * immediately.\n>  \t\t */\n> -\t\tdie(_(\"unknown error occured while reading the configuration files\"));\n> +\t\tdie(_(\"unknown error occurred while reading the configuration files\"));\n>  }\n\nFor this one, I am tempted to say that it may be better to remove\nthe verb altogether, which would lead to a more concise error\nmessage.\n\nIn any case, we need to postpone this until the next cycle, as it is\ntoo late to change message strings now, as it would leave no time\nfor i18n/l10n team to adjust their work.\n\nThe other patch to the comment could be taken now if we wanted to,\nthough.\n\nThanks.\n\n>  static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)\n> diff --git a/refs.h b/refs.h\n> index 9230d47..56089d5 100644\n> --- a/refs.h\n> +++ b/refs.h\n> @@ -345,7 +345,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);\n>   *     msg -- a message describing the change (for the reflog).\n>   *\n>   *     err -- a strbuf for receiving a description of any error that\n> - *         might have occured.\n> + *         might have occurred.\n>   *\n>   * The functions make internal copies of refname and msg, so the\n>   * caller retains ownership of these parameters.\n"},{"id":"289000","messageId":"20160610220405.GA19824@alcyone","threadId":"42577","inReplyTo":"xmqqd1noeodt.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH v2] Fix spelling of \"occurred\"","fromName":"Peter Colberg","fromEmail":"peter@colberg.org","sentAt":"2016-06-10T22:04:05Z","receivedAt":"2016-06-16T02:19:52Z","isPatch":true,"sender":{"key":"peter@colberg.org","avatar":"https://avatars.githubusercontent.com/u/5453048?v=4"},"body":"On Fri, Jun 10, 2016 at 02:15:58PM -0700, Junio C Hamano wrote:\n> For this one, I am tempted to say that it may be better to remove\n> the verb altogether, which would lead to a more concise error\n> message.\n\nThanks, I will send [PATCH v3] when the next release cycle begins.\n\nPeter\n"},{"id":"289001","messageId":"xmqqziqsd6r7.fsf@gitster.mtv.corp.google.com","threadId":"42577","inReplyTo":"20160610220405.GA19824@alcyone","subject":"Re: [PATCH v2] Fix spelling of \"occurred\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-06-10T22:22:04Z","receivedAt":"2016-06-16T02:19:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Peter Colberg <peter@colberg.org> writes:\n\n> On Fri, Jun 10, 2016 at 02:15:58PM -0700, Junio C Hamano wrote:\n>> For this one, I am tempted to say that it may be better to remove\n>> the verb altogether, which would lead to a more concise error\n>> message.\n>\n> Thanks, I will send [PATCH v3] when the next release cycle begins.\n\nThere may not be a need for resend, though.  I already split them\ninto two and queued to my tree (two patches, pc/occurred topic\nending at 3a39f61e0).\n\nThanks.\n"}]}