Signed-off-by: Peter Colberg <peter@xxxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html