summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorRichard Hansen <rhansen@bbn.com>2013-09-04 15:04:31 -0400
committerJunio C Hamano <gitster@pobox.com>2013-09-04 15:03:03 -0700
commita8a5406ab32fccabf8ed08001d50b5373e18ff1a (patch)
tree82ec0a98750812e269b935eb369671ad84be8b45 /po
parentbb8040f9f9274d739b894230959134584b156ae5 (diff)
downloadgit-a8a5406ab32fccabf8ed08001d50b5373e18ff1a.tar.gz
use 'commit-ish' instead of 'committish'
Replace 'committish' in documentation and comments with 'commit-ish' to match gitglossary(7) and to be consistent with 'tree-ish'. The only remaining instances of 'committish' are: * variable, function, and macro names * "(also committish)" in the definition of commit-ish in gitglossary[7] Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'po')
-rw-r--r--po/da.po2
-rw-r--r--po/de.po6
-rw-r--r--po/fr.po4
-rw-r--r--po/git.pot4
-rw-r--r--po/it.po2
-rw-r--r--po/nl.po2
-rw-r--r--po/pt_PT.po2
-rw-r--r--po/sv.po6
-rw-r--r--po/vi.po6
-rw-r--r--po/zh_CN.po4
10 files changed, 19 insertions, 19 deletions
diff --git a/po/da.po b/po/da.po
index 20a88ea529..898b18d115 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1674,7 +1674,7 @@ msgid "No names found, cannot describe anything."
msgstr ""
#: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
#: builtin/diff.c:77
diff --git a/po/de.po b/po/de.po
index 11dde114f3..da3b0f5a30 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4684,8 +4684,8 @@ msgid "print sizes in human readable format"
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
#: builtin/describe.c:16
-msgid "git describe [options] <committish>*"
-msgstr "git describe [Optionen] <committish>*"
+msgid "git describe [options] <commit-ish>*"
+msgstr "git describe [Optionen] <commit-ish>*"
#: builtin/describe.c:17
msgid "git describe [options] --dirty"
@@ -4822,7 +4822,7 @@ msgid "No names found, cannot describe anything."
msgstr "Keine Namen gefunden, kann nichts beschreiben."
#: builtin/describe.c:489
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
#: builtin/diff.c:79
diff --git a/po/fr.po b/po/fr.po
index fa98cfe4cf..1363976ad6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4222,7 +4222,7 @@ msgid "print sizes in human readable format"
msgstr ""
#: builtin/describe.c:15
-msgid "git describe [options] <committish>*"
+msgid "git describe [options] <commit-ish>*"
msgstr ""
#: builtin/describe.c:16
@@ -4348,7 +4348,7 @@ msgid "No names found, cannot describe anything."
msgstr ""
#: builtin/describe.c:481
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
#: builtin/diff.c:79
diff --git a/po/git.pot b/po/git.pot
index cf1e446330..c91e197521 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -4335,7 +4335,7 @@ msgid "print sizes in human readable format"
msgstr ""
#: builtin/describe.c:16
-msgid "git describe [options] <committish>*"
+msgid "git describe [options] <commit-ish>*"
msgstr ""
#: builtin/describe.c:17
@@ -4465,7 +4465,7 @@ msgid "No names found, cannot describe anything."
msgstr ""
#: builtin/describe.c:489
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
#: builtin/diff.c:79
diff --git a/po/it.po b/po/it.po
index fe61f1a3f3..9080219446 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2476,7 +2476,7 @@ msgid "No names found, cannot describe anything."
msgstr ""
#: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
#: builtin/diff.c:77
diff --git a/po/nl.po b/po/nl.po
index e1399e2b6d..ad31c66cdf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1669,7 +1669,7 @@ msgid "No names found, cannot describe anything."
msgstr ""
#: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
#: builtin/diff.c:77
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 517ec29a4a..689ad1b0fe 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -2312,7 +2312,7 @@ msgid "No names found, cannot describe anything."
msgstr "Nenhum nome encontrado, não descreve nada."
#: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
#: builtin/diff.c:77
diff --git a/po/sv.po b/po/sv.po
index 12dfca92f4..dcf579b8d4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4560,7 +4560,7 @@ msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
#: builtin/describe.c:16
-msgid "git describe [options] <committish>*"
+msgid "git describe [options] <commit-ish>*"
msgstr "git describe [flaggor] <incheckning-igt>*"
#: builtin/describe.c:17
@@ -4696,8 +4696,8 @@ msgid "No names found, cannot describe anything."
msgstr "Inga namn hittades, kan inte beskriva något."
#: builtin/describe.c:489
-msgid "--dirty is incompatible with committishes"
-msgstr "--dirty är inkompatibelt med \"committish\"-värden"
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
#: builtin/diff.c:79
#, c-format
diff --git a/po/vi.po b/po/vi.po
index dd2d2a7319..11b4912791 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -4663,8 +4663,8 @@ msgid "print sizes in human readable format"
msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc"
#: builtin/describe.c:16
-msgid "git describe [options] <committish>*"
-msgstr "git describe [các-tùy-chọn] <committish>*"
+msgid "git describe [options] <commit-ish>*"
+msgstr "git describe [các-tùy-chọn] <commit-ish>*"
#: builtin/describe.c:17
msgid "git describe [options] --dirty"
@@ -4799,7 +4799,7 @@ msgid "No names found, cannot describe anything."
msgstr "Không tìm thấy các tên, không thể mô tả gì cả."
#: builtin/describe.c:489
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty là xung khắc với các tùy chọn dành cho chuyển giao (commit)"
#: builtin/diff.c:79
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b7b46f14f0..1a042af111 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4562,7 +4562,7 @@ msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
#: builtin/describe.c:16
-msgid "git describe [options] <committish>*"
+msgid "git describe [options] <commit-ish>*"
msgstr "git describe [选项] <提交号>*"
#: builtin/describe.c:17
@@ -4698,7 +4698,7 @@ msgid "No names found, cannot describe anything."
msgstr "没有发现名称,无法描述任何东西。"
#: builtin/describe.c:489
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 不能与提交同时使用"
#: builtin/diff.c:79