diff options
| author | Changwoo Ryu <cwryu@debian.org> | 2016-11-04 00:38:23 +0900 |
|---|---|---|
| committer | Changwoo Ryu <cwryu@debian.org> | 2016-11-04 00:38:23 +0900 |
| commit | de7011c117451fe985b20846e108fb8bf7039c2f (patch) | |
| tree | f70734886a7af29574080f3d19d57effd2eee3fd | |
| parent | 954f127dbb57a5c2cdae970c3ac78cfcb86ffd45 (diff) | |
| download | git-de7011c117451fe985b20846e108fb8bf7039c2f.tar.gz | |
l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| -rw-r--r-- | po/ko.po | 5176 |
1 files changed, 2946 insertions, 2230 deletions
@@ -58,8 +58,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-08-15 22:43+0800\n" -"PO-Revision-Date: 2016-08-21 22:41+0900\n" +"POT-Creation-Date: 2016-11-01 21:35+0800\n" +"PO-Revision-Date: 2016-11-03 19:47+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-" "ko>\n" @@ -150,6 +150,612 @@ msgstr "" " git checkout -b <μ-λΈλμΉ-μ΄λ¦>\n" "\n" +#: apply.c:57 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "μ μ μλ 곡백 μ΅μ
'%s'" + +#: apply.c:73 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "μ μ μλ 곡백 무μ μ΅μ
'%s'" + +#: apply.c:125 +msgid "--reject and --3way cannot be used together." +msgstr "--reject λ° --3way μ΅μ
μ κ°μ΄ μΈ μ μμ΅λλ€." + +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "--cached λ° --3way μ΅μ
μ κ°μ΄ μΈ μ μμ΅λλ€." + +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "μ μ₯μ λ°μμ --3way μ΅μ
μ¬μ©" + +#: apply.c:141 +msgid "--index outside a repository" +msgstr "μ μ₯μ λ°μμ --index μ΅μ
μ¬μ©" + +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "μ μ₯μ λ°μμ --cached μ΅μ
μ¬μ©" + +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "νμμ€ν¬ν μ κ·μμ μ€λΉν μ μμ΅λλ€ (%s)" + +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec()μμ λ€μ μ
λ ₯μ λν΄ %dλ²μ 리ν΄νμ΅λλ€: %s" + +#: apply.c:938 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "ν¨μΉμ %dλ² μ€μ νμΌ μ΄λ¦μ μ°Ύμ μ μμ΅λλ€" + +#: apply.c:977 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "" +"git apply: μλͺ»λ git-diff - %2$dλ² μ€μμ /dev/nullμ κΈ°λνμ§λ§, '%1$s'μ΄" +"(κ°) μμ΅λλ€" + +#: apply.c:983 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" +"git apply: μλͺ»λ git-diff - %dλ² μ€μ μ νμΌ μ΄λ¦μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" + +#: apply.c:984 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "" +"git apply: μλͺ»λ git-diff - %dλ² μ€μ μμ νμΌ μ΄λ¦μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" + +#: apply.c:990 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: μλͺ»λ git-diff - %dλ² μ€μμ /dev/nullμ κΈ°λνμ΅λλ€" + +#: apply.c:1488 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: μμμΉ λͺ»ν μ€: %.*s" + +#: apply.c:1557 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "%dλ² μ€μ ν€λ μλ ν¨μΉ λΆλΆ: %.*s" + +#: apply.c:1577 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +"κ²½λ‘ μ΄λ¦ λΆλΆμμ %dκ°λ₯Ό μ κ±°λΌ λ git diff ν€λμ νμΌ μ΄λ¦ μ λ³΄κ° μμ΅λ" +"λ€. (%dλ² μ€)" + +#: apply.c:1589 +#, c-format +msgid "git diff header lacks filename information (line %d)" +msgstr "git diff ν€λμ νμΌ μ΄λ¦ μ λ³΄κ° μμ΅λλ€ (%dλ² μ€)" + +#: apply.c:1759 +msgid "new file depends on old contents" +msgstr "μ νμΌμ΄ μμ λ΄μ©μ μμ‘΄ν©λλ€" + +#: apply.c:1761 +msgid "deleted file still has contents" +msgstr "μμ ν νμΌμ μμ§ λ΄μ©μ΄ λ€μ΄ μμ΅λλ€" + +#: apply.c:1795 +#, c-format +msgid "corrupt patch at line %d" +msgstr "ν¨μΉκ° %dλ² μ€μμ λ§κ°μ‘μ΅λλ€" + +#: apply.c:1832 +#, c-format +msgid "new file %s depends on old contents" +msgstr "μ νμΌ %sμ΄(κ°) μμ λ΄μ©μ μμ‘΄ν©λλ€" + +#: apply.c:1834 +#, c-format +msgid "deleted file %s still has contents" +msgstr "μμ ν νμΌ %sμ΄(κ°) μμ§ λ΄μ©μ΄ λ€μ΄ μμ΅λλ€" + +#: apply.c:1837 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** κ²½κ³ : %s νμΌμ λ΄μ©μ΄ λΉμ΄ μμ§λ§ μμ λμ§ μμμ΅λλ€" + +#: apply.c:1984 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "%dλ² μ€μ λ°μ΄λ리 ν¨μΉκ° μμλμμ΅λλ€: %.*s" + +#: apply.c:2021 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "%dλ² μ€μ λ°μ΄λ리 ν¨μΉκ° μ΄ν΄ν μ μμ΅λλ€" + +#: apply.c:2182 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "%dλ² μ€μ μ°λ κΈ° λ°μ΄ν°λ§ μλ ν¨μΉ" + +#: apply.c:2274 +#, c-format +msgid "unable to read symlink %s" +msgstr "%s μ¬λ³Όλ¦ λ§ν¬λ₯Ό μ½μ μ μμ΅λλ€" + +#: apply.c:2278 +#, c-format +msgid "unable to open or read %s" +msgstr "%sμ(λ₯Ό) μ΄κ±°λ μ½μ μ μμ΅λλ€" + +#: apply.c:2931 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "μ€ μμμ΄ μλͺ»λ¨: '%c'" + +#: apply.c:3050 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "ν¨μΉ %dλ² λΆλΆ %dλ² μ€μμ μ±κ³΅ (μ€νμ
%dλ² μ€)" + +#: apply.c:3062 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "컨ν
μ€νΈκ° (%ld/%ld)λ‘ μ€μ΄λλλ€. (%dλ² μ€μμ μ μ©)" + +#: apply.c:3068 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"λ€μμ κ²μνλ μ€:\n" +"%.*s" + +#: apply.c:3090 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "'%s'μ λν λ°μ΄λ리 ν¨μΉ λ°μ΄ν°κ° μμ΅λλ€" + +#: apply.c:3098 +#, c-format +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" +msgstr "λ°λ νν¬κ° μμΌλ©΄ '%s'μ λν λ°μ΄λ리 ν¨μΉλ₯Ό λ°λλ‘ μ μ©ν μ μμ΅λλ€" + +#: apply.c:3144 +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" +msgstr "μ 체 μΈλ±μ€ λΌμΈμ΄ μμΌλ©΄ '%s'μ λν λ°μ΄λ리 ν¨μΉλ₯Ό μ μ©ν μ μμ΅λλ€" + +#: apply.c:3154 +#, c-format +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "ν¨μΉκ° '%s'(%s)μ μ μ©λμ§λ§, νμ¬ λ΄μ©κ³Ό μΌμΉνμ§ μμ΅λλ€." + +#: apply.c:3162 +#, c-format +msgid "the patch applies to an empty '%s' but it is not empty" +msgstr "ν¨μΉλ λΉ '%s'μ μ μ©λμ§λ§, νμ¬ λΉμ΄ μμ§ μμ΅λλ€" + +#: apply.c:3180 +#, c-format +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "'%2$s'μ λν νμν %1$s ν¬μ€νΈμ΄λ―Έμ§λ₯Ό μ½μ μ μμ΅λλ€" + +#: apply.c:3193 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "λ°μ΄λ리 ν¨μΉλ₯Ό '%s'μ μ μ©ν μ μμ΅λλ€" + +#: apply.c:3199 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" +"'%s'μ λν λ°μ΄λ리 ν¨μΉκ° μ¬λ°λ₯΄μ§ μμ κ²°κ³Όλ₯Ό λ§λλλ€. (κΈ°λν κ° %s, μ€" +"μ %s)" + +#: apply.c:3220 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "ν¨μΉ μ€ν¨: %s:%ld" + +#: apply.c:3342 +#, c-format +msgid "cannot checkout %s" +msgstr "%sμ(λ₯Ό) κ°μ Έμ¬ μ μμ΅λλ€" + +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 +#, c-format +msgid "failed to read %s" +msgstr "%sμ(λ₯Ό) μ½λλ° μ€ν¨νμ΅λλ€" + +#: apply.c:3398 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "μ¬λ³Όλ¦ λ§ν¬ λ€μ μλ '%s' μ½κΈ°" + +#: apply.c:3427 apply.c:3667 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "%s κ²½λ‘κ° μ΄λ¦μ΄ λ°λμκ±°λ μμ λμμ΅λλ€" + +#: apply.c:3510 apply.c:3681 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: μΈλ±μ€μ μμ΅λλ€" + +#: apply.c:3519 apply.c:3689 +#, c-format +msgid "%s: does not match index" +msgstr "%s: μΈλ±μ€μ λ§μ§ μμ΅λλ€" + +#: apply.c:3554 +msgid "repository lacks the necessary blob to fall back on 3-way merge." +msgstr "μ μ₯μμ 3-λ°©ν₯ λ³ν©μΌλ‘ λμ ν λ νμν λΈλ‘μ΄ μμ΅λλ€." + +#: apply.c:3557 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "3-λ°©ν₯ λ³ν©μΌλ‘ λμ ν©λλ€...\n" + +#: apply.c:3573 apply.c:3577 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "'%s'μ νμ¬ λ΄μ©μ μ½μ μ μμ΅λλ€" + +#: apply.c:3589 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "3-λ°©ν₯ λ³ν©μΌλ‘ λμ νλλ° μ€ν¨νμ΅λλ€...\n" + +#: apply.c:3603 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "ν¨μΉλ₯Ό '%s'μ μΆ©λμ΄ μλ μνλ‘ μ μ©.\n" + +#: apply.c:3608 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "ν¨μΉλ₯Ό '%s'μ ν¨μΉ λ¬Έμ μμ΄ μ μ©.\n" + +#: apply.c:3634 +msgid "removal patch leaves file contents" +msgstr "μ κ±°νλ ν¨μΉ λ€μμ νμΌ λ΄μ©μ΄ λ¨μμ΅λλ€" + +#: apply.c:3706 +#, c-format +msgid "%s: wrong type" +msgstr "%s: μλͺ»λ μ’
λ₯" + +#: apply.c:3708 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%sμ μ’
λ₯κ° %oμ΄μ§λ§ %oμ΄(κ°) λμ΄μΌ ν©λλ€" + +#: apply.c:3859 apply.c:3861 +#, c-format +msgid "invalid path '%s'" +msgstr "μλͺ»λ κ²½λ‘ '%s'" + +#: apply.c:3917 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: μ΄λ―Έ μΈλ±μ€μ μμ΅λλ€" + +#: apply.c:3920 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: μ΄λ―Έ μμ
λλ ν°λ¦¬μ μμ΅λλ€" + +#: apply.c:3940 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "%2$sμ μ λͺ¨λ(%1$o)κ° μμ λͺ¨λ(%3$o)μ λ€λ¦
λλ€" + +#: apply.c:3945 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "%2$sμ μ λͺ¨λ(%1$o)κ° %4$sμ μμ λͺ¨λ(%3$o)μ λ€λ¦
λλ€" + +#: apply.c:3965 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "μν₯ λ°λ '%s' νμΌμ΄ μ¬λ³Όλ¦ λ§ν¬ λ€μ μμ΅λλ€" + +#: apply.c:3969 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: ν¨μΉλ₯Ό μ μ©νμ§ μμ΅λλ€" + +#: apply.c:3984 +#, c-format +msgid "Checking patch %s..." +msgstr "%s ν¨μΉλ₯Ό νμΈνλ μ€μ
λλ€..." + +#: apply.c:4075 +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "sha1 μ λ³΄κ° μκ±°λ %s νμ λͺ¨λμμ μΈ μ μμ΅λλ€" + +#: apply.c:4082 +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "%sμ λν λͺ¨λ λ³κ²½μ΄μ§λ§, νμ¬ HEADμ μμ΅λλ€" + +#: apply.c:4085 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "sha1 μ λ³΄κ° μκ±°λ μΈ μ μμ΅λλ€ (%s)." + +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "κ²½λ‘ '%s'μ λν΄ make_cache_entry μ€ν¨" + +#: apply.c:4094 +#, c-format +msgid "could not add %s to temporary index" +msgstr "μμ μΈλ±μ€μ %s νλͺ©μ μΆκ°ν μ μμ΅λλ€" + +#: apply.c:4104 +#, c-format +msgid "could not write temporary index to %s" +msgstr "μμ μΈλ±μ€λ₯Ό %sμ μΈ μ μμ΅λλ€" + +#: apply.c:4242 +#, c-format +msgid "unable to remove %s from index" +msgstr "μΈλ±μ€μμ %sμ(λ₯Ό) μ κ±°ν μ μμ΅λλ€" + +#: apply.c:4277 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "νμ λͺ¨λ %sμ λν΄ μμλ ν¨μΉ" + +#: apply.c:4283 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "μλ‘ λ§λ νμΌ '%s'μ λν΄ stat()ν μ μμ΅λλ€" + +#: apply.c:4291 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "μλ‘ λ§λ νμΌ '%s'μ λν΄ μλΉ μ μ₯μλ₯Ό λ§λ€ μ μμ΅λλ€" + +#: apply.c:4297 apply.c:4441 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "%sμ λν΄ μΊμ νλͺ©μ μΆκ°ν μ μμ΅λλ€" + +#: apply.c:4338 +#, c-format +msgid "failed to write to '%s'" +msgstr "'%s'μ μ°λλ° μ€ν¨νμ΅λλ€" + +#: apply.c:4342 +#, c-format +msgid "closing file '%s'" +msgstr "'%s' νμΌμ λ«λ μ€μ
λλ€" + +#: apply.c:4412 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "'%s' νμΌμ μΈ μ μμ΅λλ€ ('%o' λͺ¨λ)" + +#: apply.c:4510 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "%s ν¨μΉ κΉλνκ² μ μ©." + +#: apply.c:4518 +msgid "internal error" +msgstr "λ΄λΆ μ€λ₯" + +#: apply.c:4521 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "%%s ν¨μΉλ₯Ό (%dκ° κ±°λΆ) μ μ©..." + +#: apply.c:4532 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "truncating .rej νμΌ μ΄λ¦μ '%.*s.rej'(μΌ)λ‘ μλ¦" + +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#, c-format +msgid "cannot open %s" +msgstr "%sμ(λ₯Ό) μ΄ μ μμ΅λλ€" + +#: apply.c:4554 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "ν¨μΉ λΆμ #%d κΉλνκ² μ μ©." + +#: apply.c:4558 +#, c-format +msgid "Rejected hunk #%d." +msgstr "ν¨μΉ λΆμ #%d κ±°λΆλ¨." + +#: apply.c:4668 +#, c-format +msgid "Skipped patch '%s'." +msgstr "ν¨μΉ '%s' 건λλ." + +#: apply.c:4676 +msgid "unrecognized input" +msgstr "μΈμν μ μλ μ
λ ₯" + +#: apply.c:4695 +msgid "unable to read index file" +msgstr "μΈλ±μ€ νμΌμ μ½μ μ μμ΅λλ€" + +#: apply.c:4833 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "'%s' ν¨μΉλ₯Ό μ΄ μ μμ΅λλ€: %s" + +#: apply.c:4858 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "곡백 μ€λ₯ %dκ°λ₯Ό λμ΄κ°λλ€" + +#: apply.c:4864 apply.c:4879 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%dλ² μ€μμ 곡백 μ€λ₯λ₯Ό μΆκ°ν©λλ€." + +#: apply.c:4872 +#, c-format +msgid "%d line applied after fixing whitespace errors." +msgid_plural "%d lines applied after fixing whitespace errors." +msgstr[0] "곡백 μ€λ₯λ₯Ό λ°λ‘μ‘μ λ€μ %dλ² μ€ μ μ©." + +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "μ μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" + +#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +msgid "path" +msgstr "κ²½λ‘" + +#: apply.c:4920 +msgid "don't apply changes matching the given path" +msgstr "μ£Όμ΄μ§ κ²½λ‘μ ν΄λΉνλ λ³κ²½ μ¬νμ μ μ©νμ§ μμ΅λλ€" + +#: apply.c:4923 +msgid "apply changes matching the given path" +msgstr "μ£Όμ΄μ§ κ²½λ‘μ ν΄λΉνλ λ³κ²½ μ¬νμ μ μ©ν©λλ€" + +#: apply.c:4925 builtin/am.c:2286 +msgid "num" +msgstr "κ°μ" + +#: apply.c:4926 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "μ ν΅μ μΈ diff κ²½λ‘ μμ <κ°μ>κ°μ μ μ¬λμ(/)λ₯Ό μ κ±°ν©λλ€" + +#: apply.c:4929 +msgid "ignore additions made by the patch" +msgstr "ν¨μΉμμ μΆκ°νλ νμΌμ 무μν©λλ€" + +#: apply.c:4931 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "ν¨μΉλ₯Ό μ μ©νλ λμ , μ
λ ₯μ λν diffstatμ μΆλ ₯ν©λλ€" + +#: apply.c:4935 +msgid "show number of added and deleted lines in decimal notation" +msgstr "μμ§μλ‘ μΆκ° λ° μμ ν μ€ μλ₯Ό νμν©λλ€" + +#: apply.c:4937 +msgid "instead of applying the patch, output a summary for the input" +msgstr "ν¨μΉλ₯Ό μ μ©νλ λμ , μ
λ ₯μ λν μμ½μ μΆλ ₯ν©λλ€" + +#: apply.c:4939 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "ν¨μΉλ₯Ό μ μ©νλ λμ , ν¨μΉλ₯Ό μ μ© κ°λ₯νμ§ νμΈν©λλ€" + +#: apply.c:4941 +msgid "make sure the patch is applicable to the current index" +msgstr "νμ¬ μΈλ±μ€μμ ν¨μΉκ° μ μ© κ°λ₯νμ§ νμΈν©λλ€" + +#: apply.c:4943 +msgid "apply a patch without touching the working tree" +msgstr "μμ
ν΄λλ₯Ό λ°κΎΈμ§ μκ³ ν¨μΉλ₯Ό μ μ©ν©λλ€" + +#: apply.c:4945 +msgid "accept a patch that touches outside the working area" +msgstr "μμ
μμ λ°μ νμΌμ λ°κΎΈλ ν¨μΉλ₯Ό νμ©ν©λλ€" + +#: apply.c:4947 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "κ·Έλ¦¬κ³ ν¨μΉλ μ μ©ν©λλ€ (--stat/--summary/--check μ΅μ
κ³Ό κ°μ΄ μ¬μ©)" + +#: apply.c:4949 +msgid "attempt three-way merge if a patch does not apply" +msgstr "ν¨μΉλ₯Ό μ μ©νμ§ μμΌλ©΄ 3-λ°©ν₯ λ³ν©μ μλν©λλ€" + +#: apply.c:4951 +msgid "build a temporary index based on embedded index information" +msgstr "λ΄μ₯ μΈλ±μ€ μ 보λ₯Ό μ¬μ©ν΄ μμ μΈλ±μ€λ₯Ό λ§λλλ€" + +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +msgid "paths are separated with NUL character" +msgstr "κ²½λ‘λ₯Ό NUL λ¬Έμλ‘ κ΅¬λΆν©λλ€" + +#: apply.c:4956 +msgid "ensure at least <n> lines of context match" +msgstr "μ΅μν <n>μ€μ΄ 컨ν
μ€νΈμ μΌμΉνλμ§ νμΈν©λλ€" + +#: apply.c:4957 builtin/am.c:2265 +msgid "action" +msgstr "λμ" + +#: apply.c:4958 +msgid "detect new or modified lines that have whitespace errors" +msgstr "곡백 μ€λ₯κ° μλ μΆκ°λκ±°λ μμ λ μ€μ μ°Ύμ΅λλ€" + +#: apply.c:4961 apply.c:4964 +msgid "ignore changes in whitespace when finding context" +msgstr "컨ν
μ€νΈλ₯Ό μ°Ύμ λ 곡백 λ³κ²½ μ¬νμ 무μν©λλ€" + +#: apply.c:4967 +msgid "apply the patch in reverse" +msgstr "ν¨μΉλ₯Ό λ°λ μμλ‘ μ μ©ν©λλ€" + +#: apply.c:4969 +msgid "don't expect at least one line of context" +msgstr "μ΅μνμ 컨ν
μ€νΈ ν μ€λ μμ΄ μ μ©ν©λλ€" + +#: apply.c:4971 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "κ±°λΆλ ν¨μΉ λΆλΆμ λμλλ *.rej νμΌμ λ¨κ²¨λ‘λλ€" + +#: apply.c:4973 +msgid "allow overlapping hunks" +msgstr "ν¨μΉ λΆλΆμ΄ κ²Ήμ³λ νμ©ν©λλ€" + +#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 +#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 +#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +msgid "be verbose" +msgstr "μμΈν νμ" + +#: apply.c:4976 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "νμΌ λμ μ€λ°κΏμ΄ λΉ μ‘μμ μλͺ» κ²μν κ²½μ°μ 무μν©λλ€" + +#: apply.c:4979 +msgid "do not trust the line counts in the hunk headers" +msgstr "ν¨μΉ λΆλΆμ ν€λμ μ€ μλ₯Ό μ μ©νμ§ μμ΅λλ€" + +#: apply.c:4981 builtin/am.c:2274 +msgid "root" +msgstr "μ΅μμ" + +#: apply.c:4982 +msgid "prepend <root> to all filenames" +msgstr "λͺ¨λ νμΌ μ΄λ¦μ <μ΅μμ>λ₯Ό μμ λΆμ
λλ€" + #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<μ΅μ
>] <νΈλ¦¬-λ°μ> [<κ²½λ‘>...]" @@ -169,7 +775,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <μ μ₯μ> [--exec <λͺ
λ Ή>] --list" -#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "'%s' κ²½λ‘λͺ
μΈκ° μ΄λ€ νμΌκ³Όλ μΌμΉνμ§ μμ΅λλ€" @@ -182,7 +788,7 @@ msgstr "νμ" msgid "archive format" msgstr "μμΆ νμ" -#: archive.c:430 builtin/log.c:1422 +#: archive.c:430 builtin/log.c:1429 msgid "prefix" msgstr "μ λμ΄" @@ -190,10 +796,10 @@ msgstr "μ λμ΄" msgid "prepend prefix to each pathname in the archive" msgstr "μμΉ΄μ΄λΈμ κ° κ²½λ‘ μ΄λ¦μ μμ μ§μ ν κ²½λ‘λ₯Ό λΆμ
λλ€" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 builtin/blame.c:2604 #: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989 -#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460 -#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562 +#: builtin/grep.c:723 builtin/hash-object.c:101 builtin/ls-files.c:539 +#: builtin/ls-files.c:542 builtin/notes.c:401 builtin/notes.c:564 #: builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "νμΌ" @@ -226,8 +832,8 @@ msgstr "λ μκ² μμΆ" msgid "list supported archive formats" msgstr "μ§μνλ μμΆ νμμ λͺ©λ‘μ νμν©λλ€" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 -#: builtin/submodule--helper.c:832 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 +#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 msgid "repo" msgstr "μ μ₯μ" @@ -235,7 +841,7 @@ msgstr "μ μ₯μ" msgid "retrieve the archive from remote repository <repo>" msgstr "μ격 μ μ₯μ <μ μ₯μ>μμ μμΉ΄μ΄λΈλ₯Ό κ°μ Έμ΅λλ€" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 msgid "command" msgstr "λͺ
λ Ή" @@ -544,7 +1150,7 @@ msgstr "'%s' νμΌμ΄ λ²μ 2 λ²λ€ νμΌλ‘ 보μ΄μ§ μμ΅λλ€" msgid "unrecognized header: %s%s (%d)" msgstr "μΈμν μ μλ ν€λ: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:778 +#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "'%s'μ(λ₯Ό) μ΄ μ μμ΅λλ€" @@ -553,9 +1159,9 @@ msgstr "'%s'μ(λ₯Ό) μ΄ μ μμ΅λλ€" msgid "Repository lacks these prerequisite commits:" msgstr "μ μ₯μμ νμμ μΈ λ€μ 컀λ°μ΄ μμ΅λλ€:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085 -#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348 -#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 +#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 #: builtin/merge.c:356 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "리λΉμ walk μ€λΉκ° μ€ν¨νμ΅λλ€" @@ -593,7 +1199,7 @@ msgstr "rev-list λͺ
λ Ήμ΄ μ£½μμ΅λλ€" msgid "ref '%s' is excluded by the rev-list options" msgstr "rev-list μ΅μ
μμ '%s' λ νΌλ°μ€κ° μ μΈλμμ΅λλ€" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "μ μ μλ μΈμ: %s" @@ -616,8 +1222,8 @@ msgstr "index-pack λͺ
λ Ήμ΄ μ£½μμ΅λλ€" msgid "invalid color value: %.*s" msgstr "μλͺ»λ μ κ°: %.*s" -#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505 -#: builtin/am.c:2119 +#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 +#: builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "parse %sμ(λ₯Ό) νμ±ν μ μμ΅λλ€" @@ -627,6 +1233,16 @@ msgstr "parse %sμ(λ₯Ό) νμ±ν μ μμ΅λλ€" msgid "%s %s is not a commit!" msgstr "%s %s, 컀λ°μ΄ μλλλ€" +#: commit.c:1514 +msgid "" +"Warning: commit message did not conform to UTF-8.\n" +"You may want to amend it after fixing the message, or set the config\n" +"variable i18n.commitencoding to the encoding your project uses.\n" +msgstr "" +"κ²½κ³ : μ»€λ° λ©μμ§κ° UTF-8 μΈμ½λ©μ λ§μ§ μμ΅λλ€.\n" +"λ©μμ§λ₯Ό μμ ν λ€μ 컀λ°μ μμ νκ±°λ, μ€μ μ i18n.commitencoding\n" +"λ³μλ₯Ό νλ‘μ νΈκ° μ¬μ© μ€μΈ μΈμ½λ©μΌλ‘ λ§μΆμμμ€.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "λ©λͺ¨λ¦¬ λ°λ₯λ¨" @@ -661,142 +1277,157 @@ msgstr "λͺ
λ Ήν %2$s μμ %1$dλ² μ€μ μλͺ»λ μ€μ " msgid "bad config line %d in %s" msgstr "%2$s μμ %1$dλ² μ€μ μλͺ»λ μ€μ " -#: config.c:660 -#, c-format -msgid "bad numeric config value '%s' for '%s': out of range" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s'): λ²μ λ²μ΄λ¨" +#: config.c:655 +msgid "out of range" +msgstr "λ²μλ₯Ό λ²μ΄λ¨" + +#: config.c:655 +msgid "invalid unit" +msgstr "λ¨μκ° μλͺ»λ¨" #: config.c:661 #, c-format -msgid "bad numeric config value '%s' for '%s': invalid unit" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s'): λ¨μ μλͺ»λ¨" +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s'): %s" -#: config.c:667 +#: config.c:666 #, c-format -msgid "bad numeric config value '%s' for '%s' in blob %s: out of range" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', λΈλ‘ %s): λ²μ λ²μ΄λ¨" +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', λΈλ‘ %s): %s" -#: config.c:668 +#: config.c:669 #, c-format -msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', λΈλ‘ %s): λ¨μ μλͺ»λ¨" +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', νμΌ %s): %s" #: config.c:672 #, c-format -msgid "bad numeric config value '%s' for '%s' in file %s: out of range" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', νμΌ %s): λ²μ λ²μ΄λ¨" - -#: config.c:673 -#, c-format -msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', νμΌ %s): λ¨μ μλͺ»λ¨" +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', νμ€μ
λ ₯): %s" -#: config.c:677 +#: config.c:675 #, c-format -msgid "bad numeric config value '%s' for '%s' in standard input: out of range" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', νμ€μ
λ ₯): λ²μ λ²μ΄λ¨" +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', νμ λͺ¨λ λΈλ‘ %s): %s" #: config.c:678 #, c-format -msgid "bad numeric config value '%s' for '%s' in standard input: invalid unit" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', νμ€μ
λ ₯): λ¨μ μλͺ»λ¨" - -#: config.c:682 -#, c-format -msgid "" -"bad numeric config value '%s' for '%s' in submodule-blob %s: out of range" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', νμ λͺ¨λ λΈλ‘ %s): λ²μ λ²μ΄λ¨" - -#: config.c:683 -#, c-format -msgid "" -"bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', νμ λͺ¨λ λΈλ‘ %s): λ¨μ μλͺ»λ¨" - -#: config.c:687 -#, c-format -msgid "bad numeric config value '%s' for '%s' in command line %s: out of range" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', λͺ
λ Ήν %s): λ²μ λ²μ΄λ¨" - -#: config.c:688 -#, c-format -msgid "bad numeric config value '%s' for '%s' in command line %s: invalid unit" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', λͺ
λ Ήν %s): λ¨μ μλͺ»λ¨" - -#: config.c:692 -#, c-format -msgid "bad numeric config value '%s' for '%s' in %s: out of range" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', %s μμ): λ²μ λ²μ΄λ¨" +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', λͺ
λ Ήν %s): %s" -#: config.c:693 +#: config.c:681 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s: invalid unit" -msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', %s μμ): λ¨μ μλͺ»λ¨" +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s', %s μμ): %s" -#: config.c:780 +#: config.c:768 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "λ€μμ μ¬μ©μ λλ ν°λ¦¬ νμ₯μ μ€ν¨: '%s'" -#: config.c:861 config.c:872 +#: config.c:852 config.c:863 #, c-format msgid "bad zlib compression level %d" msgstr "%dλ²μ μ¬λ°λ₯Έ zlib μμΆ λ¨κ³κ° μλλλ€" -#: config.c:990 +#: config.c:978 #, c-format msgid "invalid mode for object creation: %s" msgstr "μ€λΈμ νΈ μμ± λͺ¨λκ° μ¬λ°λ₯΄μ§ μμ΅λλ€: %s" -#: config.c:1324 +#: config.c:1312 msgid "unable to parse command-line config" msgstr "λͺ
λ Ήν μ€μ μ νμ±ν μ μμ΅λλ€" -#: config.c:1374 +#: config.c:1362 msgid "unknown error occurred while reading the configuration files" msgstr "μ€μ νμΌμ μ½λ μ€ μ μ μλ μ€λ₯κ° μκ²Όμ΅λλ€" -#: config.c:1728 +#: config.c:1716 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "λͺ
λ Ήν μ€μ μμ '%s'μ(λ₯Ό) μ€μ ν μ μμ΅λλ€" -#: config.c:1730 +#: config.c:1718 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "'%2$s' νμΌμ %3$dλ² μ€ '%1$s' μ€μ λ³μκ° μλͺ»λμμ΅λλ€" -#: config.c:1789 +#: config.c:1777 #, c-format msgid "%s has multiple values" msgstr "%sμ(λ) μ¬λ¬ κ° κ°μ΄ μμ΅λλ€" -#: config.c:2323 +#: config.c:2311 #, c-format msgid "could not set '%s' to '%s'" msgstr "'%s'μ(λ₯Ό) '%s'(μΌ)λ‘ μ€μ ν μ μμ΅λλ€" -#: config.c:2325 +#: config.c:2313 #, c-format msgid "could not unset '%s'" msgstr "'%s' μ€μ μ μ§μΈ μ μμ΅λλ€" +#: connect.c:49 +msgid "The remote end hung up upon initial contact" +msgstr "리λͺ¨νΈ μΈ‘μ΄ μ΅μ΄ μ°κ²°νμ λ μ°κ²°μ λμμ΅λλ€" + +#: connect.c:51 +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "" +"리λͺ¨νΈ μ μ₯μμμ μ½μ μ μμ΅λλ€\n" +"\n" +"μ¬λ°λ₯Έ μ κ·Ό κΆνμ΄ μλμ§, κ·Έλ¦¬κ³ μ μ₯μκ° μλμ§\n" +"νμΈνμμμ€." + #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 msgid "Checking connectivity" msgstr "μ°κ²°μ νμΈνλ μ€μ
λλ€" -#: connected.c:74 +#: connected.c:75 msgid "Could not run 'git rev-list'" msgstr "'git rev-list'λ₯Ό μ€νν μ μμ΅λλ€" -#: connected.c:94 +#: connected.c:95 msgid "failed write to rev-list" msgstr "rev-list μ°κΈ°μ μ€ν¨νμ΅λλ€" -#: connected.c:101 +#: connected.c:102 msgid "failed to close rev-list's stdin" msgstr "rev-listμ νμ€μ
λ ₯μ λ«λλ° μ€ν¨νμ΅λλ€" +#: convert.c:201 +#, c-format +msgid "" +"CRLF will be replaced by LF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"%sμμ CRLFλ LFλ‘ λ°λλλ€.\n" +"μμ
λλ ν°λ¦¬μμλ μλ μ€ λ°κΏ νμμ μ μ§ν©λλ€." + +#: convert.c:205 +#, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "%sμμ CRLFλ LFλ‘ λ°λλλ€." + +#: convert.c:211 +#, c-format +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"%sμμ LFλ CRLFλ‘ λ°λλλ€.\n" +"μμ
λλ ν°λ¦¬μμλ μλ μ€ λ°κΏ νμμ μ μ§ν©λλ€." + +#: convert.c:215 +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "%sμμ LFλ CRLFλ‘ λ°λλλ€." + #: date.c:97 msgid "in the future" msgstr "λ―Έλμ" @@ -865,22 +1496,27 @@ msgstr "'%s' μμ νμΌμ μ½λλ° μ€ν¨νμ΅λλ€" msgid "Performing inexact rename detection" msgstr "λΆμ νν μ΄λ¦ λ°κΎΈκΈ° νμμ μννλ μ€" -#: diff.c:116 +#: diff.c:62 +#, c-format +msgid "option '%s' requires a value" +msgstr "'%s' μ΅μ
μλ κ°μ΄ νμν©λλ€" + +#: diff.c:124 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " dirstat μλ¦ νΌμΌνΈ κ° '%s' νμ±μ μ€ν¨νμ΅λλ€\n" -#: diff.c:121 +#: diff.c:129 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " μ μ μλ dirstat νλΌλ―Έν° '%s'\n" -#: diff.c:225 +#: diff.c:283 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "'diff.submodule' μ€μ λ³μμ μ μ μλ κ°: '%s'" -#: diff.c:277 +#: diff.c:346 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -889,16 +1525,20 @@ msgstr "" "'diff.submodule' μ€μ λ³μμ μ€λ₯:\n" "%s'" -#: diff.c:3017 +#: diff.c:3087 #, c-format msgid "external diff died, stopping at %s" msgstr "μΈλΆ diff νλ‘κ·Έλ¨μ΄ μ£½μ, %s μμΉμμ λ©μΆ€" -#: diff.c:3415 +#: diff.c:3412 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "\"--name-only, --name-status, --check, -s μ΅μ
μ€ νλλ§ μΈ μ μμ΅λλ€" + +#: diff.c:3502 msgid "--follow requires exactly one pathspec" msgstr "--follow μ΅μ
μλ μ νν νλμ κ²½λ‘λͺ
μΈκ° νμν©λλ€" -#: diff.c:3578 +#: diff.c:3665 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -907,61 +1547,242 @@ msgstr "" "--dirstat/-X μ΅μ
νλΌλ―Έν°λ₯Ό νμ±νλλ° μ€ν¨νμ΅λλ€:\n" "%s" -#: diff.c:3592 +#: diff.c:3679 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "--submodule μ΅μ
νλΌλ―Έν° νμ±μ μ€ν¨νμ΅λλ€: '%s'" -#: dir.c:1823 +#: diff.c:4700 +msgid "inexact rename detection was skipped due to too many files." +msgstr "νμΌμ΄ λ무 λ§μμ λΆμ νν μ΄λ¦ λ°κΎΈκΈ° κ²μ κΈ°λ₯μ 건λλλλ€." + +#: diff.c:4703 +msgid "only found copies from modified paths due to too many files." +msgstr "νμΌμ΄ λ무 λ§μμ μμ ν κ²½λ‘μ 볡μ¬λ³Έλ§ μ°Ύμμ΅λλ€." + +#: diff.c:4706 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "%s λ³μλ₯Ό μ΅μν %d(μΌ)λ‘ μ€μ νκ³ λͺ
λ Ήμ λ€μ μλν΄ λ³΄μμμ€." + +#: dir.c:1866 msgid "failed to get kernel name and information" msgstr "컀λ μ΄λ¦κ³Ό μ 보λ₯Ό κ°μ Έμ€λλ° μ€ν¨νμ΅λλ€" -#: dir.c:1942 +#: dir.c:1985 msgid "Untracked cache is disabled on this system or location." msgstr "μ΄ μμ€ν
λλ μμΉμμλ μΆμ λμ§ μλ μΊμλ₯Ό μ¬μ©νμ§ μμ΅λλ€." -#: gpg-interface.c:178 +#: fetch-pack.c:213 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack: μμ λͺ©λ‘μ μμν¨" + +#: fetch-pack.c:225 +msgid "git fetch-pack: expected ACK/NAK, got EOF" +msgstr "git fetch-pack: ACK/NAKκ° μμΌ νμ§λ§, EOFλ₯Ό λ°μμ΅λλ€" + +#: fetch-pack.c:243 +#, c-format +msgid "git fetch_pack: expected ACK/NAK, got '%s'" +msgstr "git fetch_pack: ACK/NAKκ° μμΌ νμ§λ§, '%s'μ(λ₯Ό) λ°μμ΅λλ€" + +#: fetch-pack.c:295 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc μ΅μ
μ multi_ack_detailedκ° νμν©λλ€" + +#: fetch-pack.c:381 +#, c-format +msgid "invalid shallow line: %s" +msgstr "shallow μ€μ΄ μλͺ»λ¨: %s" + +#: fetch-pack.c:387 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "unshallow μ€μ΄ μλͺ»λ¨: %s" + +#: fetch-pack.c:389 +#, c-format +msgid "object not found: %s" +msgstr "μ€λΈμ νΈκ° μμ΅λλ€: %s" + +#: fetch-pack.c:392 +#, c-format +msgid "error in object: %s" +msgstr "μ€λΈμ νΈμ μ€λ₯: %s" + +#: fetch-pack.c:394 +#, c-format +msgid "no shallow found: %s" +msgstr "shallowκ° μμ΅λλ€: %s" + +#: fetch-pack.c:397 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "shallow/unshallowκ° μμΌ νμ§λ§, %sμ(λ₯Ό) λ°μμ΅λλ€" + +#: fetch-pack.c:436 +#, c-format +msgid "got %s %d %s" +msgstr "λ°μ: %s %d %s" + +#: fetch-pack.c:450 +#, c-format +msgid "invalid commit %s" +msgstr "μλͺ»λ μ»€λ° %s" + +#: fetch-pack.c:483 +msgid "giving up" +msgstr "ν¬κΈ°ν¨" + +#: fetch-pack.c:493 progress.c:235 +msgid "done" +msgstr "μλ£" + +#: fetch-pack.c:505 +#, c-format +msgid "got %s (%d) %s" +msgstr "λ°μ: %s (%d) %s" + +#: fetch-pack.c:551 +#, c-format +msgid "Marking %s as complete" +msgstr "%s νλͺ©μ μλ£λ‘ νμ" + +#: fetch-pack.c:697 +#, c-format +msgid "already have %s (%s)" +msgstr "μ΄λ―Έ %s (%s) μμ" + +#: fetch-pack.c:735 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack: μ¬μ΄λλ°΄λ λλ©ν°νλ μλ₯Ό forkν μ μμ΅λλ€" + +#: fetch-pack.c:743 +msgid "protocol error: bad pack header" +msgstr "νλ‘ν μ½ μ€λ₯: μλͺ»λ λ¬Άμ ν€λ" + +#: fetch-pack.c:799 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack: %s λͺ
λ Ήμ forkν μ μμ΅λλ€" + +#: fetch-pack.c:815 +#, c-format +msgid "%s failed" +msgstr "%s μ€ν¨" + +#: fetch-pack.c:817 +msgid "error in sideband demultiplexer" +msgstr "μ¬μ΄λλ°΄λ λλ©ν°νλ μμ μ€λ₯" + +#: fetch-pack.c:844 +msgid "Server does not support shallow clients" +msgstr "μλ²μμ shallow ν΄λΌμ΄μΈνΈλ₯Ό μ§μνμ§ μμ΅λλ€" + +#: fetch-pack.c:848 +msgid "Server supports multi_ack_detailed" +msgstr "μλ²μμ multi_ack_detailedλ₯Ό μ§μν©λλ€" + +#: fetch-pack.c:851 +msgid "Server supports no-done" +msgstr "μλ²μμ no-doneμ μ§μν©λλ€" + +#: fetch-pack.c:857 +msgid "Server supports multi_ack" +msgstr "μλ²μμ multi_ackλ₯Ό μ§μν©λλ€" + +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" +msgstr "μλ²μμ side-band-64kλ₯Ό μ§μν©λλ€" + +#: fetch-pack.c:865 +msgid "Server supports side-band" +msgstr "μλ²μμ side-bandλ₯Ό μ§μν©λλ€" + +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "μλ²μμ allow-tip-sha1-in-wantλ₯Ό μ§μν©λλ€" + +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "μλ²μμ allow-reachable-sha1-in-wantλ₯Ό μ§μν©λλ€" + +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" +msgstr "μλ²μμ ofs-deltaλ₯Ό μ§μν©λλ€" + +#: fetch-pack.c:890 +#, c-format +msgid "Server version is %.*s" +msgstr "μλ² λ²μ μ΄ %.*sμ
λλ€" + +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" +msgstr "μλ²μμ --shallow-signed μ΅μ
μ μ§μνμ§ μμ΅λλ€" + +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" +msgstr "μλ²μμ --shallow-exclude μ΅μ
μ μ§μνμ§ μμ΅λλ€" + +#: fetch-pack.c:902 +msgid "Server does not support --deepen" +msgstr "μλ²μμ --deepen μ΅μ
μ μ§μνμ§ μμ΅λλ€" + +#: fetch-pack.c:913 +msgid "no common commits" +msgstr "κ³΅ν΅ μ»€λ° μμ" + +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack: κ°μ Έμ€κΈ° μ€ν¨." + +#: fetch-pack.c:1087 +msgid "no matching remote head" +msgstr "ν΄λΉνλ 리λͺ¨νΈ ν€λκ° μμ΅λλ€" + +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpgμμ λ°μ΄ν°λ₯Ό μλͺ
νλλ° μ€ν¨νμ΅λλ€." -#: gpg-interface.c:208 +#: gpg-interface.c:215 msgid "could not create temporary file" msgstr "μμ νμΌμ λ§λ€ μ μμ΅λλ€" -#: gpg-interface.c:210 +#: gpg-interface.c:217 #, c-format msgid "failed writing detached signature to '%s'" msgstr "λΆλ¦¬λ μλͺ
μ '%s'μ μ°λλ° μ€ν¨νμ΅λλ€" -#: grep.c:1792 +#: grep.c:1782 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %sμ(λ₯Ό) μ½μ μ μμ΅λλ€" -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "'%s'μ λν΄ stat()μ΄ μ€ν¨νμ΅λλ€" -#: grep.c:1820 +#: grep.c:1810 #, c-format msgid "'%s': short read" msgstr "'%s': μ½λ€κ° μλ¦Ό" -#: help.c:205 +#: help.c:203 #, c-format msgid "available git commands in '%s'" msgstr "'%s'μ μλ κΉ λͺ
λ Ή" -#: help.c:212 +#: help.c:210 msgid "git commands available from elsewhere on your $PATH" msgstr "λ€λ₯Έ $PATHμ μλ κΉ λͺ
λ Ή" -#: help.c:244 +#: help.c:241 msgid "These are common Git commands used in various situations:" msgstr "λ€μμ μ¬λ¬κ°μ§ μν©μμ μμ£Ό μ¬μ©νλ κΉ λͺ
λ Ήμ
λλ€:" -#: help.c:309 +#: help.c:306 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -970,11 +1791,11 @@ msgstr "" "'%s'μ(λ) κΉ λͺ
λ ΉμΌλ‘ 보μ΄μ§λ§, μ€νν μ\n" "μμ΅λλ€. μλ§λ git-%s λ§κ°μ§ κ² κ°μ΅λλ€." -#: help.c:366 +#: help.c:361 msgid "Uh oh. Your system reports no Git commands at all." msgstr "μ΄λΌλΌ. μμ€ν
μ κΉ λͺ
λ Ήμ΄ νλλ μλ€κ³ λμ΅λλ€." -#: help.c:388 +#: help.c:383 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -983,17 +1804,17 @@ msgstr "" "κ²½κ³ : μ΄λ¦μ΄ '%s'μΈ κΉ λͺ
λ Ήμ μ€ννμ§λ§, κ·Έ λͺ
λ Ήμ΄ μμ΅λλ€.\n" "μλμΌλ‘ '%s' λͺ
λ Ήμ΄λΌκ³ κ°μ νκ³ κ³μν©λλ€" -#: help.c:393 +#: help.c:388 #, c-format msgid "in %0.1f seconds automatically..." msgstr "(%0.1fμ΄ λ€μ)..." -#: help.c:400 +#: help.c:395 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s'μ(λ) κΉ λͺ
λ Ήμ΄ μλλλ€. 'git --help'λ₯Ό μ°Έκ³ νμμμ€." -#: help.c:404 help.c:470 +#: help.c:399 help.c:465 msgid "" "\n" "Did you mean this?" @@ -1004,11 +1825,37 @@ msgstr[0] "" "\n" "λ€μμ μλνμ κ² μλμλμ?" -#: help.c:466 +#: help.c:461 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: ident.c:334 +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" +msgstr "" +"\n" +"*** λ΄κ° λꡬμΈμ§ μ€μ νμμμ€.\n" +"\n" +"λ€μμ μ€ννλ©΄,\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"λ΄ μ΄λ¦\"\n" +"\n" +"κ³μ μ κΈ°λ³Έ μ μ μ 보λ₯Ό μ€μ ν©λλ€.\n" +"--global μ΅μ
μ λΉΌλ©΄ μ΄ μ μ₯μμλ§ μ μ μ 보λ₯Ό μ€μ ν©λλ€.\n" +"\n" + #: lockfile.c:152 #, c-format msgid "" @@ -1037,78 +1884,78 @@ msgstr "'%s.lock'μ λ§λ€ μ μμ΅λλ€: %s" msgid "failed to read the cache" msgstr "μΊμλ₯Ό μ½λλ° μ€ν¨νμ΅λλ€" -#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375 -#: builtin/checkout.c:589 builtin/clone.c:732 +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 +#: builtin/checkout.c:588 builtin/clone.c:731 msgid "unable to write new index file" msgstr "μ μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" -#: merge-recursive.c:212 +#: merge-recursive.c:209 msgid "(bad commit)\n" msgstr "(μλͺ»λ 컀λ°)\n" -#: merge-recursive.c:234 +#: merge-recursive.c:231 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "'%s' κ²½λ‘μ λν΄ addinfo_cacheκ° μ€ν¨νμ΅λλ€" -#: merge-recursive.c:304 +#: merge-recursive.c:301 msgid "error building trees" msgstr "νΈλ¦¬ λΉλμ μ€λ₯" -#: merge-recursive.c:723 +#: merge-recursive.c:720 #, c-format msgid "failed to create path '%s'%s" msgstr "'%s' κ²½λ‘ λ§λ€κΈ°μ μ€ν¨νμ΅λλ€%s" -#: merge-recursive.c:734 +#: merge-recursive.c:731 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "νμ λλ ν°λ¦¬μ 곡κ°μ λ§λλ €κ³ %sμ(λ₯Ό) μ κ±°ν©λλ€\n" -#: merge-recursive.c:748 merge-recursive.c:767 +#: merge-recursive.c:745 merge-recursive.c:764 msgid ": perhaps a D/F conflict?" msgstr ": μλ§λ D/F μΆ©λ?" -#: merge-recursive.c:757 +#: merge-recursive.c:754 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "'%s' μμΉμ μΆμ λμ§ μλ νμΌμ μκΈ°λ₯Ό κ±°λΆν©λλ€" -#: merge-recursive.c:799 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "%s '%s' μ€λΈμ νΈλ₯Ό μ½μ μ μμ" -#: merge-recursive.c:801 +#: merge-recursive.c:798 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s'μ λν΄ λΈλ‘μ μμ" -#: merge-recursive.c:825 +#: merge-recursive.c:822 #, c-format msgid "failed to open '%s': %s" msgstr "'%s'μ(λ₯Ό) μ¬λλ° μ€ν¨: %s" -#: merge-recursive.c:836 +#: merge-recursive.c:833 #, c-format msgid "failed to symlink '%s': %s" msgstr "'%s' μ¬λ³Όλ¦ λ§ν¬μ μ€ν¨: %s" -#: merge-recursive.c:841 +#: merge-recursive.c:838 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "λ€μμ μ΄λ»κ² ν μ§ μ μ μμ΅λλ€: %06o %s '%s'" -#: merge-recursive.c:981 +#: merge-recursive.c:978 msgid "Failed to execute internal merge" msgstr "λ΄λΆ λ³ν© μ€νμ μ€ν¨" -#: merge-recursive.c:985 +#: merge-recursive.c:982 #, c-format msgid "Unable to add %s to database" msgstr "%sμ(λ₯Ό) λ°μ΄ν°λ² μ΄μ€μ μΆκ°ν μ μμ΅λλ€" -#: merge-recursive.c:1084 merge-recursive.c:1098 +#: merge-recursive.c:1081 merge-recursive.c:1095 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1116,7 +1963,7 @@ msgid "" msgstr "" "μΆ©λ! (%s/μμ ): %s (μμΉ %s) λ° %s (%sμμ) μμ . %s λ²μ μ %s νΈλ¦¬μ λ¨μ." -#: merge-recursive.c:1090 merge-recursive.c:1103 +#: merge-recursive.c:1087 merge-recursive.c:1100 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1125,20 +1972,20 @@ msgstr "" "μΆ©λ! (%s/μμ ): %s (μμΉ %s) λ° %s (μμΉ %s) μμ . %s λ²μ μ %s νΈλ¦¬μ " "%s(μΌ)λ‘ λ¨μ." -#: merge-recursive.c:1146 +#: merge-recursive.c:1143 msgid "rename" msgstr "μ΄λ¦λ°κΎΈκΈ°" -#: merge-recursive.c:1146 +#: merge-recursive.c:1143 msgid "renamed" msgstr "μ΄λ¦λ°κΏ" -#: merge-recursive.c:1203 +#: merge-recursive.c:1200 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%sμ(λ) %sμ μλ λλ ν°λ¦¬λ‘ %s(μΌ)λ‘ μ΄λ¦μ λ°κΏλλ€" -#: merge-recursive.c:1228 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -1147,139 +1994,155 @@ msgstr "" "μΆ©λ! (μ΄λ¦λ°κΎΈκΈ°/μ΄λ¦λ°κΎΈκΈ°): \"%3$s\" λΈλμΉμμ μ΄λ¦λ°κΎΈκΈ° \"%1$s\"->" "\"%2$s\" \"%6$s\" λΈλμΉμμ μ΄λ¦ λ°κΎΈκΈ° \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1233 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr " (ν΄κ²°λμ§ μμ)" -#: merge-recursive.c:1295 +#: merge-recursive.c:1292 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "μΆ©λ! (rename/rename): μ΄λ¦ λ°κΎΈκΈ° %s->%s (μμΉ %s). μ΄λ¦ λ°κΎΈκΈ° %s->%s (μ" "μΉ %s)" -#: merge-recursive.c:1328 +#: merge-recursive.c:1325 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "λμ μ΄λ¦μ %sμμ %s(μΌ)λ‘ λ°κΎΈκ³ %sμμ %s(μΌ)λ‘ λ°κΏλλ€" -#: merge-recursive.c:1534 +#: merge-recursive.c:1531 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "μΆ©λ! (rename/add): μ΄λ¦ λ°κΎΈκΈ° %s->%s (μμΉ %s). %s μΆκ° (μμΉ %s)" -#: merge-recursive.c:1549 +#: merge-recursive.c:1546 #, c-format msgid "Adding merged %s" msgstr "λ³ν©λ %sμ(λ₯Ό) μΆκ°ν©λλ€" -#: merge-recursive.c:1556 merge-recursive.c:1769 +#: merge-recursive.c:1553 merge-recursive.c:1766 #, c-format msgid "Adding as %s instead" msgstr "λμ %s(μΌ)λ‘ μΆκ°ν©λλ€" -#: merge-recursive.c:1613 +#: merge-recursive.c:1610 #, c-format msgid "cannot read object %s" msgstr "%s μ€λΈμ νΈλ₯Ό μ½μ μ μμ΅λλ€" -#: merge-recursive.c:1616 +#: merge-recursive.c:1613 #, c-format msgid "object %s is not a blob" msgstr "%s μ€λΈμ νΈλ λΈλ‘μ΄ μλλλ€" -#: merge-recursive.c:1669 +#: merge-recursive.c:1666 msgid "modify" msgstr "μμ " -#: merge-recursive.c:1669 +#: merge-recursive.c:1666 msgid "modified" msgstr "μμ λ¨" -#: merge-recursive.c:1679 +#: merge-recursive.c:1676 msgid "content" msgstr "λ΄μ©" -#: merge-recursive.c:1686 +#: merge-recursive.c:1683 msgid "add/add" msgstr "μΆκ°/μΆκ°" -#: merge-recursive.c:1721 +#: merge-recursive.c:1718 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "건λλ°κΈ°: %s (κΈ°μ‘΄κ³Ό κ°κ² λ³ν©)" -#: merge-recursive.c:1735 +#: merge-recursive.c:1732 #, c-format msgid "Auto-merging %s" msgstr "μλ λ³ν©: %s" -#: merge-recursive.c:1739 git-submodule.sh:919 +#: merge-recursive.c:1736 git-submodule.sh:924 msgid "submodule" msgstr "νμ λͺ¨λ" -#: merge-recursive.c:1740 +#: merge-recursive.c:1737 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "μΆ©λ! (%s): %sμ λ³ν© μΆ©λ" -#: merge-recursive.c:1834 +#: merge-recursive.c:1831 #, c-format msgid "Removing %s" msgstr "μ κ±°: %s" -#: merge-recursive.c:1860 +#: merge-recursive.c:1857 msgid "file/directory" msgstr "νμΌ/λλ ν°λ¦¬" -#: merge-recursive.c:1866 +#: merge-recursive.c:1863 msgid "directory/file" msgstr "λλ ν°λ¦¬/νμΌ" -#: merge-recursive.c:1871 +#: merge-recursive.c:1868 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "μΆ©λ! (%s): μ΄λ¦μ΄ %sμΈ λλ ν°λ¦¬κ° %sμ μμ΅λλ€. %sμ(λ₯Ό) %s(μΌ)λ‘ μΆκ°ν©λ" "λ€" -#: merge-recursive.c:1880 +#: merge-recursive.c:1877 #, c-format msgid "Adding %s" msgstr "μΆκ°: %s" -#: merge-recursive.c:1917 +#: merge-recursive.c:1914 msgid "Already up-to-date!" msgstr "μ΄λ―Έ μ
λ°μ΄νΈ μνμ
λλ€!" -#: merge-recursive.c:1926 +#: merge-recursive.c:1923 #, c-format msgid "merging of trees %s and %s failed" msgstr "%s λ° %s νΈλ¦¬μ λ³ν©μ΄ μ€ν¨νμ΅λλ€" -#: merge-recursive.c:2009 +#: merge-recursive.c:2006 msgid "Merging:" msgstr "λ³ν©:" -#: merge-recursive.c:2022 +#: merge-recursive.c:2019 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "κ³Όκ±°μ κ³΅ν΅ μ»€λ° %uκ° λ°κ²¬:" -#: merge-recursive.c:2061 +#: merge-recursive.c:2058 msgid "merge returned no commit" msgstr "λ³ν© κ²°κ³Όμ 컀λ°μ΄ μμ΅λλ€" -#: merge-recursive.c:2124 +#: merge-recursive.c:2121 #, c-format msgid "Could not parse object '%s'" msgstr "'%s' μ€λΈμ νΈλ₯Ό νμ±ν μ μμ΅λλ€" -#: merge-recursive.c:2138 builtin/merge.c:641 builtin/merge.c:788 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 msgid "Unable to write index." msgstr "μΈλ±μ€λ₯Ό μΈ μ μμ΅λλ€." +#: notes-merge.c:273 +#, c-format +msgid "" +"You have not concluded your previous notes merge (%s exists).\n" +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." +msgstr "" +"μ΄μ μ λ
ΈνΈ λ³ν©μ λ€ λ§μΉμ§ μμμ΅λλ€ (%s μμ).\n" +"μλ‘ λ
ΈνΈ λ³ν©μ μμνκΈ° μ μ 'git notes merge --commit'\n" +"λλ 'git notes merge --abort'λ‘ μ΄μ λ³ν©μ 컀λ°/μ€μ§νμμμ€." + +#: notes-merge.c:280 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "λ
ΈνΈ λ³ν© μμ
μ λ€ λ§μΉμ§ μμμ΅λλ€. (%s μμ)" + #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "μ΄κΈ°ννμ§ μμκ±°λ λ νΌλ°μ€νμ§ μμ notes νΈλ¦¬λ₯Ό 컀λ°ν μ μμ΅λλ€" @@ -1336,7 +2199,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "μλͺ»λ νμμ μ€λΈμ νΈ μ΄λ¦ '%s'" -#: path.c:796 +#: path.c:826 #, c-format msgid "Could not make %s writable by group" msgstr "%sμ(λ₯Ό) κ·Έλ£Ήμμ μ°κΈ° κ°λ₯νλλ‘ λ§λ€ μ μμ΅λλ€" @@ -1391,12 +2254,18 @@ msgstr "κ²½λ‘λͺ
μΈ '%s'μ(λ) ''%.*s' νμ λͺ¨λ μμ μμ΅λλ€" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: κ²½λ‘λͺ
μΈ μ§μμ΄κ° μ΄ λͺ
λ Ήμ΄μμ μ§μνμ§ μμ΅λλ€: %s" -#: pathspec.c:433 +#: pathspec.c:408 +msgid "" +"empty strings as pathspecs will be made invalid in upcoming releases. please " +"use . instead if you meant to match all paths" +msgstr "κ²½λ‘λͺ
μΈλ‘ λΉ λ¬Έμμ΄μ λ£λ μΌμ λ€μ 릴리μ€μμ μ€λ₯λ‘ μ·¨κΈν μμ μ
λλ€. λͺ¨λ κ²½λ‘λ₯Ό μ§μ νλ €λ©΄ μ (.)μ μ¬μ©νμμμ€." + +#: pathspec.c:440 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "'%s' κ²½λ‘λͺ
μΈλ μ¬λ³Όλ¦ λ§ν¬ μλμ μμ΅λλ€" -#: pathspec.c:442 +#: pathspec.c:449 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1404,15 +2273,11 @@ msgstr "" ":(exclude) ν¨ν΄μΌλ‘ μ μΈν μ¬νμ΄ μμ΅λλ€.\n" "':/' λλ '.' μΆκ°λ₯Ό μμΌμ κ² μλλκΉ?" -#: pretty.c:973 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "--pretty νμμ νμ±ν μ μμ΅λλ€" -#: progress.c:235 -msgid "done" -msgstr "μλ£" - -#: read-cache.c:1281 +#: read-cache.c:1315 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1421,7 +2286,7 @@ msgstr "" "index.versionμ΄ μ€μ λμμ§λ§, μ΄ κ°μ΄ μλͺ»λμμ΅λλ€.\n" "%i λ²μ μ μ¬μ©ν©λλ€" -#: read-cache.c:1291 +#: read-cache.c:1325 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1430,22 +2295,22 @@ msgstr "" "GIT_INDEX_VERSIONμ΄ μ€μ λμμ§λ§, μ΄ κ°μ΄ μλͺ»λμμ΅λλ€.\n" "%i λ²μ μ μ¬μ©ν©λλ€" -#: refs.c:551 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:840 #, c-format msgid "Could not open '%s' for writing" msgstr "'%s'μ(λ₯Ό) μ°κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€" -#: refs/files-backend.c:2534 +#: refs/files-backend.c:2481 #, c-format msgid "could not delete reference %s: %s" msgstr "%s λ νΌλ°μ€λ₯Ό μμ ν μ μμ΅λλ€: %s" -#: refs/files-backend.c:2537 +#: refs/files-backend.c:2484 #, c-format msgid "could not delete references: %s" msgstr "λ νΌλ°μ€λ₯Ό μμ ν μ μμ΅λλ€: %s" -#: refs/files-backend.c:2546 +#: refs/files-backend.c:2493 #, c-format msgid "could not remove reference %s" msgstr "%s λ νΌλ°μ€λ₯Ό μ κ±°ν μ μμ΅λλ€" @@ -1574,12 +2439,12 @@ msgstr "λ§κ°μ§ μ΄λ¦ %sμ λ νΌλ°μ€λ₯Ό 무μν©λλ€" msgid "ignoring broken ref %s" msgstr "λ§κ°μ§ λ νΌλ°μ€ %s 무μ" -#: ref-filter.c:1651 +#: ref-filter.c:1633 #, c-format msgid "format: %%(end) atom missing" msgstr "νμ: %%(end) μν°μ΄ μμ΅λλ€" -#: ref-filter.c:1705 +#: ref-filter.c:1687 #, c-format msgid "malformed object name %s" msgstr "μλͺ»λ νμμ μ€λΈμ νΈ μ΄λ¦ %s" @@ -1697,52 +2562,60 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (리λͺ¨νΈμ λΈλμΉλ₯Ό νμ¬ λΈλμΉλ‘ λ³ν©νλ €λ©΄ \"git pull\"μ μ¬μ©νμμμ€)\n" -#: revision.c:2132 +#: revision.c:2158 msgid "your current branch appears to be broken" msgstr "νμ¬ λΈλμΉκ° λ§κ°μ§ κ²μ²λΌ 보μ
λλ€" -#: revision.c:2135 +#: revision.c:2161 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "νμ¬ '%s' λΈλμΉμ μμ§ μ무 컀λ°λ μμ΅λλ€" -#: revision.c:2329 +#: revision.c:2355 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent μ΅μ
μ --bisect μ΅μ
κ³Ό νΈνλμ§ μμ΅λλ€" -#: run-command.c:92 +#: run-command.c:106 msgid "open /dev/null failed" msgstr "/dev/null μ΄κΈ° μ€ν¨" -#: run-command.c:94 +#: run-command.c:108 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) μ€ν¨" -#: send-pack.c:298 +#: send-pack.c:297 msgid "failed to sign the push certificate" msgstr "νΈμ μΈμ¦μ μλͺ
μ μ€ν¨νμ΅λλ€" -#: send-pack.c:411 +#: send-pack.c:410 msgid "the receiving end does not support --signed push" msgstr "λ°λ μͺ½μμ --signed νΈμλ₯Ό μ§μνμ§ μμ΅λλ€" -#: send-pack.c:413 +#: send-pack.c:412 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" "λ°λ μͺ½μμ --signed νΈμλ₯Ό μ§μνμ§ μμΌλ―λ‘ νΈμ μΈμ¦μλ₯Ό 보λ΄μ§ μμ΅λλ€" -#: send-pack.c:425 +#: send-pack.c:424 msgid "the receiving end does not support --atomic push" msgstr "λ°λ μͺ½μμ --atomic νΈμλ₯Ό μ§μνμ§ μμ΅λλ€" -#: send-pack.c:430 +#: send-pack.c:429 msgid "the receiving end does not support push options" msgstr "λ°λ μͺ½μμ νΈμ μ΅μ
μ μ§μνμ§ μμ΅λλ€" -#: sequencer.c:174 +#: sequencer.c:171 +msgid "revert" +msgstr "λλ리기" + +#: sequencer.c:171 +msgid "cherry-pick" +msgstr "λΉΌμ€κΈ°" + +#: sequencer.c:228 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1750,7 +2623,7 @@ msgstr "" "μ΄ μΆ©λμ ν΄κ²°ν λ€μ, λ°λ‘μ‘μ κ²½λ‘λ₯Ό\n" "'git add <κ²½λ‘>' λλ 'git rm <κ²½λ‘>'λ‘ νμνμμμ€" -#: sequencer.c:177 +#: sequencer.c:231 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1760,230 +2633,258 @@ msgstr "" "'git add <κ²½λ‘>' λλ 'git rm <κ²½λ‘>'λ‘ νμνμμμ€.\n" "κ·Έλ¦¬κ³ κ²°κ³Όλ¬Όμ 'git commit'μΌλ‘ 컀λ°νμμμ€" -#: sequencer.c:190 sequencer.c:841 sequencer.c:924 +#: sequencer.c:244 sequencer.c:1209 #, c-format -msgid "Could not write to %s" -msgstr "%sμ μΈ μ μμ΅λλ€" +msgid "could not lock '%s'" +msgstr "'%s'μ(λ₯Ό) μ κΈ μ μμ΅λλ€" -#: sequencer.c:193 sequencer.c:843 sequencer.c:928 +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 #, c-format -msgid "Error wrapping up %s." -msgstr "%s μ κ·Έλλ° μ€λ₯." +msgid "could not write to '%s'" +msgstr "'%s'μ μΈ μ μμ΅λλ€" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "λ‘컬 λ³κ²½ μ¬νμ cherry-pick λλ¬Έμ λμ΄ μ°κ² λ©λλ€." +#: sequencer.c:251 +#, c-format +msgid "could not write eol to '%s" +msgstr "'%s'μ μ€λ°κΏμ μΈ μ μμ΅λλ€" -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "λ‘컬 λ³κ²½ μ¬νμ revert λλ¬Έμ λμ΄ μ°κ² λ©λλ€." +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#, c-format +msgid "failed to finalize '%s'." +msgstr "'%s' λ§μΉλλ° μ€ν¨νμ΅λλ€" -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." -msgstr "λ³κ²½ μ¬νμ μ€ν
μ΄μ§νκ±°λ μ€νμν λ€μ κ³μνμμμ€." +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#, c-format +msgid "could not read '%s'" +msgstr "'%s'μμ μ½μ μ μμ΅λλ€" -#: sequencer.c:228 +#: sequencer.c:305 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "λ‘컬 λ³κ²½ μ¬νμ %s λλ¬Έμ λμ΄ μ°κ² λ©λλ€." + +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." +msgstr "λ³κ²½ μ¬νμ 컀λ°νκ±°λ μ€νμν λ€μ κ³μνμμμ€." + +#: sequencer.c:324 #, c-format msgid "%s: fast-forward" msgstr "%s: μ λ°©ν₯ μ§ν" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:303 +#: sequencer.c:399 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: μ μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" -#: sequencer.c:321 -msgid "Could not resolve HEAD commit\n" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" msgstr "HEAD 컀λ°μ μ²λ¦¬ν μ μμ΅λλ€\n" -#: sequencer.c:341 -msgid "Unable to update cache tree\n" +#: sequencer.c:438 +msgid "unable to update cache tree\n" msgstr "μΊμ νΈλ¦¬λ₯Ό μ
λ°μ΄νΈν μ μμ΅λλ€\n" -#: sequencer.c:393 +#: sequencer.c:483 #, c-format -msgid "Could not parse commit %s\n" +msgid "" +"you have staged changes in your working tree\n" +"If these changes are meant to be squashed into the previous commit, run:\n" +"\n" +" git commit --amend %s\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit %s\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"μμ
ν΄λμ μ€ν
μ΄μ§ν λ³κ²½ μ¬νμ΄ μμ΅λλ€.\n" +"μ΄ λ³κ²½ μ¬νμ μ΄μ 컀λ°μ ν©μΉλ €λ©΄,\n" +"λ€μμ μ€ννμμμ€:\n" +"\n" +" git commit --amend %s\n" +"\n" +"μ 컀λ°μΌλ‘ λ§λλ €λ©΄ λ€μμ μ€ννμμμ€:\n" +"\n" +" git commit %s\n" +"\n" +"μ΄λ€ κ²½μ°μ΄λ , λ§μΉ λ€μμ λ€μ λͺ
λ ΉμΌλ‘ κ³μν©λλ€:\n" +"\n" +" git rebase --continue\n" + +#: sequencer.c:567 +#, c-format +msgid "could not parse commit %s\n" msgstr "%s 컀λ°μ νμ±ν μ μμ΅λλ€\n" -#: sequencer.c:398 +#: sequencer.c:572 #, c-format -msgid "Could not parse parent commit %s\n" +msgid "could not parse parent commit %s\n" msgstr "%s μ΄μ 컀λ°μ νμ±ν μ μμ΅λλ€\n" -#: sequencer.c:463 -msgid "Your index file is unmerged." +#: sequencer.c:656 +msgid "your index file is unmerged." msgstr "μΈλ±μ€ νμΌμ΄ λ³ν©λμ§ μμμ΅λλ€." -#: sequencer.c:482 +#: sequencer.c:675 #, c-format -msgid "Commit %s is a merge but no -m option was given." +msgid "commit %s is a merge but no -m option was given." msgstr "%s 컀λ°μ λ³ν©μ΄μ§λ§ -m μ΅μ
μ΄ μ£Όμ΄μ§μ§ μμμ΅λλ€." # FIXME: "parent %d" λ²νΈκ° λ¬΄μ¨ μλ―Έ? -#: sequencer.c:490 +#: sequencer.c:683 #, c-format -msgid "Commit %s does not have parent %d" -msgstr "Commit %s 컀λ°μ μ΄μ μ»€λ° %dμ΄(κ°) μμ΅λλ€" +msgid "commit %s does not have parent %d" +msgstr "%s 컀λ°μ μ΄μ μ»€λ° %dμ΄(κ°) μμ΅λλ€" -#: sequencer.c:494 +#: sequencer.c:687 #, c-format -msgid "Mainline was specified but commit %s is not a merge." +msgid "mainline was specified but commit %s is not a merge." msgstr "λ©μΈλΌμΈμ μ§μ νμ§λ§ %s 컀λ°μ΄ λ³ν© 컀λ°μ΄ μλλλ€." -#. TRANSLATORS: The first %s will be "revert" or -#. "cherry-pick", the second %s a SHA1 -#: sequencer.c:507 +#. TRANSLATORS: The first %s will be a "todo" command like +#. "revert" or "pick", the second %s a SHA1. +#: sequencer.c:700 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: %s μ΄μ 컀λ°μ νμ±ν μ μμ΅λλ€" -#: sequencer.c:511 +#: sequencer.c:705 #, c-format -msgid "Cannot get commit message for %s" +msgid "cannot get commit message for %s" msgstr "%sμ λν μ»€λ° λ©μμ§λ₯Ό κ°μ Έμ¬ μ μμ΅λλ€" -#: sequencer.c:597 +#: sequencer.c:797 #, c-format msgid "could not revert %s... %s" msgstr "λ€μμ λλ릴(revert) μ μμ΅λλ€: %s... %s" -#: sequencer.c:598 +#: sequencer.c:798 #, c-format msgid "could not apply %s... %s" msgstr "λ€μμ μ μ©ν (apply) μ μμ΅λλ€: %s... %s" -#: sequencer.c:633 +#: sequencer.c:833 msgid "empty commit set passed" msgstr "λΉ μ»€λ° λͺ¨μμ 건λ λλλ€" -#: sequencer.c:641 +#: sequencer.c:843 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: μΈλ±μ€ μ½κΈ°μ μ€ν¨νμ΅λλ€" -#: sequencer.c:645 +#: sequencer.c:850 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: μΈλ±μ€ μλ‘ κ³ μΉ¨μ μ€ν¨νμ΅λλ€" -#: sequencer.c:705 -msgid "Cannot revert during a another revert." -msgstr "λλ리λ(revert) μ€μ λ λ€λ₯Έ λλ리기λ₯Ό ν μ μμ΅λλ€." - -#: sequencer.c:706 -msgid "Cannot revert during a cherry-pick." -msgstr "λΉΌμ€κΈ°(cherry-pick) μ€μ λλ리기(revert)λ₯Ό ν μ μμ΅λλ€." - -#: sequencer.c:709 -msgid "Cannot cherry-pick during a revert." -msgstr "λλ리기(revert) μ€μ λΉΌμ€κΈ°(cherry-pick)λ₯Ό ν μ μμ΅λλ€" - -#: sequencer.c:710 -msgid "Cannot cherry-pick during another cherry-pick." -msgstr "λΉΌμ€κΈ°(revert) μ€μ λ λ€λ₯Έ λΉΌμ€κΈ°λ₯Ό ν μ μμ΅λλ€" - -#: sequencer.c:732 +#: sequencer.c:944 #, c-format -msgid "Could not parse line %d." -msgstr "%dλ² μ€μ νμ±ν μ μμ΅λλ€." +msgid "invalid line %d: %.*s" +msgstr "μλͺ»λ μ€ %d: %.*s" -#: sequencer.c:737 -msgid "No commits parsed." +#: sequencer.c:950 +msgid "no commits parsed." msgstr "νμ±ν 컀λ°μ΄ μμ΅λλ€." -#: sequencer.c:749 +#: sequencer.c:966 #, c-format -msgid "Could not open %s" -msgstr "%sμ(λ₯Ό) μ΄ μ μμ΅λλ€" +msgid "could not read '%s'." +msgstr "'%s'μμ μ½μ μ μμ΅λλ€." -#: sequencer.c:753 +#: sequencer.c:972 #, c-format -msgid "Could not read %s." -msgstr "%sμ(λ₯Ό) μ½μ μ μμ΅λλ€." +msgid "unusable instruction sheet: '%s'" +msgstr "μ¬μ© λΆκ°λ₯ μΈμ€νΈλμ
μνΈ: '%s'" -#: sequencer.c:760 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "μ¬μ© λΆκ°λ₯ μΈμ€νΈλμ
νμΌ: %s" +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." +msgstr "λλ리기(revert) μ€μ λΉΌμ€κΈ°(cherry-pick)λ₯Ό ν μ μμ΅λλ€." + +#: sequencer.c:985 +msgid "cannot revert during a cherry-pick." +msgstr "λΉΌμ€κΈ°(cherry-pick) μ€μ λλ리기(revert)λ₯Ό ν μ μμ΅λλ€." -#: sequencer.c:790 +#: sequencer.c:1028 #, c-format -msgid "Invalid key: %s" +msgid "invalid key: %s" msgstr "μλͺ»λ ν€: %s" -#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:1031 #, c-format -msgid "Invalid value for %s: %s" -msgstr "%sμ κ°μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€: %s" +msgid "invalid value for %s: %s" +msgstr "%sμ κ°μ΄ μλͺ»λ¨: %s" -#: sequencer.c:803 +#: sequencer.c:1063 #, c-format -msgid "Malformed options sheet: %s" -msgstr "νμμ΄ μλͺ»λ μ΅μ
νμΌ: %s" +msgid "malformed options sheet: '%s'" +msgstr "νμμ΄ μλͺ»λ μ΅μ
μνΈ: '%s'" -#: sequencer.c:822 +#: sequencer.c:1101 msgid "a cherry-pick or revert is already in progress" msgstr "μ΄λ―Έ μ»€λ° λΉΌμ€κΈ°(cherry-pick) λλ λλ리기(revert)κ° μ§ν μ€μ
λλ€" -#: sequencer.c:823 +#: sequencer.c:1102 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "\"git cherry-pick (--continue | --quit | --abort)\" λͺ
λ Ήμ ν΄ λ³΄μμμ€" -#: sequencer.c:827 +#: sequencer.c:1106 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "%s μνμ λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" +msgid "could not create sequencer directory '%s'" +msgstr "'%s' μνμ λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" + +#: sequencer.c:1120 +msgid "could not lock HEAD" +msgstr "HEADλ₯Ό μ κΈ μ μμ΅λλ€" -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:1151 sequencer.c:1289 msgid "no cherry-pick or revert in progress" msgstr "λΉΌμ€κΈ°(cherry-pick) λλ λλ리기(revert)κ° μ§ν μ€μ΄μ§ μμ΅λλ€" -#: sequencer.c:864 +#: sequencer.c:1153 msgid "cannot resolve HEAD" msgstr "HEADλ₯Ό κ΅¬ν΄ μ¬ μ μμ΅λλ€" -#: sequencer.c:866 sequencer.c:900 +#: sequencer.c:1155 sequencer.c:1189 msgid "cannot abort from a branch yet to be born" msgstr "μλ‘ λ§λ€κ³ μλ λΈλμΉμμ μ€μ§ν μ μμ΅λλ€" -#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 +#: sequencer.c:1175 builtin/grep.c:578 #, c-format -msgid "cannot open %s" -msgstr "%sμ(λ₯Ό) μ΄ μ μμ΅λλ€" +msgid "cannot open '%s'" +msgstr "'%s'μ(λ₯Ό) μ΄ μ μμ΅λλ€" -#: sequencer.c:888 +#: sequencer.c:1177 #, c-format -msgid "cannot read %s: %s" -msgstr "%sμ(λ₯Ό) μ½μ μ μμ΅λλ€: %s" +msgid "cannot read '%s': %s" +msgstr "'%s'μ(λ₯Ό) μ½μ μ μμ΅λλ€: %s" -#: sequencer.c:889 +#: sequencer.c:1178 msgid "unexpected end of file" msgstr "μμμΉ λͺ»νκ² νμΌμ΄ λλ¬μ΅λλ€" -#: sequencer.c:895 +#: sequencer.c:1184 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "λΉΌμ€κΈ° μ μ μ μ₯ν HEAD νμΌμ΄('%s') μμλμμ΅λλ€" -#: sequencer.c:921 -#, c-format -msgid "Could not format %s." -msgstr "%sμ ν¬λ§€ν
ν μ μμ΅λλ€." - -#: sequencer.c:1066 +#: sequencer.c:1354 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s 컀λ°μ λΉΌμ¬ μ μμ΅λλ€" -#: sequencer.c:1069 +#: sequencer.c:1358 #, c-format msgid "%s: bad revision" msgstr "%s: μλͺ»λ 리λΉμ " -#: sequencer.c:1102 -msgid "Can't revert as initial commit" -msgstr "μ΅μ΄μ 컀λ°μ λλ릴 μ μμ΅λλ€" +#: sequencer.c:1391 +msgid "can't revert as initial commit" +msgstr "μ΅μ΄μ 컀λ°μΌλ‘ λλ릴 μ μμ΅λλ€" #: setup.c:160 #, c-format @@ -2016,11 +2917,6 @@ msgstr "" "κ²½λ‘μ 리λΉμ μ ꡬλΆνλ €λ©΄ λ€μκ³Ό κ°μ΄ '--'λ₯Ό μ¬μ©νμμμ€:\n" "'git <λͺ
λ Ή> [<리λΉμ >...] -- [<νμΌ>...]'" -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 -#, c-format -msgid "failed to read %s" -msgstr "%sμ(λ₯Ό) μ½λλ° μ€ν¨νμ΅λλ€" - #: setup.c:468 #, c-format msgid "Expected git repo version <= %d, found %d" @@ -2050,7 +2946,8 @@ msgid "" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" "(νμ¬ ν΄λ λλ λ§μ΄νΈ μμΉ %sκΉμ§ μμ ν΄λκ°) κΉ μ μ₯μκ° μλλλ€\n" -"νμΌ μμ€ν
κ²½κ³μμ μ€μ§ν©λλ€. (GIT_DISCOVERY_ACROSS_FILESYSTEM μ€μ λμ§ μμ)" +"νμΌ μμ€ν
κ²½κ³μμ μ€μ§ν©λλ€. (GIT_DISCOVERY_ACROSS_FILESYSTEM μ€μ λμ§ μ" +"μ)" #: setup.c:927 #, c-format @@ -2066,21 +2963,56 @@ msgstr "" "core.sharedRepository νμΌλͺ¨λ κ°μ (0%.3o) λ¬Έμ κ° μμ΅λλ€.\n" "νμΌμ μμ μμ μ½κΈ°μ μ°κΈ° κΆνμ΄ μμ΄μΌ ν©λλ€." -#: sha1_file.c:1046 +#: sha1_file.c:473 +#, c-format +msgid "path '%s' does not exist" +msgstr "'%s' κ²½λ‘κ° μμ΅λλ€" + +#: sha1_file.c:499 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" +"λ νΌλ°μ€ '%s' μ μ₯μλ₯Ό μ°κ²°λ 체ν¬μμμΌλ‘ μ°κΈ°λ μμ§ μ§μνμ§ μμ΅λλ€." + +#: sha1_file.c:505 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "λ νΌλ°μ€ '%s' μ μ₯μκ° λ‘컬 μ μ₯μκ° μλλλ€." + +#: sha1_file.c:511 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "λ νΌλ°μ€ '%s' μ μ₯μκ° μμ μ μ₯μμ
λλ€" + +#: sha1_file.c:519 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "λ νΌλ°μ€ '%s' μ μ₯μκ° λΆμ΄ μλ μ μ₯μμ
λλ€" + +#: sha1_file.c:1159 msgid "offset before end of packfile (broken .idx?)" msgstr "μ€νμ
μ΄ λ¬Άμ νμΌ μμ
λλ€ (λ§κ°μ§ .idx?)" -#: sha1_file.c:2434 +#: sha1_file.c:2592 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "μ€νμ
μ΄ %sμ λ¬Άμ μΈλ±μ€ μμλ³΄λ€ μμ
λλ€ (λ§κ°μ§ μΈλ±μ€?)" -#: sha1_file.c:2438 +#: sha1_file.c:2596 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "μ€νμ
μ΄ %sμ λ¬Άμ μΈλ±μ€ λλ³΄λ€ λ€μ
λλ€ (λ§κ°μ§ μΈλ±μ€?)" -#: sha1_name.c:462 +#: sha1_name.c:407 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "짧μ SHA1 %sμ(λ) μ¬λΏμ λμλ©λλ€" + +#: sha1_name.c:418 +msgid "The candidates are:" +msgstr "ν보λ λ€μκ³Ό κ°μ΅λλ€:" + +#: sha1_name.c:577 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -2126,7 +3058,7 @@ msgstr "%sμ λν .gitmodules νλͺ©μ μ κ±°ν μ μμ΅λλ€" msgid "staging updated .gitmodules failed" msgstr "μ
λ°μ΄νΈν .gitmodulesλ₯Ό 컀λ°ν μ¬νμΌλ‘ νμνλλ° μ€ν¨" -#: submodule.c:177 +#: submodule.c:158 msgid "negative values not allowed for submodule.fetchJobs" msgstr "submodule.fetchJobs κ°μ μμλ₯Ό μΈ μ μμ΅λλ€" @@ -2135,56 +3067,56 @@ msgstr "submodule.fetchJobs κ°μ μμλ₯Ό μΈ μ μμ΅λλ€" msgid "invalid value for %s" msgstr "%sμ κ°μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" -#: trailer.c:237 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "νΈλ μΌλ¬ λͺ
λ Ή '%s' μ€ν μ€ν¨" -#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 -#: trailer.c:562 +#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 +#: trailer.c:541 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "μ μ μλ κ° '%s', ν€ '%s'" -#: trailer.c:544 trailer.c:549 builtin/remote.c:289 +#: trailer.c:523 trailer.c:528 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "%sμ΄(κ°) μ¬λ¬κ°μ
λλ€" -#: trailer.c:582 +#: trailer.c:672 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "νΈλ μΌλ¬ '%.*s'μμ λΉ νΈλ μΌλ¬ ν ν°" -#: trailer.c:702 +#: trailer.c:695 #, c-format msgid "could not read input file '%s'" msgstr "'%s' μ
λ ₯ νμΌμ μ½μ μ μμ΅λλ€" -#: trailer.c:705 +#: trailer.c:698 msgid "could not read from stdin" msgstr "νμ€ μ
λ ₯μμ μ½μ μ μμ΅λλ€" -#: trailer.c:857 builtin/am.c:42 +#: trailer.c:929 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "%sμ λν΄ stat()ν μ μμ΅λλ€" -#: trailer.c:859 +#: trailer.c:931 #, c-format msgid "file %s is not a regular file" msgstr "'%s' νμΌμ΄ μΌλ° νμΌμ΄ μλλλ€" -#: trailer.c:861 +#: trailer.c:933 #, c-format msgid "file %s is not writable by user" msgstr "μ¬μ©μκ° %s νμΌμ μΈ μ μμ΅λλ€" -#: trailer.c:873 +#: trailer.c:945 msgid "could not open temporary file" msgstr "μμ νμΌμ μ΄ μ μμ΅λλ€: %s" -#: trailer.c:912 +#: trailer.c:983 #, c-format msgid "could not rename temporary file to %s" msgstr "μμ νμΌ μ΄λ¦μ '%s'(μΌ)λ‘ λ°κΏ μ μμ΅λλ€" @@ -2199,7 +3131,7 @@ msgstr "'%1$s'μ μ
μ€νΈλ¦Όμ '%3$s'μ '%2$s'(μΌ)λ‘ μ€μ ν κ²μ
λλ msgid "transport: invalid depth option '%s'" msgstr "transport: μλͺ»λ κΉμ΄ μ΅μ
: %s" -#: transport.c:771 +#: transport.c:817 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -2208,7 +3140,7 @@ msgstr "" "λ€μ νμ λͺ¨λ κ²½λ‘μ 리λͺ¨νΈ μ΄λμλ μλ\n" "λ³κ²½ μ¬νμ΄ μμ΅λλ€:\n" -#: transport.c:775 +#: transport.c:821 #, c-format msgid "" "\n" @@ -2235,15 +3167,31 @@ msgstr "" "λͺ
λ Ήμ μλν΄ λ³΄μμμ€\n" "\n" -#: transport.c:783 +#: transport.c:829 msgid "Aborting." msgstr "μ€μ§ν¨." -#: transport-helper.c:1041 +#: transport-helper.c:1075 #, c-format msgid "Could not read ref %s" msgstr "%s λ νΌλ°μ€λ₯Ό μ½μ μ μμ΅λλ€" +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "λ무 짧μ νΈλ¦¬ μ€λΈμ νΈ" + +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "νΈλ¦¬ μνΈλ¦¬μ μλͺ»λ νμμ λͺ¨λ" + +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "νΈλ¦¬ μνΈλ¦¬μ λΉ νμΌ μ΄λ¦" + +#: tree-walk.c:113 +msgid "too-short tree file" +msgstr "λ무 짧μ νΈλ¦¬ νμΌ" + #: unpack-trees.c:64 #, c-format msgid "" @@ -2426,13 +3374,14 @@ msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" "%s" msgstr "" -"λλ¬Έ 체ν¬μμμ μ
λ°μ΄νΈν μ μμ΅λλ€. λ€μ νλͺ©μ΄ μ΅μ μΌλ‘ μ
λ°μ΄νΈλμ§ μμμ΅λλ€:\n" +"λλ¬Έ 체ν¬μμμ μ
λ°μ΄νΈν μ μμ΅λλ€. λ€μ νλͺ©μ΄ μ΅μ μΌλ‘ μ
λ°μ΄νΈλμ§ μ" +"μμ΅λλ€:\n" "%s" #: unpack-trees.c:126 #, c-format msgid "" -"The following Working tree files would be overwritten by sparse checkout " +"The following working tree files would be overwritten by sparse checkout " "update:\n" "%s" msgstr "" @@ -2443,7 +3392,7 @@ msgstr "" #: unpack-trees.c:128 #, c-format msgid "" -"The following Working tree files would be removed by sparse checkout " +"The following working tree files would be removed by sparse checkout " "update:\n" "%s" msgstr "" @@ -2499,14 +3448,14 @@ msgstr "'%s'μ(λ₯Ό) μ½λλ° μ€ν¨νμ΅λλ€" msgid "could not open '%s' for reading and writing" msgstr "μ½κΈ°μ μ°κΈ°μ©μΌλ‘ '%s'μ(λ₯Ό) μ΄ μ μμ΅λλ€" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:778 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "'%s'μ(λ₯Ό) μ°κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771 -#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029 -#: builtin/pull.c:407 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 +#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" msgstr "'%s'μ(λ₯Ό) μ½κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€" @@ -2530,146 +3479,146 @@ msgstr "%sμ μΈ μ μμ΅λλ€" msgid "could not close %s" msgstr "%sμ(λ₯Ό) λ«μ μ μμ΅λλ€" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "λ³ν©νμ§ μμ κ²½λ‘:" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (μ€ν
μ΄μ§ ν΄μ νλ €λ©΄ \"git reset %s <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (μ€ν
μ΄μ§ ν΄μ νλ €λ©΄ \"git rm --cached <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (ν΄κ²°νλ€κ³ νμνλ €λ©΄ \"git add <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (ν΄κ²°νλ€κ³ νμνλ €λ©΄ μλ§κ² \"git add/rm <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (ν΄κ²°νλ€κ³ νμνλ €λ©΄ \"git rm <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:198 wt-status.c:882 +#: wt-status.c:199 wt-status.c:945 msgid "Changes to be committed:" msgstr "컀λ°ν λ³κ²½ μ¬ν:" -#: wt-status.c:216 wt-status.c:891 +#: wt-status.c:217 wt-status.c:954 msgid "Changes not staged for commit:" msgstr "컀λ°νλλ‘ μ νμ§ μμ λ³κ²½ μ¬ν:" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (무μμ 컀λ°ν μ§ λ°κΎΈλ €λ©΄ \"git add <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (무μμ 컀λ°ν μ§ λ°κΎΈλ €λ©΄ \"git add/rm <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (μμ
ν΄λμ λ³κ²½ μ¬νμ λ²λ¦¬λ €λ©΄ \"git checkout -- <νμΌ>...\"μ μ¬μ©νμ" "μμ€)" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (νμ λͺ¨λμ μΆμ λμ§ μλ νμΌμ΄λ μμ λ λ΄μ©μ 컀λ°νκ±°λ λ²λ¦¬μμμ€)" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (컀λ°ν μ¬νμ ν¬ν¨νλ €λ©΄ \"git %s <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "μμͺ½μμ μμ :" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "μ΄ μͺ½μμ μΆκ°:" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "μ μͺ½μμ μμ :" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "μ μͺ½μμ μΆκ°:" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "μ΄ μͺ½μμ μμ :" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "μμͺ½μμ μΆκ°:" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "μμͺ½μμ μμ :" -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "μ νμΌ:" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "볡μ¬ν¨:" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "μμ ν¨:" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "μμ ν¨:" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "μ΄λ¦ λ°κΏ:" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "μ’
λ₯ λ°λ:" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "μ μ μμ:" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "λ³ν©νμ§ μμ:" -#: wt-status.c:370 +#: wt-status.c:371 msgid "new commits, " msgstr "μ 컀λ°, " -#: wt-status.c:372 +#: wt-status.c:373 msgid "modified content, " msgstr "μμ ν λ΄μ©, " -#: wt-status.c:374 +#: wt-status.c:375 msgid "untracked content, " msgstr "μΆμ νμ§ μμ λ΄μ©, " -#: wt-status.c:756 +#: wt-status.c:818 msgid "Submodules changed but not updated:" msgstr "λ³κ²½λμμ§λ§ μ
λ°μ΄νΈνμ§ μμ νμ λͺ¨λ:" -#: wt-status.c:758 +#: wt-status.c:820 msgid "Submodule changes to be committed:" msgstr "컀λ°ν νμ λͺ¨λμ λ³κ²½ μ¬ν:" -#: wt-status.c:839 +#: wt-status.c:901 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2677,219 +3626,219 @@ msgstr "" "μμ μ€μ λ°κΎΈμ§ λ§μμμ€.\n" "μλ μλ λ΄μ©μ λͺ¨λ μ κ±°λ©λλ€." -#: wt-status.c:950 +#: wt-status.c:1013 msgid "You have unmerged paths." msgstr "λ³ν©νμ§ μμ κ²½λ‘κ° μμ΅λλ€." -#: wt-status.c:953 +#: wt-status.c:1016 msgid " (fix conflicts and run \"git commit\")" msgstr " (μΆ©λμ λ°λ‘μ‘κ³ \"git commit\"μ μ€ννμμμ€)" -#: wt-status.c:955 +#: wt-status.c:1018 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (λ³ν©μ μ€λ¨νλ €λ©΄ \"git merge --abort\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:960 +#: wt-status.c:1023 msgid "All conflicts fixed but you are still merging." msgstr "λͺ¨λ μΆ©λμ λ°λ‘μ‘μμ§λ§ μμ§ λ³ν©νλ μ€μ
λλ€." -#: wt-status.c:963 +#: wt-status.c:1026 msgid " (use \"git commit\" to conclude merge)" msgstr " (λ³ν©μ λ§λ¬΄λ¦¬νλ €λ©΄ \"git commit\"μ μ¬μ©νμμμ€)" -#: wt-status.c:973 +#: wt-status.c:1036 msgid "You are in the middle of an am session." msgstr "am μΈμ
μ€κ°μ μμ΅λλ€." -#: wt-status.c:976 +#: wt-status.c:1039 msgid "The current patch is empty." msgstr "νμ¬ ν¨μΉκ° λΉμ΄ μμ΅λλ€." -#: wt-status.c:980 +#: wt-status.c:1043 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (μΆ©λμ λ°λ‘μ‘μ λ€μ \"git am --continue\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:982 +#: wt-status.c:1045 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (μ΄ ν¨μΉλ₯Ό 건λ λ°λ €λ©΄ \"git am --skip\"μ μ¬μ©νμμμ€)" -#: wt-status.c:984 +#: wt-status.c:1047 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (μλ³Έ λΈλμΉλ₯Ό 볡ꡬνλ €λ©΄ \"git am --abort\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:1109 +#: wt-status.c:1172 msgid "No commands done." msgstr "μλ£ν λͺ
λ Ή μμ." -#: wt-status.c:1112 +#: wt-status.c:1175 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "μ΅κ·Ό μλ£ν λͺ
λ Ή (%dκ° λͺ
λ Ή μλ£):" -#: wt-status.c:1123 +#: wt-status.c:1186 #, c-format msgid " (see more in file %s)" msgstr " (μμΈν μ 보λ %s νμΌ μ°Έκ³ )" -#: wt-status.c:1128 +#: wt-status.c:1191 msgid "No commands remaining." msgstr "λͺ
λ Ήμ΄ λ¨μμμ§ μμ." -#: wt-status.c:1131 +#: wt-status.c:1194 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "λ€μμ ν λͺ
λ Ή (%dκ° λͺ
λ Ή λ¨μ):" -#: wt-status.c:1139 +#: wt-status.c:1202 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (λ³΄κ³ νΈμ§νλ €λ©΄ \"git rebase --edit-todo\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:1152 +#: wt-status.c:1215 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "νμ¬ '%s' λΈλμΉλ₯Ό '%s' μλ‘ λ¦¬λ² μ΄μ€νλ μ€μ
λλ€." -#: wt-status.c:1157 +#: wt-status.c:1220 msgid "You are currently rebasing." msgstr "νμ¬ λ¦¬λ² μ΄μ€νλ μ€μ
λλ€." -#: wt-status.c:1171 +#: wt-status.c:1234 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (μΆ©λμ λ°λ‘μ‘κ³ \"git rebase --continue\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:1173 +#: wt-status.c:1236 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (μ΄ ν¨μΉλ₯Ό 건λλ°λ €λ©΄ \"git rebase --skip\"μ μ¬μ©νμμμ€)" -#: wt-status.c:1175 +#: wt-status.c:1238 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (μλ³Έ λΈλμΉλ₯Ό κ°μ Έμ€λ €λ©΄ \"git rebase --abort\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:1181 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (λͺ¨λ μΆ©λμ λ°λ‘μ‘μμ΅λλ€: \"git rebase --continue\"λ₯Ό μ€ννμμμ€)" -#: wt-status.c:1185 +#: wt-status.c:1248 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "νμ¬ '%s' λΈλμΉλ₯Ό '%s' μλ‘ λ¦¬λ² μ΄μ€νλ μ€ μ»€λ°μ λΆλ¦¬νλ μ€μ
λλ€." -#: wt-status.c:1190 +#: wt-status.c:1253 msgid "You are currently splitting a commit during a rebase." msgstr "νμ¬ λ¦¬λ² μ΄μ€νλ μ€ μ»€λ°μ λΆλ¦¬νλ μ€μ
λλ€." -#: wt-status.c:1193 +#: wt-status.c:1256 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (μμ
ν΄λκ° κΉ¨λν΄μ§λ©΄, \"git rebase --continue\"λ₯Ό μ€ννμμμ€)" -#: wt-status.c:1197 +#: wt-status.c:1260 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "'%s' λΈλμΉλ₯Ό '%s' μλ‘ λ¦¬λ² μ΄μ€νλ μ€ μ»€λ°μ νΈμ§νλ μ€μ
λλ€." -#: wt-status.c:1202 +#: wt-status.c:1265 msgid "You are currently editing a commit during a rebase." msgstr "λ¦¬λ² μ΄μ€ μ€μ 컀λ°μ νΈμ§νλ μ€μ
λλ€." -#: wt-status.c:1205 +#: wt-status.c:1268 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (νμ¬ μ»€λ°μ μμ νλ €λ©΄ \"git commit --amend\"μ μ¬μ©νμμμ€)" -#: wt-status.c:1207 +#: wt-status.c:1270 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (λ³κ²½ μ¬νμ λ§μ‘±ν λ \"git rebase --continue\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:1217 +#: wt-status.c:1280 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "νμ¬ %s 컀λ°μ λ½μ λ΄κ³ μμ΅λλ€." -#: wt-status.c:1222 +#: wt-status.c:1285 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (μΆ©λμ λ°λ‘μ‘κ³ \"git cherry-pick --continue\"λ₯Ό μ€ννμμμ€)" -#: wt-status.c:1225 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (λͺ¨λ μΆ©λμ λ°λ‘μ‘μμ΅λλ€: \"git cherry-pick --continue\"λ₯Ό μ€ννμμμ€)" -#: wt-status.c:1227 +#: wt-status.c:1290 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (λ½κΈ° μμ
μ μ·¨μνλ €λ©΄ \"git cherry-pick --abort\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:1236 +#: wt-status.c:1299 #, c-format msgid "You are currently reverting commit %s." msgstr "νμ¬ %s 컀λ°μ λλ리λ μ€μ
λλ€." -#: wt-status.c:1241 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (μΆ©λμ λ°λ‘μ‘κ³ \"git revert --continue\"λ₯Ό μ€ννμμμ€)" -#: wt-status.c:1244 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (λͺ¨λ μΆ©λμ λ°λ‘μ‘μμ΅λλ€: \"git revert --continue\"λ₯Ό μ€ννμμμ€)" -#: wt-status.c:1246 +#: wt-status.c:1309 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (λλ리기 μμ
μ μ·¨μνλ €λ©΄ \"git revert --abort\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:1257 +#: wt-status.c:1320 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "'μ΄λ±λΆνλ μ€μ
λλ€. '%s' λΈλμΉλΆν° μμ." -#: wt-status.c:1261 +#: wt-status.c:1324 msgid "You are currently bisecting." msgstr "'μ΄λ±λΆνλ μ€μ
λλ€." -#: wt-status.c:1264 +#: wt-status.c:1327 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (μλ λΈλμΉλ‘ λμκ°λ €λ©΄ \"git bisect reset\"μ μ¬μ©νμμμ€)" -#: wt-status.c:1464 +#: wt-status.c:1524 msgid "On branch " msgstr "νμ¬ λΈλμΉ " -#: wt-status.c:1470 +#: wt-status.c:1530 msgid "interactive rebase in progress; onto " msgstr "λνν λ¦¬λ² μ΄μ€ μ§ν μ€. κ° μμΉλ " -#: wt-status.c:1472 +#: wt-status.c:1532 msgid "rebase in progress; onto " msgstr "λ¦¬λ² μ΄μ€ μ§ν μ€. κ° μμΉλ " -#: wt-status.c:1477 +#: wt-status.c:1537 msgid "HEAD detached at " msgstr "HEADκ° λ€μ μμΉμμ λΆλ¦¬: " -#: wt-status.c:1479 +#: wt-status.c:1539 msgid "HEAD detached from " msgstr "HEADκ° λ€μμΌλ‘λΆν° λΆλ¦¬: " -#: wt-status.c:1482 +#: wt-status.c:1542 msgid "Not currently on any branch." msgstr "νμ¬ μ΄λ€ λΈλμΉλ μ¬μ©νμ§ μμ." -#: wt-status.c:1500 +#: wt-status.c:1560 msgid "Initial commit" msgstr "μ΅μ΄ 컀λ°" -#: wt-status.c:1514 +#: wt-status.c:1574 msgid "Untracked files" msgstr "μΆμ νμ§ μλ νμΌ" -#: wt-status.c:1516 +#: wt-status.c:1576 msgid "Ignored files" msgstr "무μν νμΌ" -#: wt-status.c:1520 +#: wt-status.c:1580 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2900,20 +3849,20 @@ msgstr "" "'status -uno' μ΅μ
μ μ°λ©΄ λΉ¨λΌμ§ μλ μμ§λ§, μ νμΌμ\n" "μ§μ μ°Ύμμ μΆκ°ν΄μΌ ν©λλ€. ('git help status' μ°Έκ³ )" -#: wt-status.c:1526 +#: wt-status.c:1586 #, c-format msgid "Untracked files not listed%s" msgstr "μΆμ νμ§ μλ νμΌμ λ³΄μ§ μμ΅λλ€%s" -#: wt-status.c:1528 +#: wt-status.c:1588 msgid " (use -u option to show untracked files)" msgstr " (μΆμ νμ§ μλ νμΌμ λ³΄λ €λ©΄ -u μ΅μ
μ μ¬μ©νμμμ€)" -#: wt-status.c:1534 +#: wt-status.c:1594 msgid "No changes" msgstr "λ³κ²½ μ¬ν μμ" -#: wt-status.c:1539 +#: wt-status.c:1599 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" @@ -2921,12 +3870,12 @@ msgstr "" "\"λ₯Ό\n" "μ¬μ©νμμμ€)\n" -#: wt-status.c:1542 +#: wt-status.c:1602 #, c-format msgid "no changes added to commit\n" msgstr "컀λ°ν λ³κ²½ μ¬νμ μΆκ°νμ§ μμμ΅λλ€\n" -#: wt-status.c:1545 +#: wt-status.c:1605 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2936,55 +3885,70 @@ msgstr "" "\"git\n" "add\"λ₯Ό μ¬μ©νμμμ€)\n" -#: wt-status.c:1548 +#: wt-status.c:1608 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "컀λ°ν μ¬νμ μΆκ°νμ§ μμμ§λ§ μΆμ νμ§ μλ νμΌμ΄ μμ΅λλ€\n" -#: wt-status.c:1551 +#: wt-status.c:1611 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "컀λ°ν μ¬ν μμ (νμΌμ λ§λ€κ±°λ 볡μ¬νκ³ \"git add\"λ₯Ό μ¬μ©νλ©΄ μΆμ ν©λ" "λ€)\n" -#: wt-status.c:1554 wt-status.c:1559 +#: wt-status.c:1614 wt-status.c:1619 #, c-format msgid "nothing to commit\n" msgstr "컀λ°ν μ¬ν μμ\n" -#: wt-status.c:1557 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "컀λ°ν μ¬ν μμ (μΆμ νμ§ μλ νμΌμ λ³΄λ €λ©΄ -u μ΅μ
μ μ¬μ©νμμμ€)\n" -#: wt-status.c:1561 +#: wt-status.c:1621 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "컀λ°ν μ¬ν μμ, μμ
ν΄λ κΉ¨λν¨\n" -#: wt-status.c:1668 +#: wt-status.c:1728 msgid "Initial commit on " msgstr "μ΅μ΄ 컀λ°, λΈλμΉ: " -#: wt-status.c:1672 +#: wt-status.c:1732 msgid "HEAD (no branch)" msgstr "HEAD (λΈλμΉ μμ)" -#: wt-status.c:1701 +#: wt-status.c:1761 msgid "gone" msgstr "μμ" -#: wt-status.c:1703 wt-status.c:1711 +#: wt-status.c:1763 wt-status.c:1771 msgid "behind " msgstr "λ€μ λ€μ: " -#: wt-status.c:1706 wt-status.c:1709 +#: wt-status.c:1766 wt-status.c:1769 msgid "ahead " msgstr "λ€μ μμ: " -#: compat/precompose_utf8.c:57 builtin/clone.c:415 +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2270 +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "%s ν μ μμ΅λλ€: μ€ν
μ΄μ§νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." + +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." +msgstr "μΆκ°λ‘, μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." + +#: wt-status.c:2278 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "%s ν μ μμ΅λλ€: μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." + +#: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format msgid "failed to unlink '%s'" msgstr "'%s' νμΌ μμ μ μ€ν¨νμ΅λλ€" @@ -2993,272 +3957,257 @@ msgstr "'%s' νμΌ μμ μ μ€ν¨νμ΅λλ€" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<μ΅μ
>] [--] <κ²½λ‘λͺ
μΈ>..." -#: builtin/add.c:65 +#: builtin/add.c:80 #, c-format msgid "unexpected diff status %c" msgstr "μμμΉ λͺ»ν diff μν %c" -#: builtin/add.c:71 builtin/commit.c:281 +#: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" msgstr "νμΌ μ
λ°μ΄νΈκ° μ€ν¨νμ΅λλ€" -#: builtin/add.c:81 +#: builtin/add.c:95 #, c-format msgid "remove '%s'\n" msgstr "'%s' μ κ±°\n" -#: builtin/add.c:136 +#: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" msgstr "μΈλ±μ€λ₯Ό μλ‘ κ³ μΉ λ€μ μ»€λ° νμνμ§ μμ λ³κ²½ μ¬ν:" -#: builtin/add.c:196 builtin/rev-parse.c:811 +#: builtin/add.c:209 builtin/rev-parse.c:840 msgid "Could not read the index" msgstr "μΈλ±μ€λ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/add.c:207 +#: builtin/add.c:220 #, c-format msgid "Could not open '%s' for writing." msgstr "'%s' νμΌμ μ°κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€." -#: builtin/add.c:211 +#: builtin/add.c:224 msgid "Could not write patch" msgstr "ν¨μΉλ₯Ό μΈ μ μμ΅λλ€" -#: builtin/add.c:214 +#: builtin/add.c:227 msgid "editing patch failed" msgstr "ν¨μΉ νΈμ§μ μ€ν¨νμ΅λλ€" -#: builtin/add.c:217 +#: builtin/add.c:230 #, c-format msgid "Could not stat '%s'" msgstr "'%s'μ(λ₯Ό) stat()ν μ μμ΅λλ€" -#: builtin/add.c:219 +#: builtin/add.c:232 msgid "Empty patch. Aborted." msgstr "λΉ ν¨μΉ. μ€μ§." -#: builtin/add.c:224 +#: builtin/add.c:237 #, c-format msgid "Could not apply '%s'" msgstr "'%s'μ(λ₯Ό) μ μ©ν μ μμ΅λλ€" -#: builtin/add.c:234 +#: builtin/add.c:247 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "λ€μ κ²½λ‘λ .gitignore νμΌ μ€ νλ λλ¬Έμ 무μν©λλ€:\n" -#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521 -#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 +#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "κ°μ§λ‘ μ€ν" -#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19 -#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593 -#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114 -msgid "be verbose" -msgstr "μμΈν νμ" - -#: builtin/add.c:256 +#: builtin/add.c:269 msgid "interactive picking" msgstr "λνμμΌλ‘ κ³ λ¦
λλ€" -#: builtin/add.c:257 builtin/checkout.c:1156 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 msgid "select hunks interactively" msgstr "λνμμΌλ‘ λ³κ²½λ λΆλΆμ μ νν©λλ€" -#: builtin/add.c:258 +#: builtin/add.c:271 msgid "edit current diff and apply" msgstr "νμ¬ diffλ₯Ό νΈμ§νκ³ μ μ©ν©λλ€" -#: builtin/add.c:259 +#: builtin/add.c:272 msgid "allow adding otherwise ignored files" msgstr "무μνλ νμΌμ μΆκ°λ₯Ό νμ©ν©λλ€" -#: builtin/add.c:260 +#: builtin/add.c:273 msgid "update tracked files" msgstr "μΆμ λλ νμΌμ μ
λ°μ΄νΈν©λλ€" -#: builtin/add.c:261 +#: builtin/add.c:274 msgid "record only the fact that the path will be added later" msgstr "λμ€μ μΆκ°ν κ²μ΄λΌλ μ¬μ€λ§ κΈ°λ‘ν©λλ€" -#: builtin/add.c:262 +#: builtin/add.c:275 msgid "add changes from all tracked and untracked files" msgstr "μΆμ λκ³ μΆμ λμ§ μλ λͺ¨λ νμΌμ λ³κ²½ μ¬νμ μΆκ°ν©λλ€" -#: builtin/add.c:265 +#: builtin/add.c:278 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "μμ
ν΄λμμ μ κ±°ν κ²½λ‘λ₯Ό 무μν©λλ€ (--no-allκ³Ό λμΌ)" -#: builtin/add.c:267 +#: builtin/add.c:280 msgid "don't add, only refresh the index" msgstr "μΆκ°νμ§ μκ³ μΈλ±μ€λ§ μλ‘ κ³ μΉ©λλ€" -#: builtin/add.c:268 +#: builtin/add.c:281 msgid "just skip files which cannot be added because of errors" msgstr "μ€λ₯ λλ¬Έμ μΆκ°ν μ μλ νμΌμ 건λλλλ€" -#: builtin/add.c:269 +#: builtin/add.c:282 msgid "check if - even missing - files are ignored in dry run" msgstr "κ°μ§λ‘ μ€ννμ λ νμΌμ 무μνλμ§ νμΈν©λλ€" -#: builtin/add.c:270 builtin/update-index.c:958 +#: builtin/add.c:283 builtin/update-index.c:947 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:270 builtin/update-index.c:959 +#: builtin/add.c:283 builtin/update-index.c:948 msgid "override the executable bit of the listed files" msgstr "λͺ©λ‘μ νμΌμμ μ€ν κ°λ₯ λΉνΈλ₯Ό λ°κΏλλ€" -#: builtin/add.c:292 +#: builtin/add.c:305 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "μ λ§λ‘ μΆκ°νλ €λ©΄ -f μ΅μ
μ μ¬μ©νμμμ€.\n" -#: builtin/add.c:300 +#: builtin/add.c:312 msgid "adding files failed" msgstr "νμΌ μΆκ°κ° μ€ν¨νμ΅λλ€" -#: builtin/add.c:336 +#: builtin/add.c:348 msgid "-A and -u are mutually incompatible" msgstr "-A λ° -u μ΅μ
μ μλ‘ νΈνλμ§ μμ΅λλ€" -#: builtin/add.c:343 +#: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "--ignore-missing μ΅μ
μ --dry-run μ΅μ
κ³Ό κ°μ΄ μ¬μ©ν κ²½μ°μλ§ μΈ μ μμ΅λλ€." -#: builtin/add.c:352 +#: builtin/add.c:359 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod νλΌλ―Έν° '%s'μ(λ) -x λλ +x νμμ΄μ΄μΌ ν©λλ€" -#: builtin/add.c:367 +#: builtin/add.c:374 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "μ무 κ²λ μ§μ νμ§ μμμΌλ―λ‘ μ무 κ²λ μΆκ°νμ§ μμ΅λλ€.\n" -#: builtin/add.c:368 +#: builtin/add.c:375 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "'git add .' λͺ
λ Ήμ μ€ννλ €κ³ ν κ² μλμμ΅λκΉ?\n" -#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 +#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 #: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:240 +#: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "μΈλ±μ€ νμΌμ΄ μμλμμ΅λλ€" -#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 -msgid "Unable to write new index file" -msgstr "μ μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" - -#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 -#, c-format -msgid "could not read '%s'" -msgstr "'%s'μμ μ½μ μ μμ΅λλ€" - -#: builtin/am.c:426 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "μμ±μ μ€ν¬λ¦½νΈλ₯Ό νμ±ν μ μμ΅λλ€" -#: builtin/am.c:503 +#: builtin/am.c:491 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "applypatch-msg ν
λλ¬Έμ '%s'μ΄(κ°) μμ λμμ΅λλ€." -#: builtin/am.c:544 builtin/notes.c:301 +#: builtin/am.c:532 #, c-format msgid "Malformed input line: '%s'." msgstr "μλͺ»λ νμμ μ
λ ₯ μ€: '%s'." -#: builtin/am.c:581 builtin/notes.c:316 +#: builtin/am.c:569 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "'%s'μμ '%s'(μΌ)λ‘ λ
ΈνΈλ₯Ό 볡μ¬νλλ° μ€ν¨νμ΅λλ€" -#: builtin/am.c:607 +#: builtin/am.c:595 msgid "fseek failed" msgstr "fseek μ€ν¨" -#: builtin/am.c:787 +#: builtin/am.c:775 #, c-format msgid "could not parse patch '%s'" msgstr "'%s' ν¨μΉλ₯Ό νμ±ν μ μμ΅λλ€" -#: builtin/am.c:852 +#: builtin/am.c:840 msgid "Only one StGIT patch series can be applied at once" msgstr "νλ²μ νλμ StGIT ν¨μΉ μ리μ¦λ§ μ μ©ν μ μμ΅λλ€" -#: builtin/am.c:899 +#: builtin/am.c:887 msgid "invalid timestamp" msgstr "μκ°μ΄ μλͺ»λμμ΅λλ€" -#: builtin/am.c:902 builtin/am.c:910 +#: builtin/am.c:890 builtin/am.c:898 msgid "invalid Date line" msgstr "Date μ€μ΄ μλͺ»λμμ΅λλ€" -#: builtin/am.c:907 +#: builtin/am.c:895 msgid "invalid timezone offset" msgstr "μκ°λ μ€νμ
μ΄ μλͺ»λμμ΅λλ€" -#: builtin/am.c:996 +#: builtin/am.c:984 msgid "Patch format detection failed." msgstr "ν¨μΉ νμ κ²μμ΄ μ€ν¨νμ΅λλ€." -#: builtin/am.c:1001 builtin/clone.c:380 +#: builtin/am.c:989 builtin/clone.c:379 #, c-format msgid "failed to create directory '%s'" msgstr "'%s' λλ ν°λ¦¬ λ§λ€κΈ°κ° μ€ν¨νμ΅λλ€" -#: builtin/am.c:1005 +#: builtin/am.c:993 msgid "Failed to split patches." msgstr "ν¨μΉλ₯Ό μͺΌκ°λλ° μ€ν¨νμ΅λλ€." -#: builtin/am.c:1137 builtin/commit.c:366 +#: builtin/am.c:1125 builtin/commit.c:376 msgid "unable to write index file" msgstr "μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" -#: builtin/am.c:1188 +#: builtin/am.c:1176 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "μ΄ λ¬Έμ λ₯Ό ν΄κ²°νμ λ \"%s --continue\"λ₯Ό μ€ννμμμ€." -#: builtin/am.c:1189 +#: builtin/am.c:1177 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "μ΄ ν¨μΉλ₯Ό 건λλ°λ €λ©΄, κ·Έ λμ \"%s --skip\"μ μ€ννμμμ€." -#: builtin/am.c:1190 +#: builtin/am.c:1178 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "μλ λΈλμΉλ₯Ό 볡ꡬνκ³ ν¨μΉ μ μ©μ μ€μ§νλ €λ©΄ \"%s --abort\"λ₯Ό μ€ννμμμ€." -#: builtin/am.c:1328 +#: builtin/am.c:1316 msgid "Patch is empty. Was it split wrong?" msgstr "ν¨μΉκ° λΉμ΄ μμ΅λλ€. μλͺ» μͺΌκ°μ§μ§ μμλμ?" -#: builtin/am.c:1402 builtin/log.c:1543 +#: builtin/am.c:1390 builtin/log.c:1550 #, c-format msgid "invalid ident line: %s" msgstr "μλͺ»λ μ μ μ€: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1417 #, c-format msgid "unable to parse commit %s" msgstr "%s 컀λ°μ νμ±ν μ μμ΅λλ€" -#: builtin/am.c:1602 +#: builtin/am.c:1610 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "μ μ₯μμ 3-λ°©ν₯ λ³ν©μΌλ‘ λμ ν λ νμν λΈλ‘μ΄ μμ΅λλ€." -#: builtin/am.c:1604 +#: builtin/am.c:1612 msgid "Using index info to reconstruct a base tree..." msgstr "μΈλ±μ€ μ 보λ₯Ό μ¬μ©ν΄ κΈ°λ³Έ νΈλ¦¬λ₯Ό λ€μ λ§λλλ€..." -#: builtin/am.c:1623 +#: builtin/am.c:1631 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -3266,38 +4215,38 @@ msgstr "" "ν¨μΉλ₯Ό μ§μ νΈμ§νμ
¨μ΅λκΉ?\n" "μ΄ ν¨μΉλ μΈλ±μ€μ κΈ°λ‘λ λΈλ‘μλ μ μ©λμ§ μμ΅λλ€." -#: builtin/am.c:1629 +#: builtin/am.c:1637 msgid "Falling back to patching base and 3-way merge..." msgstr "λ² μ΄μ€ ν¨μΉ μ μ© λ° 3-λ°©ν₯ λ³ν©μΌλ‘ λμ ν©λλ€..." -#: builtin/am.c:1654 +#: builtin/am.c:1662 msgid "Failed to merge in the changes." msgstr "λ³κ²½ μ¬νμμ λ³ν©νλλ° μ€ν¨νμ΅λλ€." -#: builtin/am.c:1679 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-treeκ° νΈλ¦¬λ₯Ό μ°λλ° μ€ν¨νμ΅λλ€" -#: builtin/am.c:1686 +#: builtin/am.c:1693 msgid "applying to an empty history" msgstr "λΉ μ»€λ° λ΄μμ λν΄ μ μ©ν©λλ€" -#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798 +#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 #: builtin/merge.c:823 msgid "failed to write commit object" msgstr "μ»€λ° μ€λΈμ νΈλ₯Ό μ°λλ° μ€ν¨νμ΅λλ€" -#: builtin/am.c:1731 builtin/am.c:1735 +#: builtin/am.c:1739 builtin/am.c:1743 #, c-format msgid "cannot resume: %s does not exist." msgstr "λ€μ μμν μ μμ΅λλ€: %sμ΄(κ°) μμ΅λλ€." -#: builtin/am.c:1751 +#: builtin/am.c:1759 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "ν°λ―Έλμ νμ€ μ
λ ₯μ΄ μ°κ²°λμ§ μμ μνμμ λννμΌλ‘ μ€νν μ μμ΅λλ€." -#: builtin/am.c:1756 +#: builtin/am.c:1764 msgid "Commit Body is:" msgstr "μ»€λ° λ³Έλ¬Έμ:" @@ -3305,35 +4254,35 @@ msgstr "μ»€λ° λ³Έλ¬Έμ:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1766 +#: builtin/am.c:1774 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "μ μ©? μ[y]/μλμ€[n]/νΈμ§[e]/ν¨μΉ 보기[v]/λͺ¨λ μ μ©[a]: " -#: builtin/am.c:1816 +#: builtin/am.c:1824 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "λ³κ²½λ μΈλ±μ€: ν¨μΉλ₯Ό μ μ©ν μ μμ΅λλ€ (dirty: %s)" -#: builtin/am.c:1853 builtin/am.c:1925 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format msgid "Applying: %.*s" msgstr "μ μ©νλ μ€: %.*s" -#: builtin/am.c:1869 +#: builtin/am.c:1877 msgid "No changes -- Patch already applied." msgstr "λ³κ²½ μ¬ν μμ -- ν¨μΉκ° μ΄λ―Έ μ μ©λμμ΅λλ€." -#: builtin/am.c:1877 +#: builtin/am.c:1885 #, c-format msgid "Patch failed at %s %.*s" msgstr "ν¨μΉκ° %s %.*s μμΉμμ μ€ν¨νμ΅λλ€" -#: builtin/am.c:1883 +#: builtin/am.c:1891 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "μ€ν¨ν ν¨μΉμ 볡μ¬λ³Έμ΄ λ€μ μμΉμ μμ΅λλ€: %s" -#: builtin/am.c:1928 +#: builtin/am.c:1936 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -3343,7 +4292,7 @@ msgstr "" "컀λ°μΌλ‘ νμν μ¬νμ΄ λ¨μ μμ§ μμΌλ©΄, μ΄λ―Έ κ°μ ν¨μΉμμ μ μ©λ\n" "κ²½μ°μΌ μλ μμ΅λλ€. κ·Έλ° κ²½μ°μλ μ΄ ν¨μΉλ₯Ό 건λλ°λ©΄ λ©λλ€." -#: builtin/am.c:1935 +#: builtin/am.c:1943 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -3351,17 +4300,17 @@ msgstr "" "μΈλ±μ€μ λ³ν©νμ§ μμ κ²½λ‘κ° λ¨μ μμ΅λλ€.\n" "'git add' μ¬μ©μ μμ§ μμΌμ
¨μ΅λκΉ?" -#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308 +#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "'%s' μ€λΈμ νΈλ₯Ό νμ±ν μ μμ΅λλ€." -#: builtin/am.c:2095 +#: builtin/am.c:2103 msgid "failed to clean index" msgstr "μΈλ±μ€ μ§μ°κΈ°μ μ€ν¨νμ΅λλ€" -#: builtin/am.c:2129 +#: builtin/am.c:2137 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -3369,157 +4318,136 @@ msgstr "" "λ§μ§λ§ 'am' μ€ν¨ μ΄ν HEADλ₯Ό μκΈ΄ κ² κ°μ΅λλ€.\n" "ORIG_HEADλ‘ λλλ¦¬μ§ μμ΅λλ€." -#: builtin/am.c:2192 +#: builtin/am.c:2200 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "--patch-format μ΅μ
μ λν΄ μλͺ»λ κ°: %s" -#: builtin/am.c:2225 -msgid "git am [<options>] [(<mbox>|<Maildir>)...]" -msgstr "git am [<μ΅μ
>] [(<mbox>|<Maildir>)...]" +#: builtin/am.c:2233 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<μ΅μ
>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2226 +#: builtin/am.c:2234 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<μ΅μ
>] (--continue | --skip | --abort)" -#: builtin/am.c:2232 +#: builtin/am.c:2240 msgid "run interactively" msgstr "λννμΌλ‘ μ€νν©λλ€" -#: builtin/am.c:2234 +#: builtin/am.c:2242 msgid "historical option -- no-op" msgstr "μ무 λμλ νμ§ μμ΅λλ€ (κ³Όκ±°λΆν° μμλ μ΅μ
)" -#: builtin/am.c:2236 +#: builtin/am.c:2244 msgid "allow fall back on 3way merging if needed" msgstr "νμνλ©΄ 3-λ°©ν₯ λ³ν©μΌλ‘ λμ νλλ‘ νμ©ν©λλ€" -#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57 +#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 #: builtin/repack.c:172 msgid "be quiet" msgstr "κ°λ΅ν νμν©λλ€" -#: builtin/am.c:2239 +#: builtin/am.c:2247 msgid "add a Signed-off-by line to the commit message" msgstr "μ»€λ° λ©μμ§μ Signed-off-by μ€μ λ¨κΉλλ€" -#: builtin/am.c:2242 +#: builtin/am.c:2250 msgid "recode into utf8 (default)" msgstr "UTF-8 μΈμ½λ©μΌλ‘ λ³νν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/am.c:2244 +#: builtin/am.c:2252 msgid "pass -k flag to git-mailinfo" msgstr "git-mailinfoμ -k μ΅μ
μ μλλ€" -#: builtin/am.c:2246 +#: builtin/am.c:2254 msgid "pass -b flag to git-mailinfo" msgstr "git-mailinfoμ -b μ΅μ
μ μλλ€" -#: builtin/am.c:2248 +#: builtin/am.c:2256 msgid "pass -m flag to git-mailinfo" msgstr "git-mailinfoμ -m μ΅μ
μ μλλ€" -#: builtin/am.c:2250 +#: builtin/am.c:2258 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "mbox νμμ λν΄ git-mailsplitμ --keep-cr μ΅μ
μ μ¬μ©ν©λλ€" -#: builtin/am.c:2253 +#: builtin/am.c:2261 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "am.keepcrμ 무κ΄νκ² git-mailsplitμ --keep-cr μ΅μ
μ μ¬μ©νμ§ μμ΅λλ€." -#: builtin/am.c:2256 +#: builtin/am.c:2264 msgid "strip everything before a scissors line" msgstr "μ μ·¨μ μμ λͺ¨λ μ¬νμ 무μν©λλ€" -#: builtin/am.c:2257 builtin/apply.c:4837 -msgid "action" -msgstr "λμ" - -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279 -#: builtin/am.c:2285 +#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 +#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 +#: builtin/am.c:2293 msgid "pass it through git-apply" msgstr "git-applyμ λκΉλλ€" -#: builtin/am.c:2266 builtin/apply.c:4861 -msgid "root" -msgstr "μ΅μμ" - -#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799 -#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96 -#: builtin/pull.c:179 builtin/submodule--helper.c:277 -#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482 -#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823 -#: builtin/submodule--helper.c:826 -msgid "path" -msgstr "κ²½λ‘" - -#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193 -#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645 +#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194 +#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 -#: parse-options.h:134 parse-options.h:244 +#: parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2278 builtin/apply.c:4805 -msgid "num" -msgstr "κ°μ" - -#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "νμ" -#: builtin/am.c:2282 +#: builtin/am.c:2290 msgid "format the patch(es) are in" msgstr "ν¨μΉμ νμ" -#: builtin/am.c:2288 +#: builtin/am.c:2296 msgid "override error message when patch failure occurs" msgstr "ν¨μΉ μ€ν¨κ° λ°μνμ λ μ€λ₯ λ©μμ§ λμ μ¬μ©ν©λλ€" -#: builtin/am.c:2290 +#: builtin/am.c:2298 msgid "continue applying patches after resolving a conflict" msgstr "μΆ©λμ ν΄κ²°ν λ€μ ν¨μΉ μ μ©μ κ³μν©λλ€" -#: builtin/am.c:2293 +#: builtin/am.c:2301 msgid "synonyms for --continue" msgstr "--continue μ΅μ
κ³Ό λμΌ" -#: builtin/am.c:2296 +#: builtin/am.c:2304 msgid "skip the current patch" msgstr "νμ¬ ν¨μΉ 건λλ°κΈ°" -#: builtin/am.c:2299 +#: builtin/am.c:2307 msgid "restore the original branch and abort the patching operation." msgstr "μλ λΈλμΉλ₯Ό 볡ꡬνκ³ ν¨μΉ μ μ© μμ
μ μ€μ§ν©λλ€." # NOTE: μ΅μ
μ μλ―Έλ μ΄κ² λ§λ€. μλ¬Έμμλ μ¬μ©μκ° # --committer-date-is-author-dateλΌλ μ΅μ
μ λ³΄κ³ μλ―Έλ₯Ό μ μ μλ€κ³ κ°μ νκ³ μλ€. -#: builtin/am.c:2303 +#: builtin/am.c:2311 msgid "lie about committer date" msgstr "μ»€λ―Έν° μκ°μ μμ±μ μκ°μΌλ‘ λ£μ΅λλ€" -#: builtin/am.c:2305 +#: builtin/am.c:2313 msgid "use current timestamp for author date" msgstr "νμ¬ μκ°μ μμ±μ μκ°μΌλ‘ μ¬μ©ν©λλ€" -#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229 -#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "ν€-ID" -#: builtin/am.c:2308 +#: builtin/am.c:2316 msgid "GPG-sign commits" msgstr "GPG μλͺ
컀λ°" -#: builtin/am.c:2311 +#: builtin/am.c:2319 msgid "(internal use for git-rebase)" msgstr "(git-rebaseλ₯Ό μν λ΄λΆ μ©λ)" -#: builtin/am.c:2326 +#: builtin/am.c:2334 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -3527,16 +4455,16 @@ msgstr "" "-b/--binary μ΅μ
μ μ€λ μκ° λμ μ무 λμλ νμ§ μμμΌλ―λ‘, μ΄\n" "μ΅μ
μ μ κ±°λ μμ μ
λλ€. μ΄μ μ¬μ©νμ§ λ§μμμ€." -#: builtin/am.c:2333 +#: builtin/am.c:2341 msgid "failed to read the index" msgstr "μΈλ±μ€ μ½κΈ°μ μ€ν¨νμ΅λλ€" -#: builtin/am.c:2348 +#: builtin/am.c:2356 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "μ΄μ λ¦¬λ² μ΄μ€ λλ ν°λ¦¬ %sμ΄(κ°) μμ§ μκ³ mboxλ₯Ό μ§μ νμ΅λλ€." -#: builtin/am.c:2372 +#: builtin/am.c:2380 #, c-format msgid "" "Stray %s directory found.\n" @@ -3545,486 +4473,14 @@ msgstr "" "λ²μ΄λ %s λλ ν°λ¦¬κ° λ°κ²¬λμμ΅λλ€.\n" "μ κ±°νλ €λ©΄ \"git am --abort\"λ₯Ό μ¬μ©νμμμ€." -#: builtin/am.c:2378 +#: builtin/am.c:2386 msgid "Resolve operation not in progress, we are not resuming." msgstr "ν΄μ μμ
μ΄ μ§ν μ€μ
λλ€. λ€μ μμνμ§ μμ΅λλ€." -#: builtin/apply.c:122 +#: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<μ΅μ
>] [<ν¨μΉ>...]" -#: builtin/apply.c:153 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "μ μ μλ 곡백 μ΅μ
'%s'" - -#: builtin/apply.c:169 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "μ μ μλ 곡백 무μ μ΅μ
'%s'" - -#: builtin/apply.c:854 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "νμμ€ν¬ν μ κ·μμ μ€λΉν μ μμ΅λλ€ (%s)" - -#: builtin/apply.c:863 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "regexec()μμ λ€μ μ
λ ₯μ λν΄ %dλ²μ 리ν΄νμ΅λλ€: %s" - -#: builtin/apply.c:947 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "ν¨μΉμ %dλ² μ€μ νμΌ μ΄λ¦μ μ°Ύμ μ μμ΅λλ€" - -#: builtin/apply.c:984 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "" -"git apply: μλͺ»λ git-diff - %2$dλ² μ€μμ /dev/nullμ κΈ°λνμ§λ§, '%1$s'μ΄" -"(κ°) μμ΅λλ€" - -#: builtin/apply.c:989 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "" -"git apply: μλͺ»λ git-diff - %dλ² μ€μ μ νμΌ μ΄λ¦μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" - -#: builtin/apply.c:990 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "" -"git apply: μλͺ»λ git-diff - %dλ² μ€μ μμ νμΌ μ΄λ¦μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" - -#: builtin/apply.c:995 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: μλͺ»λ git-diff - %dλ² μ€μμ /dev/nullμ κΈ°λνμ΅λλ€" - -#: builtin/apply.c:1489 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: μμμΉ λͺ»ν μ€: %.*s" - -#: builtin/apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "%dλ² μ€μ ν€λ μλ ν¨μΉ λΆλΆ: %.*s" - -#: builtin/apply.c:1567 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "" -"κ²½λ‘ μ΄λ¦ λΆλΆμμ %dκ°λ₯Ό μ κ±°λΌ λ git diff ν€λμ νμΌ μ΄λ¦ μ λ³΄κ° μμ΅λ" -"λ€. (%dλ² μ€)" - -#: builtin/apply.c:1743 -msgid "new file depends on old contents" -msgstr "μ νμΌμ΄ μμ λ΄μ©μ μμ‘΄ν©λλ€" - -#: builtin/apply.c:1745 -msgid "deleted file still has contents" -msgstr "μμ ν νμΌμ μμ§ λ΄μ©μ΄ λ€μ΄ μμ΅λλ€" - -#: builtin/apply.c:1774 -#, c-format -msgid "corrupt patch at line %d" -msgstr "ν¨μΉκ° %dλ² μ€μμ λ§κ°μ‘μ΅λλ€" - -#: builtin/apply.c:1810 -#, c-format -msgid "new file %s depends on old contents" -msgstr "μ νμΌ %sμ΄(κ°) μμ λ΄μ©μ μμ‘΄ν©λλ€" - -#: builtin/apply.c:1812 -#, c-format -msgid "deleted file %s still has contents" -msgstr "μμ ν νμΌ %sμ΄(κ°) μμ§ λ΄μ©μ΄ λ€μ΄ μμ΅λλ€" - -#: builtin/apply.c:1815 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** κ²½κ³ : %s νμΌμ λ΄μ©μ΄ λΉμ΄ μμ§λ§ μμ λμ§ μμμ΅λλ€" - -#: builtin/apply.c:1962 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "%dλ² μ€μ λ°μ΄λ리 ν¨μΉκ° μμλμμ΅λλ€: %.*s" - -#: builtin/apply.c:1999 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "%dλ² μ€μ λ°μ΄λ리 ν¨μΉκ° μ΄ν΄ν μ μμ΅λλ€" - -#: builtin/apply.c:2154 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "%dλ² μ€μ μ°λ κΈ° λ°μ΄ν°λ§ μλ ν¨μΉ" - -#: builtin/apply.c:2244 -#, c-format -msgid "unable to read symlink %s" -msgstr "%s μ¬λ³Όλ¦ λ§ν¬λ₯Ό μ½μ μ μμ΅λλ€" - -#: builtin/apply.c:2248 -#, c-format -msgid "unable to open or read %s" -msgstr "%sμ(λ₯Ό) μ΄κ±°λ μ½μ μ μμ΅λλ€" - -#: builtin/apply.c:2901 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "μ€ μμμ΄ μλͺ»λ¨: '%c'" - -#: builtin/apply.c:3020 -#, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "ν¨μΉ %dλ² λΆλΆ %dλ² μ€μμ μ±κ³΅ (μ€νμ
%dμ€)" - -#: builtin/apply.c:3032 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "컨ν
μ€νΈκ° (%ld/%ld)λ‘ μ€μ΄λλλ€. (%dλ² μ€μμ μ μ©)" - -#: builtin/apply.c:3038 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"λ€μμ κ²μνλ μ€:\n" -"%.*s" - -#: builtin/apply.c:3060 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "'%s'μ λν λ°μ΄λ리 ν¨μΉ λ°μ΄ν°κ° μμ΅λλ€" - -#: builtin/apply.c:3163 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "λ°μ΄λ리 ν¨μΉλ₯Ό '%s'μ μ μ©ν μ μμ΅λλ€" - -#: builtin/apply.c:3169 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" -"'%s'μ λν λ°μ΄λ리 ν¨μΉκ° μ¬λ°λ₯΄μ§ μμ κ²°κ³Όλ₯Ό λ§λλλ€. (κΈ°λν κ° %s, μ€" -"μ %s)" - -#: builtin/apply.c:3190 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "ν¨μΉ μ€ν¨: %s:%ld" - -#: builtin/apply.c:3314 -#, c-format -msgid "cannot checkout %s" -msgstr "%sμ(λ₯Ό) κ°μ Έμ¬ μ μμ΅λλ€" - -#: builtin/apply.c:3370 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "μ¬λ³Όλ¦ λ§ν¬ λ€μ μλ '%s' μ½κΈ°" - -#: builtin/apply.c:3399 builtin/apply.c:3630 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "%s κ²½λ‘κ° μ΄λ¦μ΄ λ°λμκ±°λ μμ λμμ΅λλ€" - -#: builtin/apply.c:3482 builtin/apply.c:3644 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: μΈλ±μ€μ μμ΅λλ€" - -#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658 -#, c-format -msgid "%s: %s" -msgstr "%s: %s" - -#: builtin/apply.c:3491 builtin/apply.c:3652 -#, c-format -msgid "%s: does not match index" -msgstr "%s: μΈλ±μ€μ λ§μ§ μμ΅λλ€" - -#: builtin/apply.c:3597 -msgid "removal patch leaves file contents" -msgstr "μ κ±°νλ ν¨μΉ λ€μμ νμΌ λ΄μ©μ΄ λ¨μμ΅λλ€" - -#: builtin/apply.c:3669 -#, c-format -msgid "%s: wrong type" -msgstr "%s: μλͺ»λ μ’
λ₯" - -#: builtin/apply.c:3671 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%sμ μ’
λ₯κ° %oμ΄μ§λ§ %oμ΄(κ°) λμ΄μΌ ν©λλ€" - -#: builtin/apply.c:3822 builtin/apply.c:3824 -#, c-format -msgid "invalid path '%s'" -msgstr "μλͺ»λ κ²½λ‘ '%s'" - -#: builtin/apply.c:3879 -#, c-format -msgid "%s: already exists in index" -msgstr "%s: μ΄λ―Έ μΈλ±μ€μ μμ΅λλ€" - -#: builtin/apply.c:3882 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s: μ΄λ―Έ μμ
λλ ν°λ¦¬μ μμ΅λλ€" - -#: builtin/apply.c:3902 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "%2$sμ μ λͺ¨λ(%1$o)κ° μμ λͺ¨λ(%3$o)μ λ€λ¦
λλ€" - -#: builtin/apply.c:3907 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "%2$sμ μ λͺ¨λ(%1$o)κ° %4$sμ μμ λͺ¨λ(%3$o)μ λ€λ¦
λλ€" - -#: builtin/apply.c:3927 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "μν₯ λ°λ '%s' νμΌμ΄ μ¬λ³Όλ¦ λ§ν¬ λ€μ μμ΅λλ€" - -#: builtin/apply.c:3931 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s: ν¨μΉλ₯Ό μ μ©νμ§ μμ΅λλ€" - -#: builtin/apply.c:3945 -#, c-format -msgid "Checking patch %s..." -msgstr "%s ν¨μΉλ₯Ό νμΈνλ μ€μ
λλ€..." - -#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "κ²½λ‘ '%s'μ λν΄ make_cache_entry μ€ν¨" - -#: builtin/apply.c:4182 -#, c-format -msgid "unable to remove %s from index" -msgstr "μΈλ±μ€μμ %sμ(λ₯Ό) μ κ±°ν μ μμ΅λλ€" - -#: builtin/apply.c:4215 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "νμ λͺ¨λ %sμ λν΄ μμλ ν¨μΉ" - -#: builtin/apply.c:4219 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "μλ‘ λ§λ νμΌ '%s'μ λν΄ stat()ν μ μμ΅λλ€" - -#: builtin/apply.c:4224 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "μλ‘ λ§λ νμΌ '%s'μ λν΄ μλΉ μ μ₯μλ₯Ό λ§λ€ μ μμ΅λλ€" - -#: builtin/apply.c:4227 builtin/apply.c:4340 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "%sμ λν΄ μΊμ νλͺ©μ μΆκ°ν μ μμ΅λλ€" - -#: builtin/apply.c:4260 -#, c-format -msgid "closing file '%s'" -msgstr "'%s' νμΌμ λ«λ μ€μ
λλ€" - -#: builtin/apply.c:4313 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "'%s' νμΌμ μΈ μ μμ΅λλ€ ('%o' λͺ¨λ)" - -#: builtin/apply.c:4403 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "%s ν¨μΉ κΉλνκ² μ μ©." - -#: builtin/apply.c:4411 -msgid "internal error" -msgstr "λ΄λΆ μ€λ₯" - -#: builtin/apply.c:4414 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "%%s ν¨μΉλ₯Ό (%dκ° κ±°λΆ) μ μ©..." - -#: builtin/apply.c:4424 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "truncating .rej νμΌ μ΄λ¦μ '%.*s.rej'(μΌ)λ‘ μλ¦" - -#: builtin/apply.c:4432 -#, c-format -msgid "cannot open %s: %s" -msgstr "%sμ(λ₯Ό) μ΄ μ μμ΅λλ€: %s" - -#: builtin/apply.c:4445 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "ν¨μΉ λΆμ #%d κΉλνκ² μ μ©." - -#: builtin/apply.c:4448 -#, c-format -msgid "Rejected hunk #%d." -msgstr "ν¨μΉ λΆμ #%d κ±°λΆλ¨." - -#: builtin/apply.c:4537 -#, c-format -msgid "Skipped patch '%s'." -msgstr "ν¨μΉ '%s' 건λλ." - -#: builtin/apply.c:4545 -msgid "unrecognized input" -msgstr "μΈμν μ μλ μ
λ ₯" - -#: builtin/apply.c:4556 -msgid "unable to read index file" -msgstr "μΈλ±μ€ νμΌμ μ½μ μ μμ΅λλ€" - -#: builtin/apply.c:4701 -msgid "--3way outside a repository" -msgstr "μ μ₯μ λ°μμ --3way μ΅μ
μ¬μ©" - -#: builtin/apply.c:4709 -msgid "--index outside a repository" -msgstr "μ μ₯μ λ°μμ --index μ΅μ
μ¬μ©" - -#: builtin/apply.c:4712 -msgid "--cached outside a repository" -msgstr "μ μ₯μ λ°μμ --cached μ΅μ
μ¬μ©" - -#: builtin/apply.c:4745 -#, c-format -msgid "can't open patch '%s'" -msgstr "'%s' ν¨μΉλ₯Ό μ΄ μ μμ΅λλ€" - -#: builtin/apply.c:4760 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "곡백 μ€λ₯ %dκ°λ₯Ό λμ΄κ°λλ€" - -#: builtin/apply.c:4766 builtin/apply.c:4776 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "%dμ€μμ 곡백 μ€λ₯λ₯Ό μΆκ°ν©λλ€." - -#: builtin/apply.c:4800 -msgid "don't apply changes matching the given path" -msgstr "μ£Όμ΄μ§ κ²½λ‘μ ν΄λΉνλ λ³κ²½ μ¬νμ μ μ©νμ§ μμ΅λλ€" - -#: builtin/apply.c:4803 -msgid "apply changes matching the given path" -msgstr "μ£Όμ΄μ§ κ²½λ‘μ ν΄λΉνλ λ³κ²½ μ¬νμ μ μ©ν©λλ€" - -#: builtin/apply.c:4806 -msgid "remove <num> leading slashes from traditional diff paths" -msgstr "μ ν΅μ μΈ diff κ²½λ‘ μμ <κ°μ>κ°μ μ μ¬λμ(/)λ₯Ό μ κ±°ν©λλ€" - -#: builtin/apply.c:4809 -msgid "ignore additions made by the patch" -msgstr "ν¨μΉμμ μΆκ°νλ νμΌμ 무μν©λλ€" - -#: builtin/apply.c:4811 -msgid "instead of applying the patch, output diffstat for the input" -msgstr "ν¨μΉλ₯Ό μ μ©νλ λμ , μ
λ ₯μ λν diffstatμ μΆλ ₯ν©λλ€" - -#: builtin/apply.c:4815 -msgid "show number of added and deleted lines in decimal notation" -msgstr "μμ§μλ‘ μΆκ° λ° μμ ν μ€ μλ₯Ό νμν©λλ€" - -#: builtin/apply.c:4817 -msgid "instead of applying the patch, output a summary for the input" -msgstr "ν¨μΉλ₯Ό μ μ©νλ λμ , μ
λ ₯μ λν μμ½μ μΆλ ₯ν©λλ€" - -#: builtin/apply.c:4819 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "ν¨μΉλ₯Ό μ μ©νλ λμ , ν¨μΉλ₯Ό μ μ© κ°λ₯νμ§ νμΈν©λλ€" - -#: builtin/apply.c:4821 -msgid "make sure the patch is applicable to the current index" -msgstr "νμ¬ μΈλ±μ€μμ ν¨μΉκ° μ μ© κ°λ₯νμ§ νμΈν©λλ€" - -#: builtin/apply.c:4823 -msgid "apply a patch without touching the working tree" -msgstr "μμ
ν΄λλ₯Ό λ°κΎΈμ§ μκ³ ν¨μΉλ₯Ό μ μ©ν©λλ€" - -#: builtin/apply.c:4825 -msgid "accept a patch that touches outside the working area" -msgstr "μμ
μμ λ°μ νμΌμ λ°κΎΈλ ν¨μΉλ₯Ό νμ©ν©λλ€" - -#: builtin/apply.c:4827 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "κ·Έλ¦¬κ³ ν¨μΉλ μ μ©ν©λλ€ (--stat/--summary/--check μ΅μ
κ³Ό κ°μ΄ μ¬μ©)" - -#: builtin/apply.c:4829 -msgid "attempt three-way merge if a patch does not apply" -msgstr "ν¨μΉλ₯Ό μ μ©νμ§ μμΌλ©΄ 3-λ°©ν₯ λ³ν©μ μλν©λλ€" - -#: builtin/apply.c:4831 -msgid "build a temporary index based on embedded index information" -msgstr "λ΄μ₯ μΈλ±μ€ μ 보λ₯Ό μ¬μ©ν΄ μμ μΈλ±μ€λ₯Ό λ§λλλ€" - -#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 -msgid "paths are separated with NUL character" -msgstr "κ²½λ‘λ₯Ό NUL λ¬Έμλ‘ κ΅¬λΆν©λλ€" - -#: builtin/apply.c:4836 -msgid "ensure at least <n> lines of context match" -msgstr "μ΅μν <n>μ€μ΄ 컨ν
μ€νΈμ μΌμΉνλμ§ νμΈν©λλ€" - -#: builtin/apply.c:4838 -msgid "detect new or modified lines that have whitespace errors" -msgstr "곡백 μ€λ₯κ° μλ μΆκ°λκ±°λ μμ λ μ€μ μ°Ύμ΅λλ€" - -#: builtin/apply.c:4841 builtin/apply.c:4844 -msgid "ignore changes in whitespace when finding context" -msgstr "컨ν
μ€νΈλ₯Ό μ°Ύμ λ 곡백 λ³κ²½ μ¬νμ 무μν©λλ€" - -#: builtin/apply.c:4847 -msgid "apply the patch in reverse" -msgstr "ν¨μΉλ₯Ό λ°λ μμλ‘ μ μ©ν©λλ€" - -#: builtin/apply.c:4849 -msgid "don't expect at least one line of context" -msgstr "μ΅μνμ 컨ν
μ€νΈ ν μ€λ μμ΄ μ μ©ν©λλ€" - -#: builtin/apply.c:4851 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "κ±°λΆλ ν¨μΉ λΆλΆμ λμλλ *.rej νμΌμ λ¨κ²¨λ‘λλ€" - -#: builtin/apply.c:4853 -msgid "allow overlapping hunks" -msgstr "ν¨μΉ λΆλΆμ΄ κ²Ήμ³λ νμ©ν©λλ€" - -#: builtin/apply.c:4856 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "νμΌ λμ μ€λ°κΏμ΄ λΉ μ‘μμ μλͺ» κ²μν κ²½μ°μ 무μν©λλ€" - -#: builtin/apply.c:4859 -msgid "do not trust the line counts in the hunk headers" -msgstr "ν¨μΉ λΆλΆμ ν€λμ μ€ μλ₯Ό μ μ©νμ§ μμ΅λλ€" - -#: builtin/apply.c:4862 -msgid "prepend <root> to all filenames" -msgstr "λͺ¨λ νμΌ μ΄λ¦μ <μ΅μμ>λ₯Ό μμ λΆμ
λλ€" - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -4084,112 +4540,157 @@ msgstr "<리λΉμ -μ΅μ
>μ git-rev-list(1)μ μ€λͺ
λμ΄ μμ΅λλ€" msgid "Blaming lines" msgstr "λΈλ μ μ€" -#: builtin/blame.c:2536 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "λΈλ μ νλͺ©μ μ°Ύμλ§μ μ μ§μ μΌλ‘ νμν©λλ€" -#: builtin/blame.c:2537 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "κ°μ₯μ리 컀λ°μ λν΄ λΉ SHA-1μ νμν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "μ΅μμ 컀λ°μ κ°μ₯μ리 컀λ°μΌλ‘ μ·¨κΈνμ§ μμ΅λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "μμ
λΉμ© ν΅κ³λ₯Ό νμν©λλ€" -#: builtin/blame.c:2540 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "κ°μ λ‘ μ§ν μν©μ νμν©λλ€" -#: builtin/blame.c:2541 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "λΈλ μ νλͺ©μ λν΄ μΆλ ₯ μ μλ₯Ό νμν©λλ€" -#: builtin/blame.c:2542 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "μλ νμΌ μ΄λ¦ νμ (κΈ°λ³Έκ°: μλ)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "μλ μ€ λ²νΈ νμ (κΈ°λ³Έκ°: νμ§ μμ)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "μ»΄ν¨ν° μ²λ¦¬μ©μΌλ‘ μ€κ³λ νμμΌλ‘ νμν©λλ€" -#: builtin/blame.c:2545 +#: builtin/blame.c:2586 msgid "Show porcelain format with per-line commit information" msgstr "μ€λ§λ€ μ»€λ° μ λ³΄κ° νμλλ μ¬μ©μμ© νμμΌλ‘ νμν©λλ€" -#: builtin/blame.c:2546 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "git-annotateμ λμΌν νμμ μ¬μ©ν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2547 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "λ΄λΆ νμμΌλ‘ μκ°μ νμν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2548 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "κΈΈκ² μ»€λ° SHA1μ νμν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2549 +#: builtin/blame.c:2590 msgid "Suppress author name and timestamp (Default: off)" msgstr "μμ±μ μ΄λ¦κ³Ό μκ°μ νμνμ§ μμ΅λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2550 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "μμ±μ μ΄λ¦ λμ μ μ μλ©μΌμ νμν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2551 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "곡백 λ¬Έμ μ°¨μ΄μ μ 무μν©λλ€" -#: builtin/blame.c:2552 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "diffλ₯Ό ν₯μνλλ° μ€νμ μΈ λ€μ¬μ°κΈ° κΈ°λ° ν΄λ¦¬μ€ν±μ μ¬μ©ν©λλ€." + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "diffλ₯Ό ν₯μνλλ° μ€νμ μΈ λΉ μ€ κΈ°λ° ν΄λ¦¬μ€ν±μ μ¬μ©ν©λλ€." + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "λ μΌμΉνλ νλͺ©μ μ°Ύλλ° λ μκ°μ μλͺ¨ν©λλ€" -#: builtin/blame.c:2553 +#: builtin/blame.c:2603 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "git-rev-listλ₯Ό νΈμΆνλ λμ <νμΌ>μμ 리λΉμ μ μ¬μ©ν©λλ€" -#: builtin/blame.c:2554 +#: builtin/blame.c:2604 msgid "Use <file>'s contents as the final image" msgstr "<νμΌ>μ λ΄μ©μ μ΅μ’
μ΄λ―Έμ§λ‘ μ¬μ©ν©λλ€" -#: builtin/blame.c:2555 builtin/blame.c:2556 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "μ μ" -#: builtin/blame.c:2555 +#: builtin/blame.c:2605 msgid "Find line copies within and across files" msgstr "νμΌ λ΄λΆμ νμΌ μ¬μ΄μ 볡μ¬λ μ€μ μ°Ύμ΅λλ€" -#: builtin/blame.c:2556 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "νμΌ λ΄λΆμ νμΌ μ¬μ΄μ μκ²¨μ§ μ€μ μ°Ύμ΅λλ€" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 msgid "Process only line range n,m, counting from 1" msgstr "n,mμ€ (1λ² μ€λΆν° μμ) μ¬μ΄μ λ²μλ§ μ²λ¦¬" +#: builtin/blame.c:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "--progress μ΅μ
μ --incremental μ΅μ
μ΄λ ν¬μ€λ μΈ νμμμ μ¬μ©ν μ μμ΅λλ€" + #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" #. output. For C locale, "4 years, 11 months ago", which #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2649 +#: builtin/blame.c:2700 msgid "4 years, 11 months ago" msgstr "4λ
11λ¬ μ " +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "--contents λ° --reverse μ΅μ
μ νΈνλμ§ μμ΅λλ€." + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "--contents μ΅μ
μ λ§μ§λ§ μ€λΈμ νΈ μ΄λ¦μ μ¬μ©ν μ μμ΅λλ€" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "--reverse λ° --first-parent μ΅μ
μ κ°μ΄ μ°λ©΄ μ΅κ·Ό 컀λ°μ μ§μ ν΄μΌ ν©λλ€" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "--reverse λ° --first-parent μ΅μ
μ κ°μ΄ μ°λ©΄ μ΅μ΄-μμ 체μΈκ³Ό λ²μκ° νμν©λλ€" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "%s κ²½λ‘κ° %s μμ μμ΅λλ€" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "%s κ²½λ‘μ λν΄ %s λΈλ‘μ μ½μ μ μμ" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "%s νμΌμλ μ€μ΄ %luκ° λΏμ
λλ€" + #: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<μ΅μ
>] [-r | -a] [--merged | --no-merged]" @@ -4438,6 +4939,10 @@ msgstr "μ
μ€νΈλ¦Ό" msgid "change the upstream info" msgstr "μ
μ€νΈλ¦Ό μ 보λ₯Ό λ°κΏλλ€" +#: builtin/branch.c:660 +msgid "Unset the upstream info" +msgstr "μ
μ€νΈλ¦Ό μ 보λ₯Ό ν΄μ ν©λλ€" + #: builtin/branch.c:661 msgid "use colored output" msgstr "μ¬λ¬ μμΌλ‘ μΆλ ₯ν©λλ€" @@ -4510,8 +5015,8 @@ msgstr "ν€" msgid "field name to sort on" msgstr "μ λ ¬ν κΈ°μ€μ΄ λλ νλ μ΄λ¦" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402 -#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 #: builtin/tag.c:369 msgid "object" msgstr "μ€λΈμ νΈ" @@ -4524,7 +5029,7 @@ msgstr "ν΄λΉ μ€λΈμ νΈμ λΈλμΉλ§ νμν©λλ€" msgid "Failed to resolve HEAD as a valid ref." msgstr "HEADλ₯Ό μ¬λ°λ₯Έ λ νΌλ°μ€λ‘ ꡬν΄λ΄λλ° μ€ν¨νμ΅λλ€." -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:709 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "λ νΌλ°μ€/ν€λ μλμ HEADκ° μμ΅λλ€!" @@ -4636,64 +5141,76 @@ msgstr "λ²λ€μ λ§λλ €λ©΄ μ μ₯μκ° νμν©λλ€." msgid "Need a repository to unbundle." msgstr "λ²λ€μ ν΄μ νλ €λ©΄ μ μ₯μκ° νμν©λλ€." -#: builtin/cat-file.c:443 +#: builtin/cat-file.c:513 msgid "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<type>|--textconv) <object>" -msgstr "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<μ’
λ₯" -">|--textconv) <μ€λΈμ νΈ>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <type> | --textconv | --filters) [--path=<path>] <object>" +msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <μ’
λ₯> | --textconv | --filters) [--path=<κ²½λ‘>] <μ€λΈμ νΈ>" -#: builtin/cat-file.c:444 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" -msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" +#: builtin/cat-file.c:514 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:551 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<μ’
λ₯>λ λ€μ μ€ νλκ° λ μ μμ΅λλ€: blob, tree, commit, tag" -#: builtin/cat-file.c:482 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "μ€λΈμ νΈ μ’
λ₯λ₯Ό λ΄
λλ€" -#: builtin/cat-file.c:483 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "μ€λΈμ νΈ ν¬κΈ°λ₯Ό λ΄
λλ€" -#: builtin/cat-file.c:485 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "μ€λ₯κ° μμ λ 0μ 리ν΄νκ³ λλ
λλ€" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "μ€λΈμ νΈμ λ΄μ©μ μμκ² νμν©λλ€" -#: builtin/cat-file.c:488 +#: builtin/cat-file.c:558 msgid "for blob objects, run textconv on object's content" msgstr "λΈλ‘ μ€λΈμ νΈμ λν΄μλ, μ€λΈμ νΈμ λ΄μ©μ λν΄ textconvλ₯Ό μ€νν©λλ€" -#: builtin/cat-file.c:490 +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "λΈλ‘ μ€λΈμ νΈμ λν΄μλ, μ€λΈμ νΈμ λ΄μ©μ λν΄ νν°λ₯Ό μ€νν©λλ€" + +#: builtin/cat-file.c:561 git-submodule.sh:923 +msgid "blob" +msgstr "λΈλ‘" + +#: builtin/cat-file.c:562 +msgid "use a specific path for --textconv/--filters" +msgstr "--textconv/--filters μ΅μ
μ κ²½λ‘λ₯Ό μ§μ ν©λλ€" + +#: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s λ° -t μ΅μ
μ΄ μμλ μ€λΈμ νΈμ λν΄ λμνλλ‘ νμ©ν©λλ€" -#: builtin/cat-file.c:491 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "--batch μΆλ ₯μ λν΄ λ²νΌλ§ν©λλ€" -#: builtin/cat-file.c:493 +#: builtin/cat-file.c:567 msgid "show info and content of objects fed from the standard input" msgstr "νμ€ μ
λ ₯μμ μ
λ ₯λ μ€λΈμ νΈμ μ 보μ λ΄μ©μ νμν©λλ€" -#: builtin/cat-file.c:496 +#: builtin/cat-file.c:570 msgid "show info about objects fed from the standard input" msgstr "νμ€ μ
λ ₯μμ μ
λ ₯λ μ€λΈμ νΈμ μ 보λ₯Ό νμν©λλ€" -#: builtin/cat-file.c:499 +#: builtin/cat-file.c:573 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "νΈλ¦¬ λ΄λΆμ μ¬λ³Όλ¦ λ§ν¬λ₯Ό λ°λΌκ°λλ€ (--batch λλ --batch-checkμ κ°μ΄ μ¬μ©)" -#: builtin/cat-file.c:501 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "--batch λλ --batch-checkμμ λͺ¨λ μ€λΈμ νΈλ₯Ό νμν©λλ€" @@ -4713,7 +5230,7 @@ msgstr "νμΌμ μ€μ λ λͺ¨λ μμ±μ νμν©λλ€" msgid "use .gitattributes only from the index" msgstr "μΈλ±μ€μμλ§ .gitattributesλ₯Ό μ¬μ©ν©λλ€" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "νμ€ μ
λ ₯μμ νμΌ μ΄λ¦μ μ½μ΅λλ€" @@ -4811,9 +5328,9 @@ msgid "write the content to temporary files" msgstr "λ΄μ©μ μμ νμΌμ μλλ€" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491 -#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497 -#: builtin/submodule--helper.c:830 builtin/worktree.c:469 +#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 +#: builtin/worktree.c:469 msgid "string" msgstr "λ¬Έμμ΄" @@ -4884,11 +5401,11 @@ msgstr "κ²½λ‘λ₯Ό μ
λ°μ΄νΈνκ³ '%s' λΈλμΉλ‘ μ ννλ μΌμ λμ msgid "path '%s' is unmerged" msgstr "'%s' κ²½λ‘λ₯Ό λ³ν©νμ§ μμμ΅λλ€" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "νμ¬ μΈλ±μ€λ₯Ό λ¨Όμ ν΄κ²°ν΄μΌ ν©λλ€" -#: builtin/checkout.c:625 +#: builtin/checkout.c:624 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "'%s'μ λν΄ reflogν μ μμ΅λλ€: %s\n" @@ -4897,7 +5414,7 @@ msgstr "'%s'μ λν΄ reflogν μ μμ΅λλ€: %s\n" msgid "HEAD is now at" msgstr "HEADμ νμ¬ μμΉλ" -#: builtin/checkout.c:667 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "HEADλ₯Ό μ
λ°μ΄νΈν μ μμ΅λλ€" @@ -5017,7 +5534,7 @@ msgstr "'%s' μ΅μ
μ '%s' μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€" msgid "Cannot switch branch to a non-commit '%s'" msgstr "λΈλμΉλ₯Ό 컀λ°μ΄ μλ '%s'(μΌ)λ‘ μ νν μ μμ΅λλ€" -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:88 +#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" @@ -5071,7 +5588,7 @@ msgstr "μ λΈλμΉμ λν΄ 3-λ°©ν₯ λ³ν©μ μνν©λλ€" msgid "update ignored files (default)" msgstr "무μνλ νμΌμ μ
λ°μ΄νΈν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/checkout.c:1154 builtin/log.c:1459 parse-options.h:250 +#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "μ€νμΌ" @@ -5092,8 +5609,8 @@ msgstr "'git checkout <μλ-λΈλμΉ>'μ λν΄ μΆμΈ‘ν©λλ€" msgid "do not check if another worktree is holding the given ref" msgstr "λ€λ₯Έ μμ
ν΄λμ μ£Όμ΄μ§ λ νΌλ°μ€κ° μλμ§ νμΈνμ§ μμ΅λλ€" -#: builtin/checkout.c:1163 builtin/clone.c:60 builtin/fetch.c:117 -#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536 +#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "κ°μ λ‘ μ§ν μν©μ νμν©λλ€" @@ -5279,8 +5796,8 @@ msgstr "λνν μ§μ°κΈ°" msgid "remove whole directories" msgstr "μ 체 λλ ν°λ¦¬ μ κ±°" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 -#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 msgid "pattern" msgstr "ν¨ν΄" @@ -5320,112 +5837,129 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<μ΅μ
>] [--] <μ μ₯μ> [<λλ ν°λ¦¬>]" -#: builtin/clone.c:62 +#: builtin/clone.c:65 msgid "don't create a checkout" msgstr "체ν¬μμμ λ§λ€μ§ μμ΅λλ€" -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476 +#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 msgid "create a bare repository" msgstr "κ°λ΅ν μ μ₯μλ₯Ό λ§λλλ€" -#: builtin/clone.c:67 +#: builtin/clone.c:70 msgid "create a mirror repository (implies bare)" msgstr "λ―Έλ¬ μ μ₯μλ₯Ό λ§λλλ€ (κ°λ΅ν μ μ₯μλ‘ μ·¨κΈ)" -#: builtin/clone.c:69 +#: builtin/clone.c:72 msgid "to clone from a local repository" msgstr "λ‘컬 μ μ₯μμμ 볡μ ν©λλ€" -#: builtin/clone.c:71 +#: builtin/clone.c:74 msgid "don't use local hardlinks, always copy" msgstr "λ‘컬 νλλ§ν¬λ₯Ό μ¬μ©νμ§ μκ³ , νμ 볡μ¬ν©λλ€" -#: builtin/clone.c:73 +#: builtin/clone.c:76 msgid "setup as shared repository" msgstr "곡μ μ μ₯μλ‘ μ€μ ν©λλ€" -#: builtin/clone.c:75 builtin/clone.c:77 +#: builtin/clone.c:78 builtin/clone.c:80 msgid "initialize submodules in the clone" msgstr "볡μ ν κ²°κ³Όλ¬Όμμ νμ λͺ¨λμ μ΄κΈ°νν©λλ€" -#: builtin/clone.c:79 +#: builtin/clone.c:82 msgid "number of submodules cloned in parallel" msgstr "λ³λ ¬μ μΌλ‘ 볡μ νλ νμλͺ¨λ κ°μ" -#: builtin/clone.c:80 builtin/init-db.c:473 +#: builtin/clone.c:83 builtin/init-db.c:475 msgid "template-directory" msgstr "μμ-λλ ν°λ¦¬" -#: builtin/clone.c:81 builtin/init-db.c:474 +#: builtin/clone.c:84 builtin/init-db.c:476 msgid "directory from which templates will be used" msgstr "μμμ μ¬μ©ν λλ ν°λ¦¬ μμΉ" -#: builtin/clone.c:83 builtin/submodule--helper.c:495 -#: builtin/submodule--helper.c:833 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 +#: builtin/submodule--helper.c:954 msgid "reference repository" msgstr "λ νΌλ°μ€ μ μ₯μ" -#: builtin/clone.c:85 +#: builtin/clone.c:90 msgid "use --reference only while cloning" msgstr "볡μ ν κ²½μ°μλ§ --referenceλ₯Ό μ¬μ©ν©λλ€" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "μ΄λ¦" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use <name> instead of 'origin' to track upstream" msgstr "μ
μ€νΈλ¦Ό μΆμ μ 'origin' λμ <μ΄λ¦>μ μ¬μ©ν©λλ€" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout <branch> instead of the remote's HEAD" msgstr "리λͺ¨νΈμ HEAD λμ <λΈλμΉ>λ₯Ό κ°μ Έμ΅λλ€" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "리λͺ¨νΈμ git-upload-pack κ²½λ‘" -#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202 msgid "depth" msgstr "κΉμ΄" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "μ§μ ν κΉμ΄μ μμ 볡μ λ₯Ό λ§λλλ€" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "μκ°" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "μ§μ ν μκ° μ΄νμ μμ 볡μ λ₯Ό λ§λλλ€" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "리λΉμ " + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "λ νΌλ°μ€λ₯Ό μ μΈν΄ μμ 볡μ μ μ»€λ° λ΄μμ κΉκ² λ§λλλ€" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "νλμ λΈλμΉλ§ 볡μ ν©λλ€ (HEAD λλ --branchλ‘ μ§μ )" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "λͺ¨λ 볡μ ν νμ λͺ¨λμ μμ λͺ¨λμ
λλ€" -#: builtin/clone.c:98 builtin/init-db.c:482 +#: builtin/clone.c:107 builtin/init-db.c:484 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:99 builtin/init-db.c:483 +#: builtin/clone.c:108 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "κΉ λλ ν°λ¦¬λ₯Ό μμ
ν΄λμ λ³κ°μ μμΉμ λμ΅λλ€" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "ν€=κ°" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "μ μ μ₯μ μμμ μ€μ ν©λλ€" -#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 msgid "use IPv4 addresses only" msgstr "IPv4 μ£Όμλ§ μ¬μ©ν©λλ€" -#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 msgid "use IPv6 addresses only" msgstr "IPv6 μ£Όμλ§ μ¬μ©ν©λλ€" -#: builtin/clone.c:241 +#: builtin/clone.c:250 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -5433,58 +5967,42 @@ msgstr "" "λλ ν°λ¦¬ μ΄λ¦μ μμλΌ μ μμ΅λλ€.\n" "λͺ
λ Ήνμμ λλ ν°λ¦¬λ₯Ό μ§μ νμμμ€" -#: builtin/clone.c:307 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" -"λ νΌλ°μ€ '%s' μ μ₯μλ₯Ό μ°κ²°λ 체ν¬μμμΌλ‘ μ°κΈ°λ μμ§ μ§μνμ§ μμ΅λλ€." - -#: builtin/clone.c:309 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "λ νΌλ°μ€ '%s' μ μ₯μκ° λ‘컬 μ μ₯μκ° μλλλ€." - -#: builtin/clone.c:314 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' is shallow" -msgstr "λ νΌλ°μ€ '%s' μ μ₯μκ° μμ μ μ₯μμ
λλ€" +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "μ 보: '%s'μ λν 보쑰 νμΌμ μΆκ°ν μ μμ΅λλ€: %s\n" -#: builtin/clone.c:317 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "λ νΌλ°μ€ '%s' μ μ₯μκ° λΆμ΄ μλ μ μ₯μμ
λλ€" - -#: builtin/clone.c:376 +#: builtin/clone.c:375 #, c-format msgid "failed to open '%s'" msgstr "'%s'μ(λ₯Ό) μ¬λλ° μ€ν¨" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "'%s'μ΄(κ°) μμ§λ§ λλ ν°λ¦¬κ° μλλλ€" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "'%s'μ λν΄ stat()μ΄ μ€ν¨νμ΅λλ€\n" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "'%s' λ§ν¬λ₯Ό λ§λλλ° μ€ν¨νμ΅λλ€" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "νμΌμ '%s'(μΌ)λ‘ λ³΅μ¬νλλ° μ€ν¨νμ΅λλ€" -#: builtin/clone.c:449 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "μλ£.\n" -#: builtin/clone.c:461 +#: builtin/clone.c:460 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -5494,122 +6012,136 @@ msgstr "" "'git status' λͺ
λ ΉμΌλ‘ 무μμ 체ν¬μμνλμ§ μ΄ν΄λ³Ό μ μκ³ \n" "'git checkout -f HEAD'λ‘ μ²΄ν¬μμμ λ€μ ν μ μμ΅λλ€\n" -#: builtin/clone.c:538 +#: builtin/clone.c:537 #, c-format msgid "Could not find remote branch %s to clone." msgstr "볡μ ν 리λͺ¨νΈμ %s λΈλμΉλ₯Ό μ°Ύμ μ μμ΅λλ€." -#: builtin/clone.c:633 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "리λͺ¨νΈμμ νμν μ€λΈμ νΈλ₯Ό λͺ¨λ 보λ΄μ§ μμμ΅λλ€" -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "%sμ(λ₯Ό) μ
λ°μ΄νΈν μ μμ΅λλ€" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "리λͺ¨νΈ HEADκ° μλ λ νΌλ°μ€λ₯Ό μ°Έκ³ νλ―λ‘, 체ν¬μμν μ μμ΅λλ€.\n" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "μμ
ν΄λλ₯Ό 체ν¬μμν μ μμ΅λλ€" -#: builtin/clone.c:766 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "νλΌλ―Έν°λ₯Ό μ€μ νμΌμ μΈ μ μμ΅λλ€" -#: builtin/clone.c:829 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "μ 리μ©μΌλ‘ repackν μ μμ΅λλ€" -#: builtin/clone.c:831 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "보쑰 μμ νμΌμ μμ ν μ μμ΅λλ€" -#: builtin/clone.c:863 builtin/receive-pack.c:1857 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "λ무 μΈμκ° λ§μ΅λλ€." -#: builtin/clone.c:867 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "볡μ ν μ μ₯μλ₯Ό μ§μ ν΄μΌ ν©λλ€." -#: builtin/clone.c:878 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare λ° --origin %s μ΅μ
μ νΈνλμ§ μμ΅λλ€." -#: builtin/clone.c:881 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare λ° --separate-git-dir μ΅μ
μ νΈνλμ§ μμ΅λλ€." -#: builtin/clone.c:894 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "'%s' μ μ₯μκ° μμ΅λλ€" -#: builtin/clone.c:900 builtin/fetch.c:1293 +#: builtin/clone.c:905 builtin/fetch.c:1338 #, c-format msgid "depth %s is not a positive number" msgstr "κΉμ΄κ°(%s) 0λ³΄λ€ ν° μκ° μλλλ€" -#: builtin/clone.c:910 +#: builtin/clone.c:915 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "λμ κ²½λ‘κ°('%s') μ΄λ―Έ μκ³ λΉ λλ ν°λ¦¬κ° μλλλ€." -#: builtin/clone.c:920 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "μμ
ν΄λκ°('%s') μ΄λ―Έ μμ΅λλ€." -#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 #: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "'%s'μ μ λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/clone.c:938 +#: builtin/clone.c:943 #, c-format msgid "could not create work tree dir '%s'" msgstr "μμ
λλ ν°λ¦¬λ₯Ό('%s') λ§λ€ μ μμ΅λλ€" -#: builtin/clone.c:956 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "κ°λ΅ν μ μ₯μλ‘('%s') 볡μ ν©λλ€...\n" -#: builtin/clone.c:958 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "'%s'μ 볡μ ν©λλ€...\n" -#: builtin/clone.c:997 +#: builtin/clone.c:963 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "clone --recursive μ΅μ
μ --reference λ° --reference-if-able μ΅μ
μ κ°μ΄ μ°λ κ²κ³Ό νΈνλμ§ μμ΅λλ€" + +#: builtin/clone.c:1019 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth μ΅μ
μ λ‘컬 볡μ μμ 무μλ©λλ€. λμ μ 'file://'μ μ¬μ©νμμμ€." -#: builtin/clone.c:1000 +#: builtin/clone.c:1021 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "--shallow-since μ΅μ
μ λ‘컬 볡μ μμ 무μλ©λλ€. λμ μ 'file://'μ μ¬μ©νμμμ€." + +#: builtin/clone.c:1023 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "--shallow-exclude μ΅μ
μ λ‘컬 볡μ μμ 무μλ©λλ€. λμ μ 'file://'μ μ¬μ©νμμμ€." + +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" msgstr "μλ³Έ μ μ₯μκ° μμ μ μ₯μμ΄λ―λ‘, --local μ΅μ
μ 무μν©λλ€" -#: builtin/clone.c:1005 +#: builtin/clone.c:1031 msgid "--local is ignored" msgstr "--local μ΅μ
μ 무μλ©λλ€" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "%sμ 볡μ λ°©λ²μ μμ§ λͺ»ν©λλ€" -#: builtin/clone.c:1058 builtin/clone.c:1066 +#: builtin/clone.c:1090 builtin/clone.c:1098 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "리λͺ¨νΈμ %s λΈλμΉκ° μ
μ€νΈλ¦Ό %sμ μμ΅λλ€" -#: builtin/clone.c:1069 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "λΉ μ μ₯μλ₯Ό 볡μ ν κ²μ²λΌ 보μ
λλ€." @@ -5749,66 +6281,66 @@ msgstr "" "κ·Έ λ€μμ \"git cherry-pick --continue\"λ₯Ό νλ©΄ λλ¨Έμ§ μ»€λ°μ\n" "λν΄ μ»€λ° λΉΌμ€κΈ°λ₯Ό λ€μ μμν©λλ€.\n" -#: builtin/commit.c:308 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "HEAD νΈλ¦¬ μ€λΈμ νΈμ λ¬Άμμ νΈλλ° μ€ν¨νμ΅λλ€" -#: builtin/commit.c:349 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "μμ μΈλ±μ€λ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/commit.c:355 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "λνν μΆκ°κ° μ€ν¨νμ΅λλ€" -#: builtin/commit.c:368 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "μμ μΈλ±μ€λ₯Ό μ
λ°μ΄νΈν μ μμ΅λλ€" -#: builtin/commit.c:370 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "μ£Όμ μΊμ νΈλ¦¬λ₯Ό μ
λ°μ΄νΈνλλ° μ€ν¨νμ΅λλ€" -#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466 +#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 msgid "unable to write new_index file" msgstr "new_index νμΌμ μΈ μ μμ΅λλ€" -#: builtin/commit.c:448 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "λ³ν©νλ μ€ λΆλΆ 컀λ°μ ν μ μμ΅λλ€." -#: builtin/commit.c:450 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "μ»€λ° λΉΌμ€κΈ°λ₯Ό νλ μ€ λΆλΆ 컀λ°μ ν μ μμ΅λλ€." -#: builtin/commit.c:459 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "μΈλ±μ€λ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:478 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "μμ μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" -#: builtin/commit.c:583 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "'%s' 컀λ°μ μμ±μ ν€λκ° μμ΅λλ€" -#: builtin/commit.c:585 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "'%s' 컀λ°μ μμ±μ ν€λ νμμ΄ μλͺ»λμμ΅λλ€" -#: builtin/commit.c:604 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "--author νλΌλ―Έν° νμμ΄ μλͺ»λμμ΅λλ€" -#: builtin/commit.c:612 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "μκ° νμμ΄ μλͺ»λμμ΅λλ€: %s" -#: builtin/commit.c:656 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5816,38 +6348,38 @@ msgstr "" "νμ¬ μ»€λ° λ©μμ§μμ μ¬μ©λμ§ μλ μ£Όμ λ¬Έμλ₯Ό\n" "μ νν μ μμ΅λλ€" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 #, c-format msgid "could not lookup commit %s" msgstr "%s 컀λ°μ μ°Ύμλ³Ό μ μμ΅λλ€" -#: builtin/commit.c:705 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:286 #, c-format msgid "(reading log message from standard input)\n" msgstr "(νμ€ μ
λ ₯μμ λ‘κ·Έ λ©μμ§λ₯Ό μ½μ)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "νμ€ μ
λ ₯μμ λ‘κ·Έ λ©μμ§λ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:711 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "'%s' λ‘κ·Έ νμΌμ μ½μ μ μμ΅λλ€" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "SQUASH_MSGλ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:743 +#: builtin/commit.c:742 msgid "could not read MERGE_MSG" msgstr "MERGE_MSGλ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:797 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "μ»€λ° μμμ μΈ μ μμ΅λλ€" -#: builtin/commit.c:815 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5862,7 +6394,7 @@ msgstr "" "\t%s\n" "λ€μ μλνμμμ€.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5877,7 +6409,7 @@ msgstr "" "\t%s\n" "λ€μ μλνμμμ€.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5886,7 +6418,7 @@ msgstr "" "λ³κ²½ μ¬νμ λν μ»€λ° λ©μμ§λ₯Ό μ
λ ₯νμμμ€. '%c' λ¬Έμλ‘ μμνλ\n" "μ€μ 무μλκ³ , λ©μμ§λ₯Ό μ
λ ₯νμ§ μμΌλ©΄ 컀λ°μ΄ μ€μ§λ©λλ€.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5897,149 +6429,153 @@ msgstr "" "μ€μ 보쑴λλ, νμνλ©΄ μ§μ μ κ±°νμμμ€. λ©μμ§λ₯Ό μ
λ ₯νμ§\n" "μμΌλ©΄ 컀λ°μ΄ μ€μ§λ©λλ€.\n" -#: builtin/commit.c:860 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sμμ±μ: %.*s <%.*s>" -#: builtin/commit.c:868 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sμκ°: %s" -#: builtin/commit.c:875 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s컀미ν°: %.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "μΈλ±μ€λ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:950 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "νΈλ¦¬λ₯Ό λ§λλλ° μ€λ₯" -#: builtin/commit.c:965 builtin/tag.c:266 +#: builtin/commit.c:969 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "λ©μμ§λ₯Ό -m λλ -F μ΅μ
μΌλ‘ μ
λ ₯νμμμ€.\n" -#: builtin/commit.c:1067 +#: builtin/commit.c:1071 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' μ΅μ
μ΄ 'μ΄λ¦ <μ μλ©μΌ>' νμμ΄ μλκ³ κΈ°μ‘΄ μμ±μμλ μμ΅λλ€" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1086 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "μΆμ λμ§ μλ νμΌ λͺ¨λκ° ('%s') μλͺ»λμμ΅λλ€" -#: builtin/commit.c:1119 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "--long λ° -z μ΅μ
μ νΈνλμ§ μμ΅λλ€" -#: builtin/commit.c:1149 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "--reset-author λ° --author μ΅μ
μ λͺ¨λ μ¬μ©νλ©΄ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/commit.c:1158 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "λ°κΏ μ¬νμ΄ μμ΅λλ€." -#: builtin/commit.c:1161 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "λ³ν© μ€μ μμ΅λλ€ -- 컀λ°μ λ°κΏ μ μμ΅λλ€." -#: builtin/commit.c:1163 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "μ»€λ° λΉΌμ€κΈ° μ€μ μμ΅λλ€ -- 컀λ°μ λ°κΏ μ μμ΅λλ€." -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "--squash λ° --fixup μ΅μ
μ κ°μ΄ μΈ μ μμ΅λλ€" -#: builtin/commit.c:1176 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "-c/-C/-F/--fixup μ΅μ
μ€μ νλλ§ μ¬μ©ν μ μμ΅λλ€." -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "-m μ΅μ
μ -c/-C/-F/--fixup μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€." -#: builtin/commit.c:1186 +#: builtin/commit.c:1191 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author μ΅μ
μ -C, -c λλ --amend μ΅μ
κ³Ό κ°μ΄ μ¨μΌ ν©λλ€." -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "--include/--only/--all/--interactive/--patch μ΅μ
μ€ νλλ§ μ¬μ©ν μ μμ΅λ" "λ€." -#: builtin/commit.c:1205 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "κ²½λ‘κ° μμ΄ --include/--only μ΅μ
μ μ°λ©΄ μλ€κ° λ§μ§ μμ΅λλ€." -#: builtin/commit.c:1207 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "κΈ°λ°νλ€μ... λ§μ§λ§μ λ³κ²½λ μΈλ±μ€λ‘ λ°κΏλλ€." -#: builtin/commit.c:1209 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "-i λλ -o μμ΄ λͺ
μμ μΈ κ²½λ‘λ₯Ό μ§μ νμ΅λλ€. --only κ²½λ‘λ₯Ό κ°μ ν©λλ€..." -#: builtin/commit.c:1221 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "μλͺ»λ μ 리 λͺ¨λ %s" -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "-a μ΅μ
κ³Ό κ²½λ‘λ₯Ό κ°μ΄ μ¬μ©νλ©΄ μλ€κ° λ§μ§ μμ΅λλ€." -#: builtin/commit.c:1336 builtin/commit.c:1622 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "μνλ₯Ό κ°λ΅νκ² νμν©λλ€" -#: builtin/commit.c:1338 builtin/commit.c:1624 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "λΈλμΉ μ 보λ₯Ό νμν©λλ€" -#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/commit.c:1345 +msgid "version" +msgstr "λ²μ " + +#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 #: builtin/worktree.c:440 msgid "machine-readable output" msgstr "μ»΄ν¨ν°κ° μ½μ μ μλ νμ" -#: builtin/commit.c:1343 builtin/commit.c:1628 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "κΈ΄ νμμΌλ‘ μνλ₯Ό νμν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/commit.c:1346 builtin/commit.c:1631 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "NUL λ¬Έμλ‘ νλͺ©μ λλ
λλ€" -#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981 +#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "λͺ¨λ" -#: builtin/commit.c:1349 builtin/commit.c:1634 +#: builtin/commit.c:1354 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "μΆμ λμ§ μλ νμΌμ νμν©λλ€. μΆκ° μ΅μ
: all, normal, no (κΈ°λ³Έκ°: all)" -#: builtin/commit.c:1352 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "무μλλ νμΌμ νμν©λλ€" -#: builtin/commit.c:1353 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "μΈμ " -#: builtin/commit.c:1354 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6047,198 +6583,198 @@ msgstr "" "νμ λͺ¨λμ λ³κ²½μ 무μν©λλ€. μΆκ° μ΅μ
: all, dirty, untracked. (κΈ°λ³Έκ°: " "all)" -#: builtin/commit.c:1356 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "μΆμ λμ§ μλ νμΌμ λͺ©λ‘μ μ¬λ¬ μ΄λ‘ νμν©λλ€" -#: builtin/commit.c:1442 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "μλ‘ λ§λ 컀λ°μ μ°Ύμλ³Ό μ μμ΅λλ€" -#: builtin/commit.c:1444 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "μλ‘ λ§λ 컀λ°μ νμ±ν μ μμ΅λλ€" -#: builtin/commit.c:1489 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "HEAD λΆλ¦¬λ¨" -#: builtin/commit.c:1492 +#: builtin/commit.c:1487 msgid " (root-commit)" msgstr " (μ΅μμ-컀λ°)" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "μ±κ³΅μ μΈ μ»€λ° νμ μμ½μ νμνμ§ μμ΅λλ€" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "μ»€λ° λ©μμ§ μμμ diffλ₯Ό νμν©λλ€" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "μ»€λ° λ©μμ§ μ΅μ
" -#: builtin/commit.c:1596 builtin/tag.c:351 +#: builtin/commit.c:1591 builtin/tag.c:351 msgid "read message from file" msgstr "νμΌμμ λ©μμ§λ₯Ό μ½μ΅λλ€" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "author" msgstr "μμ±μ" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "컀λ°μ μμ±μλ₯Ό μ§μ ν©λλ€" -#: builtin/commit.c:1598 builtin/gc.c:326 +#: builtin/commit.c:1593 builtin/gc.c:326 msgid "date" msgstr "μκ°" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "컀λ°μ μκ°μ μ§μ ν©λλ€" -#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396 -#: builtin/notes.c:559 builtin/tag.c:349 +#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:349 msgid "message" msgstr "λ©μμ§" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "commit message" msgstr "μ»€λ° λ©μμ§" -#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602 -#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79 msgid "commit" msgstr "컀λ°" -#: builtin/commit.c:1600 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "μ§μ ν 컀λ°μ λ©μμ§λ₯Ό μ¬μ¬μ©νκ³ νΈμ§ν©λλ€" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "μ§μ ν 컀λ°μμ λ©μμ§λ₯Ό μ¬μ¬μ©ν©λλ€" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "μ§μ ν 컀λ°μ μμ νλλ° autosquash νμ λ©μμ§λ₯Ό μ¬μ©ν©λλ€" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "μ§μ ν 컀λ°μ ν©μΉλλ° autosquash νμ λ©μμ§λ₯Ό μ¬μ©ν©λλ€" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "컀λ°μ λ΄κ° μμ±ν κ²μΌλ‘ λ§λλλ€ (-C/-c/--amendμ κ°μ΄ μ¬μ©)" -#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86 +#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "Signed-off-by: μ€μ μΆκ°ν©λλ€" -#: builtin/commit.c:1606 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "μ§μ ν μμ νμΌμ μ¬μ©ν©λλ€" -#: builtin/commit.c:1607 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "μ»€λ° νΈμ§μ κ°μ ν©λλ€" -#: builtin/commit.c:1608 +#: builtin/commit.c:1603 msgid "default" msgstr "κΈ°λ³Έκ°" -#: builtin/commit.c:1608 builtin/tag.c:354 +#: builtin/commit.c:1603 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "λ©μμ§μμ 곡백과 #μ£Όμμ μ§μλλ€" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "μ»€λ° λ©μμ§ μμμ μνλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 +#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG μλͺ
컀λ°" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "μ»€λ° λ΄μ© μ΅μ
" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "λ³κ²½λ νμΌμ λͺ¨λ 컀λ°ν©λλ€" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "μ§μ ν νμΌμ 컀λ°ν μΈλ±μ€μ μΆκ°ν©λλ€" -#: builtin/commit.c:1617 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "λννμΌλ‘ νμΌμ μΆκ°ν©λλ€" -#: builtin/commit.c:1618 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "λννμΌλ‘ λ³κ²½ μ¬νμ μΆκ°ν©λλ€" -#: builtin/commit.c:1619 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "μ§μ ν νμΌλ§ 컀λ°ν©λλ€" -#: builtin/commit.c:1620 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "μ»€λ° μ νν¬μ μ»€λ° λ©μμ§ νν¬λ₯Ό 건λλλλ€" -#: builtin/commit.c:1621 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "무μμ 컀λ°ν μ§ νμν©λλ€" -#: builtin/commit.c:1632 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "λ°λ‘ μ 컀λ°μ λ°κΏλλ€" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "λ€μμ°κΈ° ν νν¬λ₯Ό 건λλλλ€" -#: builtin/commit.c:1638 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "λΉ λ³κ²½ μ¬νμ κΈ°λ‘νλλ‘ νμ©ν©λλ€" -#: builtin/commit.c:1640 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "λΉ λ©μμ§μ κ°μ΄ λ³κ²½ μ¬νμ κΈ°λ‘νλλ‘ νμ©ν©λλ€" -#: builtin/commit.c:1669 +#: builtin/commit.c:1664 msgid "could not parse HEAD commit" msgstr "HEAD 컀λ°μ νμ±ν μ μμ΅λλ€" -#: builtin/commit.c:1719 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "μμλ MERGE_HEAD νμΌ (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "MERGE_MODEλ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:1745 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "μ»€λ° λ©μμ§λ₯Ό μ½μ μ μμ΅λλ€: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "컀λ°μ μ€μ§ν©λλ€. λ©μμ§λ₯Ό νΈμ§νμ§ μμμ΅λλ€.\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1754 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "컀λ°μ μ€μ§ν©λλ€. μ»€λ° λ©μμ§κ° λΉμ΄ μμ΅λλ€.\n" -#: builtin/commit.c:1809 +#: builtin/commit.c:1802 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -6404,11 +6940,21 @@ msgstr "" msgid "cannot create configuration file %s" msgstr "%s μ€μ νμΌμ λ§λ€ μ μμ΅λλ€" -#: builtin/count-objects.c:77 +#: builtin/config.c:625 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"μ¬λ¬ κ°μ κ°μ νλμ κ°μΌλ‘ λμ΄μΈ μ μμ΅λλ€.\n" +"%sμ(λ₯Ό) λ³κ²½νλ €λ©΄ μ κ·μμ μ°κ±°λ, --add λλ --replace-all μ΅μ
μ\n" +"μ¬μ©νμμμ€." + +#: builtin/count-objects.c:86 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:96 msgid "print sizes in human readable format" msgstr "μ¬λμ΄ μ½κΈ° μ’μ νμμΌλ‘ ν¬κΈ°λ₯Ό νμν©λλ€" @@ -6528,7 +7074,7 @@ msgstr "<n>κ°μ κ°μ₯ μ΅κ·Όμ νκ·Έλ§ κ³ λ €ν©λλ€ (κΈ°λ³Έκ°: 10)" msgid "only consider tags matching <pattern>" msgstr "<ν¨ν΄>κ³Ό μΌμΉνλ νκ·Έλ§ κ³ λ €ν©λλ€" -#: builtin/describe.c:410 builtin/name-rev.c:321 +#: builtin/describe.c:410 builtin/name-rev.c:320 msgid "show abbreviated commit object as fallback" msgstr "λμμΌλ‘ μμ½ν μ»€λ° μ€λΈμ νΈλ₯Ό νμν©λλ€" @@ -6562,21 +7108,21 @@ msgstr "'%s': μΌλ° νμΌμ΄λ μ¬λ³Όλ¦ λ§ν¬κ° μλλλ€" msgid "invalid option: %s" msgstr "μλͺ»λ μ΅μ
: %s" -#: builtin/diff.c:360 +#: builtin/diff.c:361 msgid "Not a git repository" msgstr "κΉ μ μ₯μκ° μλλλ€" -#: builtin/diff.c:403 +#: builtin/diff.c:404 #, c-format msgid "invalid object '%s' given." msgstr "μλͺ»λ '%s' μ€λΈμ νΈκ° μ£Όμ΄μ‘μ΅λλ€." -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "λ κ°λ³΄λ€ λ§μ λΈλ‘μ΄ μ£Όμ΄μ‘μ΅λλ€: '%s'" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "μ²λ¦¬νμ§ μμ '%s' μ€λΈμ νΈκ° μ£Όμ΄μ‘μ΅λλ€." @@ -6649,161 +7195,165 @@ msgstr "git fetch --multiple [<μ΅μ
>] [(<μ μ₯μ> | <κ·Έλ£Ή>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<μ΅μ
>]" -#: builtin/fetch.c:93 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "λͺ¨λ 리λͺ¨νΈμμ κ°μ Έμ΅λλ€" -#: builtin/fetch.c:95 builtin/pull.c:177 +#: builtin/fetch.c:97 builtin/pull.c:178 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "λμ΄μ°μ§ λ§κ³ .git/FETCH_HEADμ λ§λΆμ
λλ€" -#: builtin/fetch.c:97 builtin/pull.c:180 +#: builtin/fetch.c:99 builtin/pull.c:181 msgid "path to upload pack on remote end" msgstr "리λͺ¨νΈ μͺ½μ λ¬Άμμ μ
λ‘λν κ²½λ‘" -#: builtin/fetch.c:98 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "λ‘컬 λΈλμΉλ₯Ό κ°μ λ‘ λμ΄μλλ€" -#: builtin/fetch.c:100 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "μ¬λ¬ 리λͺ¨νΈμμ κ°μ Έμ΅λλ€" -#: builtin/fetch.c:102 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "λͺ¨λ νκ·Έμ κ΄λ ¨ μ€λΈμ νΈλ₯Ό κ°μ Έμ΅λλ€" -#: builtin/fetch.c:104 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "λͺ¨λ νκ·Έλ₯Ό κ°μ Έμ€μ§ μμ΅λλ€ (--no-tags)" -#: builtin/fetch.c:106 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "λ³λ ¬μ μΌλ‘ λ°μμ€λ νμλͺ¨λ κ°μ" -#: builtin/fetch.c:108 builtin/pull.c:187 +#: builtin/fetch.c:110 builtin/pull.c:188 msgid "prune remote-tracking branches no longer on remote" msgstr "리λͺ¨νΈμ μ΄μ μλ 리λͺ¨νΈ μΆμ λΈλμΉλ₯Ό μλΌλ
λλ€" -#: builtin/fetch.c:109 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "μ£Όλ¬Έν" -#: builtin/fetch.c:110 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "νμ λͺ¨λ μ¬κ·μ μΌλ‘ κ°μ Έμ€κΈ° λ°©μμ μ€μ ν©λλ€" -#: builtin/fetch.c:114 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "λ€μ΄λ‘λν λ¬Άμμ 보쑴ν©λλ€" -#: builtin/fetch.c:116 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "HEAD λ νΌλ°μ€ μ
λ°μ΄νΈλ₯Ό νμ©ν©λλ€" -#: builtin/fetch.c:119 builtin/pull.c:202 +#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 msgid "deepen history of shallow clone" msgstr "μμ 볡μ μ μ»€λ° λ΄μμ κΉκ² λ§λλλ€" -#: builtin/fetch.c:121 builtin/pull.c:205 +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "μμ 볡μ μ μ»€λ° λ΄μμ μκ°μ κΈ°μ€μΌλ‘ κΉκ² λ§λλλ€" + +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "μμ ν μ μ₯μλ‘ μ νν©λλ€" -#: builtin/fetch.c:123 builtin/log.c:1426 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "λλ ν°λ¦¬" -#: builtin/fetch.c:124 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "νμ λͺ¨λ κ²½λ‘ μΆλ ₯μ μμ μ΄ λλ ν°λ¦¬λ₯Ό λΆμ
λλ€" -#: builtin/fetch.c:127 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "μ¬κ· κΈ°λ³Έ λͺ¨λ" -#: builtin/fetch.c:129 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr ".git/shallowλ₯Ό μ
λ°μ΄νΈνλ λ νΌλ°μ€λ₯Ό νμ©ν©λλ€" -#: builtin/fetch.c:130 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "λ νΌλ°μ€λ§΅" -#: builtin/fetch.c:131 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "λ νΌλ°μ€λ§΅ κ°μ Έμ€κΈ°λ₯Ό μ§μ ν©λλ€" -#: builtin/fetch.c:387 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "리λͺ¨νΈ λ νΌλ°μ€ HEADλ₯Ό μ°Ύμ μ μμ΅λλ€" -#: builtin/fetch.c:503 +#: builtin/fetch.c:514 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "fetch.output μ€μ μ μλͺ»λ κ°μ΄ μμ΅λλ€: %s" -#: builtin/fetch.c:592 +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "%s μ€λΈμ νΈκ° μμ΅λλ€" -#: builtin/fetch.c:596 +#: builtin/fetch.c:611 msgid "[up to date]" msgstr "[μ΅μ μν]" -#: builtin/fetch.c:609 builtin/fetch.c:689 +#: builtin/fetch.c:624 builtin/fetch.c:704 msgid "[rejected]" msgstr "[κ±°λΆλ¨]" -#: builtin/fetch.c:610 +#: builtin/fetch.c:625 msgid "can't fetch in current branch" msgstr "νμ¬ λΈλμΉμμ κ°μ Έμ¬ μ μμ" -#: builtin/fetch.c:619 +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "[νκ·Έ μ
λ°μ΄νΈ]" -#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669 -#: builtin/fetch.c:684 +#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "unable to update local ref" msgstr "λ‘컬 λ νΌλ°μ€λ₯Ό μ
λ°μ΄νΈν μ μμ΅λλ€" -#: builtin/fetch.c:639 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "[μλ‘μ΄ νκ·Έ]" -#: builtin/fetch.c:642 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "[μλ‘μ΄ λΈλμΉ]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "[μλ‘μ΄ λ νΌλ°μ€]" -#: builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "forced update" msgstr "κ°μ μ
λ°μ΄νΈ" -#: builtin/fetch.c:689 +#: builtin/fetch.c:704 msgid "non-fast-forward" msgstr "μ λ°©ν₯ μ§νμ΄ μλ" -#: builtin/fetch.c:733 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%sμ΄(κ°) λͺ¨λ νμν μ€λΈμ νΈλ₯Ό 보λ΄μ§ μμμ΅λλ€\n" -#: builtin/fetch.c:753 +#: builtin/fetch.c:769 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "μμ μ΅μμμ μ
λ°μ΄νΈκ° νμ©λμ§ μμΌλ―λ‘ %sμ(λ₯Ό) κ±°λΆν©λλ€" -#: builtin/fetch.c:839 builtin/fetch.c:934 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "%.*s URLμμ\n" -#: builtin/fetch.c:850 +#: builtin/fetch.c:867 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6812,55 +7362,55 @@ msgstr "" "μ
λ°μ΄νΈν μ μλ λ‘컬 λ νΌλ°μ€κ° μμ΅λλ€. κ³Όκ±° μΆ©λ λΈλμΉλ₯Ό\n" " μ κ±°νλ €λ©΄ 'git remote prune %s' λͺ
λ Ήμ μ€νν΄ λ³΄μμμ€" -#: builtin/fetch.c:904 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr " (%s λ νΌλ°μ€κ° μ°κ²°μ΄ λμ΄μ§κ² λ©λλ€)" -#: builtin/fetch.c:905 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr " (%s λ νΌλ°μ€κ° μ°κ²°μ΄ λμ΄μ‘μ΅λλ€)" -#: builtin/fetch.c:937 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "[μμ λ¨]" -#: builtin/fetch.c:938 builtin/remote.c:1020 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "(μμ)" -#: builtin/fetch.c:960 +#: builtin/fetch.c:979 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "κ°λ΅ν μ μ₯μκ° μλ μ μ₯μμ νμ¬ %s λΈλμΉλ‘ κ°μ Έμ€κΈ°λ₯Ό κ±°μ ν©λλ€" -#: builtin/fetch.c:979 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "\"%s\" μ΅μ
μ \"%s\" κ°μ %sμ λν΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" -#: builtin/fetch.c:982 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "\"%s\" μ΅μ
μ '%s'μ λν΄ λ¬΄μλ©λλ€\n" -#: builtin/fetch.c:1039 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "'%s'μμ κ°μ Έμ€λ λ°©λ²μ μ μ μμ΅λλ€" -#: builtin/fetch.c:1199 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "%sμ(λ₯Ό) κ°μ Έμ€λ μ€\n" -#: builtin/fetch.c:1201 builtin/remote.c:96 +#: builtin/fetch.c:1239 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "%sμ(λ₯Ό) κ°μ Έμ¬ μ μμ΅λλ€" -#: builtin/fetch.c:1219 +#: builtin/fetch.c:1257 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -6868,33 +7418,41 @@ msgstr "" "리λͺ¨νΈ μ μ₯μλ₯Ό μ§μ νμ§ μμμ΅λλ€. μ 리λΉμ μ κ°μ Έμ¬ μ μλ\n" "URLμ΄λ 리λͺ¨νΈ μ΄λ¦μ μ§μ νμμμ€." -#: builtin/fetch.c:1242 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "νκ·Έ μ΄λ¦μ μ§μ ν΄μΌ ν©λλ€." -#: builtin/fetch.c:1284 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "--deepen μ΅μ
μ μμ κΉμ΄λ μ§μνμ§ μμ΅λλ€" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "-deepen, --depth μ΅μ
μ€ νλλ§ μΈ μ μμ΅λλ€" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "--depth λ° --unshallow μ΅μ
μ κ°μ΄ μΈ μ μμ΅λλ€" -#: builtin/fetch.c:1286 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "" "μμ ν μ μ₯μμ λν΄ --unshallow μ΅μ
μ μ¬μ©νλ 건 μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/fetch.c:1306 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "fetch --all λͺ
λ Ήμ μ μ₯μ μΈμκ° μμ΅λλ€" -#: builtin/fetch.c:1308 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all λͺ
λ Ήμ λ νΌλ°μ€λͺ
μΈ μΈμμ κ°μ΄ μ°λ©΄ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "κ·Έλ° λ¦¬λͺ¨νΈλ 리λͺ¨νΈ κ·Έλ£Ήμ΄ μμ΅λλ€: %s" -#: builtin/fetch.c:1327 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "κ·Έλ£Ήμ κ°μ Έμ€κ³ λ νΌλ°μ€λͺ
μΈλ₯Ό μ§μ νλ©΄ μλ€κ° λ§μ§ μμ΅λλ€" @@ -6904,23 +7462,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <λ©μμ§>] [--log[=<n>] | --no-log] [--file <νμΌ>]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "shortlogμμ μ΅λ <n>κ° λ‘κ·Έλ₯Ό νμν©λλ€" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "--logμ λμΌ (μμ΄μ§ μμ )" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "ν
μ€νΈ" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "<ν
μ€νΈ>λ₯Ό μμ λ©μμ§λ‘ μ¬μ©ν©λλ€" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "μ½μ΄λ€μΌ νμΌ" @@ -7036,7 +7594,7 @@ msgstr "μ§ν μν©μ νμν©λλ€" msgid "show verbose names for reachable objects" msgstr "μ κ·Όν μ μλ μ€λΈμ νΈμ μ΄λ¦μ μμΈν νμν©λλ€" -#: builtin/fsck.c:671 +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "μ€λΈμ νΈλ₯Ό νμΈν©λλ€" @@ -7128,225 +7686,220 @@ msgstr "grep: μ€λ λλ₯Ό λ§λλλ° μ€ν¨νμ΅λλ€: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "μλͺ»λ μ€λ λ μλ₯Ό %2$sμ λν΄ μ§μ νμ΅λλ€ (%1$d)" -#: builtin/grep.c:452 builtin/grep.c:487 +#: builtin/grep.c:453 builtin/grep.c:488 #, c-format msgid "unable to read tree (%s)" msgstr "νΈλ¦¬λ₯Ό μ½μ μ μμ΅λλ€ (%s)" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, c-format msgid "unable to grep from object of type %s" msgstr "μ’
λ₯κ° %sμΈ μ€λΈμ νΈμμ grepμ ν μ μμ΅λλ€" -#: builtin/grep.c:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "`%c' μ΅μ
μλ μ«μ κ°μ΄ μμΌ ν©λλ€" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "'%s'μ(λ₯Ό) μ΄ μ μμ΅λλ€" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 msgid "search in index instead of in the work tree" msgstr "μμ
ν΄λ λμ μ μΈλ±μ€μμ κ²μν©λλ€" -#: builtin/grep.c:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "κΉμΌλ‘ κ΄λ¦¬νμ§ μμ λ΄μ©μμ μ°Ύμ΅λλ€" -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "μΆμ λλ νμΌκ³Ό μΆμ λμ§ μλ νμΌ λͺ¨λμμ κ²μν©λλ€" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "'.gitignore'λ‘ μ§μ ν νμΌμ 무μν©λλ€" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "μΌμΉνμ§ μλ μ€μ νμν©λλ€" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "λμλ¬Έμ ꡬλ³νμ§ μκ³ λ§μΆ₯λλ€" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "λ¨μ΄ κ²½κ³ λΆλΆμ λν΄μλ§ ν¨ν΄μ λ§μΆ₯λλ€" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "λ°μ΄λ리 νμΌμ ν
μ€νΈλ‘ μ²λ¦¬ν©λλ€" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "λ°μ΄λ리 νμΌμμ ν¨ν΄μ λ§μΆμ§ μμ΅λλ€" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "textconv νν°λ₯Ό μ¬μ©ν΄ λ°μ΄λ리 νμΌμ μ²λ¦¬ν©λλ€" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most <depth> levels" msgstr "μ΅λ <κΉμ΄> λ¨κ³λ§νΌ λ΄λ €κ°λλ€" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "POSIX νμ₯ μ κ·μμ μ¬μ©ν©λλ€" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "κΈ°λ³Έ POSIX μ κ·μμ μ¬μ©ν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "ν¨ν΄μ κ³ μ λ¬Έμμ΄λ‘ ν΄μν©λλ€" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "νκ³Ό νΈνλλ μ κ·μμ μ¬μ©ν©λλ€" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "μ€ λ²νΈλ₯Ό νμν©λλ€" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "νμΌ μ΄λ¦μ νμνμ§ μμ΅λλ€" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "νμΌ μ΄λ¦μ νμν©λλ€" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "νμΌ μ΄λ¦μ μ΅μμ λλ ν°λ¦¬ μλ κ²½λ‘λ‘ νμν©λλ€" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only filenames instead of matching lines" msgstr "μΌμΉνλ μ€μ νμνμ§ μκ³ νμΌ μ΄λ¦λ§ νμν©λλ€" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "--files-with-matches μ΅μ
κ³Ό λμΌ" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "μΌμΉνμ§ μλ νμΌμ μ΄λ¦λ§ νμν©λλ€" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "νμΌ μ΄λ¦ λ€μμ NULμ μΆλ ₯ν©λλ€" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show the number of matches instead of matching lines" msgstr "μΌμΉνλ μ€μ νμνμ§ μκ³ μΌμΉνλ μλ₯Ό νμν©λλ€" -#: builtin/grep.c:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "μΌμΉνλ λΆλΆμ κ°μ‘°ν©λλ€" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "λ€λ₯Έ νμΌ μ¬μ΄μ μΌμΉνλ λΆλΆμ μ¬μ΄μ λΉ μ€μ μΆλ ₯ν©λλ€" -#: builtin/grep.c:704 +#: builtin/grep.c:705 msgid "show filename only once above matches from same file" msgstr "κ°μ νμΌμμ μ¬λ¬ κ°κ° μΌμΉνλ©΄ νμΌ μ΄λ¦μ ν λ²λ§ νμν©λλ€" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show <n> context lines before and after matches" msgstr "μΌμΉνλ λΆλΆ μλ€μ 컨ν
μ€νΈλ₯Ό <n>μ€ νμν©λλ€" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show <n> context lines before matches" msgstr "μΌμΉνλ λΆλΆ μμ 컨ν
μ€νΈλ₯Ό <n>μ€ νμν©λλ€" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show <n> context lines after matches" msgstr "μΌμΉνλ λΆλΆ λ€μ 컨ν
μ€νΈλ₯Ό <n>μ€ νμν©λλ€" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use <n> worker threads" msgstr "<n>κ°μ μμ
μ€λ λλ₯Ό μ¬μ©ν©λλ€" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "-C NUM μ΅μ
μ μ€μ" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "show a line with the function name before matches" msgstr "μΌμΉ νλͺ© μμ ν¨μ μ΄λ¦ μ€μ νμν©λλ€" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "λ€μ΄ μλ ν¨μλ₯Ό νμν©λλ€" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "νμΌμμ ν¨ν΄μ μ½μ΅λλ€" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match <pattern>" msgstr "<ν¨ν΄>κ³Ό μΌμΉ" -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "-e μ΅μ
μΌλ‘ μ§μ ν ν¨ν΄μ κ²°ν©ν©λλ€" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "μΆλ ₯νμ§ μκ³ μΌμΉνλ νλͺ©μ exit() μν λ²νΈλ‘ 리ν΄ν©λλ€" -#: builtin/grep.c:741 +#: builtin/grep.c:742 msgid "show only matches from files that match all patterns" msgstr "λͺ¨λ ν¨ν΄κ³Ό μΌμΉνλ νμΌμ μΌμΉνλ λΆλΆλ§ νμν©λλ€" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "show parse tree for grep expression" msgstr "grep ννμμ λν νμ± νΈλ¦¬λ₯Ό νμν©λλ€" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "νμ΄μ " -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "μΌμΉνλ νμΌμ νμ΄μ νλ‘κ·Έλ¨μμ νμν©λλ€" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "grep(1) μ€νμ νμ©ν©λλ€ (μ΄ λΉλμμλ 무μ)" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "ν¨ν΄μ μ§μ νμ§ μμμ΅λλ€." -#: builtin/grep.c:845 builtin/index-pack.c:1479 +#: builtin/grep.c:846 builtin/index-pack.c:1480 #, c-format msgid "invalid number of threads specified (%d)" msgstr "μλͺ»λ μ€λ λ μλ₯Ό μ§μ νμ΅λλ€ (%d)" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager μ΅μ
μ μμ
ν΄λμμλ§ λμν©λλ€" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "--cached λλ --untracked μ΅μ
μ --no-index μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€." -#: builtin/grep.c:906 +#: builtin/grep.c:907 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index λλ --untracked μ΅μ
μ 리λΉμ κ³Ό κ°μ΄ μΈ μ μμ΅λλ€." -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard μ΅μ
μ μΆμ λλ λ΄μ©μ λν΄ μΈ μ μμ΅λλ€." -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "--cached μ΅μ
κ³Ό νΈλ¦¬λ₯Ό λͺ¨λ μ§μ νμ΅λλ€." @@ -7362,83 +7915,87 @@ msgstr "" msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "type" msgstr "μ’
λ₯" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "object type" msgstr "μ€λΈμ νΈ μ’
λ₯" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "μ€λΈμ νΈλ₯Ό μ€λΈμ νΈ λ°μ΄ν°λ² μ΄μ€λ‘ μλλ€" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "νμ€ μ
λ ₯μμ μ€λΈμ νΈλ₯Ό μ½μ΅λλ€" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "νμΌμ νν° μμ΄ κ·Έλλ‘ μ μ₯ν©λλ€" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "μμμ μ°λ κΈ° λ°μ΄ν°λ₯Ό ν΄μν΄ μμλ μ€λΈμ νΈλ₯Ό λ§λλλ€ (λλ²κΉ
μ©)" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "νμΌμ΄ μ΄ κ²½λ‘μμ μ¨ κ²μ²λΌ μ²λ¦¬ν©λλ€" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "μ¬μ© κ°λ₯ν λͺ¨λ λͺ
λ Ήμ λͺ©λ‘μ νμν©λλ€" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "μ€λͺ
μ μ μΈ" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "μ μ©ν μλ΄μ λͺ©λ‘μ νμν©λλ€" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "맨 νμ΄μ§λ₯Ό νμν©λλ€" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "μΉ λΈλΌμ°μ μμ μ€λͺ
μλ₯Ό νμν©λλ€" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "μΈν¬ νμ΄μ§λ₯Ό νμν©λλ€" -#: builtin/help.c:52 +#: builtin/help.c:54 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<λͺ
λ Ή>]" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "'%s' λμλ§ ν¬λ§·μ μΈμν μ μμ΅λλ€" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "emacsclient μμμ μ€ν¨νμ΅λλ€." -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "emacsclient λ²μ νμ±μ μ€ν¨νμ΅λλ€." -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient '%d' λ²μ μ λ무 κ³Όκ±° (< 22) λ²μ μ
λλ€." -#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 +#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 #, c-format msgid "failed to exec '%s'" msgstr "μ€ν μ€ν¨: '%s'" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -7447,7 +8004,7 @@ msgstr "" "'%s': μ§μνμ§ μλ 맨 νμ΄μ§ 보기 νλ‘κ·Έλ¨ κ²½λ‘.\n" "λμ μ 'man.<λꡬ>.cmd' μ΅μ
μ μ¬μ©ν΄ 보μμμ€." -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -7456,295 +8013,299 @@ msgstr "" "'%s': μ§μνμ§ μλ 맨 νμ΄μ§ 보기 νλ‘κ·Έλ¨ λͺ
λ Ή.\n" "λμ μ 'man.<λꡬ>.path' μ΅μ
μ μ¬μ©ν΄ 보μμμ€." -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': μ μ μλ 맨 νμ΄μ§ 보기 νλ‘κ·Έλ¨." -#: builtin/help.c:351 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "μμ²μ μ²λ¦¬ν 맨 νμ΄μ§ 보기 νλ‘κ·Έλ¨μ΄ μμ΅λλ€" -#: builtin/help.c:359 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "μμ²μ μ²λ¦¬ν μΈν¬ νμ΄μ§ 보기 νλ‘κ·Έλ¨μ΄ μμ΅λλ€" -#: builtin/help.c:408 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "κ²½λ‘λ§λ€ μμ± μ μνκΈ°" -#: builtin/help.c:409 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "맀μΌλ§€μΌ μ¬μ©νλ 20κ° λ΄μΈμ κΉ λͺ
λ Ή" -#: builtin/help.c:410 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "κΉ μ©μ΄ μ¬μ " -#: builtin/help.c:411 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "μλμ μΌλ‘ μΆμ νμ§ μλ νμΌμ 무μνκ² μ§μ νκΈ°" -#: builtin/help.c:412 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "νμ λͺ¨λ μμ± μ μνκΈ°" -#: builtin/help.c:413 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "κΉμ 리λΉμ λ° λ²μλ₯Ό μ§μ νκΈ°" -#: builtin/help.c:414 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "κΉ λ°λΌνκΈ° μλ΄μ (λ²μ 1.5.1 μ΄ν)" -#: builtin/help.c:415 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "μΆμ²νλ κΉ νμ© μμ
μμμ κ°μ" -#: builtin/help.c:427 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "μμ£Ό μ¬μ©νλ κΉ μλ΄μλ λ€μκ³Ό κ°μ΅λλ€:\n" -#: builtin/help.c:448 builtin/help.c:465 -#, c-format -msgid "usage: %s%s" -msgstr "μ¬μ©λ²: %s%s" - -#: builtin/help.c:481 +#: builtin/help.c:440 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' λͺ
λ Ήμ `%s' λͺ
λ Ήμ λ¨μΆμ
λλ€" -#: builtin/index-pack.c:153 +#: builtin/help.c:462 builtin/help.c:479 +#, c-format +msgid "usage: %s%s" +msgstr "μ¬μ©λ²: %s%s" + +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "%sμ(λ₯Ό) μ΄ μ μμ΅λλ€" -#: builtin/index-pack.c:203 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "μ€λΈμ νΈ μ’
λ₯κ° λ§μ§ μμ΅λλ€ (%s)" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "μμν %s μ€λΈμ νΈλ₯Ό λ°μ§ μμμ΅λλ€" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "%s μ€λΈμ νΈ: μμν μ’
λ₯ %s, μ€μ %s" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:269 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "%d λ°μ΄νΈλ₯Ό μ±μΈ μ μμ΅λλ€" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "λ무 빨리 νμΌμ΄ λλ¨" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "μ
λ ₯μ μ½κΈ° μ€λ₯" -#: builtin/index-pack.c:291 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "μλ λ°μ΄νΈλ³΄λ€ λ λ§μ΄ μ¬μ©ν©λλ€" -#: builtin/index-pack.c:298 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "νμ¬ μ μλ off_tμ λΉν΄ λ¬Άμμ΄ λ무 ν½λλ€" -#: builtin/index-pack.c:314 +#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +msgid "pack exceeds maximum allowed size" +msgstr "λ¬Άμ ν¬κΈ°κ° μ΅λ νμ© ν¬κΈ°λ₯Ό λμμ΅λλ€" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" msgstr "'%s'μ(λ₯Ό) λ§λ€ μ μμ΅λλ€" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "'%s' λ¬Άμ νμΌμ μ΄ μ μμ΅λλ€" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "λ¬Άμ μλͺ
μ΄ λ§μ§ μμ΅λλ€" -#: builtin/index-pack.c:335 +#: builtin/index-pack.c:338 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "λ¬Άμμ %<PRIu32> λ²μ μ μ§μνμ§ μμ΅λλ€" -#: builtin/index-pack.c:353 +#: builtin/index-pack.c:356 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "λ¬Άμμ %<PRIuMAX> μ€νμ
μ μλͺ»λ μ€λΈμ νΈκ° μμ΅λλ€: %s" -#: builtin/index-pack.c:475 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "inflateκ° %dλ²μ 리ν΄νμ΅λλ€" -#: builtin/index-pack.c:524 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "λΈν λ² μ΄μ€ μ€λΈμ νΈμ λν΄ μ€νμ
κ°μ΄ μ€λ²νλ‘μ°" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "λΈν λ² μ΄μ€ μ€νμ
μ΄ λ²μλ₯Ό λ²μ΄λ¬μ΅λλ€" -#: builtin/index-pack.c:540 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "μ μ μλ μ€λΈμ νΈ μ’
λ₯ %dλ²" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "λ¬Άμ νμΌμ λν΄ preadλ₯Ό ν μ μμ΅λλ€" -#: builtin/index-pack.c:573 +#: builtin/index-pack.c:576 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "λ¬Άμ νμΌμ΄ λ무 μΌμ° λλ¨. %<PRIuMAX> λ°μ΄νΈ λΆμ‘±" -#: builtin/index-pack.c:599 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "μ¬κ°ν inflate λΆμ‘°ν" -#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774 -#: builtin/index-pack.c:808 builtin/index-pack.c:817 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 +#: builtin/index-pack.c:811 builtin/index-pack.c:820 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 μΆ©λμ΄ %sμμ λ°κ²¬λμμ΅λλ€!" -#: builtin/index-pack.c:748 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:751 builtin/pack-objects.c:166 +#: builtin/pack-objects.c:258 #, c-format msgid "unable to read %s" msgstr "%sμ(λ₯Ό) μ½μ μ μμ΅λλ€" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "κΈ°μ‘΄ %s μ€λΈμ νΈλ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/index-pack.c:828 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "μλͺ»λ λΈλ‘ μ€λΈμ νΈ %s" -#: builtin/index-pack.c:842 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "μλͺ»λ %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "μ€λΈμ νΈμ μ€λ₯" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%sμ λͺ¨λ νμ μ€λΈμ νΈμ μ κ·Όν μ μμ΅λλ€" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:922 builtin/index-pack.c:953 msgid "failed to apply delta" msgstr "λΈνλ₯Ό μ μ©νλλ° μ€ν¨νμ΅λλ€" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "μ€λΈμ νΈλ₯Ό λ°λ μ€" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "μ€λΈμ νΈ μΈλ±μ€λ₯Ό λ§λλ μ€" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "λ¬Άμμ΄ μμλμμ΅λλ€ (SHA1 μΌμΉνμ§ μμ)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "λ¬Άμ νμΌμ λν΄ fstat()ν μ μμ΅λλ€" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "λ¬Άμμ λμ μ°λ κΈ° λ°μ΄ν°κ° μμ΅λλ€" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects()μμ κ·Ήμ¬ν νΌλ" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "λΈνλ₯Ό μμλ΄λ μ€" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "μ€λ λλ₯Ό λ§λ€ μ μμ΅λλ€: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "κ·Ήμ¬ν νΌλ" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1256 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "λ‘컬 μ€λΈμ νΈ %dκ° λ§μΉ¨" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "%sμ λν΄ μμμΉ λͺ»ν ν
μΌ μ²΄ν¬μ¬ (λμ€ν¬ μμ?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1272 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "λ¬Άμμ μμλ΄μ§ λͺ»ν λΈν %dκ°κ° μμ΅λλ€" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "μΆκ°ν μ€λΈμ νΈλ₯Ό deflateν μ μμ΅λλ€ (%d)" -#: builtin/index-pack.c:1371 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "%s λ‘컬 μ€λΈμ νΈκ° μμλμμ΅λλ€" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "λ¬Άμ νμΌμ λ«λλ° μ€λ₯" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "'%s' 보쑴 νμΌμ μΈ μ μμ΅λλ€" -#: builtin/index-pack.c:1416 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "μ΄ '%s' 보쑴 νμΌμ λ«μ§ λͺ»νμ΅λλ€" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "λ¬Άμ νμΌμ μ μ₯ν μ μμ΅λλ€" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "μΈλ±μ€ νμΌμ μ μ₯ν μ μμ΅λλ€" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "μλͺ»λ pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1483 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" msgstr "μ€λ λ κΈ°λ₯μ΄ μμ΅λλ€. %s 무μ" @@ -7782,95 +8343,95 @@ msgstr "'%s' λ¬ΆμνμΌ μ΄λ¦μ΄ '.pack'μΌλ‘ λλμ§ μμ΅λλ€" msgid "bad %s" msgstr "μλͺ»λ %s" -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin μ΅μ
μ --stdin μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€" -#: builtin/index-pack.c:1738 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "--verify μ΅μ
μ λ¬ΆμνμΌ μ΄λ¦μ μ§μ νμ§ μμμ΅λλ€" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "'%s'μ(λ₯Ό) stat()ν μ μμ΅λλ€" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "'%s' μμμ stat()ν μ μμ΅λλ€" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "'%s'μ(λ₯Ό) opendir()ν μ μμ΅λλ€" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "'%s'μ(λ₯Ό) readlink()ν μ μμ΅λλ€" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "'%s'μ(λ₯Ό) '%s'μ symlink()ν μ μμ΅λλ€" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "'%s'μ(λ₯Ό) '%s'μ 볡μ¬ν μ μμ΅λλ€" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "%s μμμ 무μν©λλ€" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "%sμ μμμ΄ μμ΅λλ€" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "'%s'μμ μμμ 볡μ¬νμ§ μμ΅λλ€: %s" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "%s νμΌμ΄ μ΄λ―Έ μμ΅λλ€" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:327 #, c-format msgid "unable to handle file type %d" msgstr "νμΌ μ’
λ₯ %dλ²μ μ²λ¦¬ν μ μμ΅λλ€" -#: builtin/init-db.c:347 +#: builtin/init-db.c:330 #, c-format msgid "unable to move %s to %s" msgstr "%sμ(λ₯Ό) %s(μΌ)λ‘ μκΈΈ μ μμ΅λλ€" -#: builtin/init-db.c:402 +#: builtin/init-db.c:347 builtin/init-db.c:350 +#, c-format +msgid "%s already exists" +msgstr "%s νμΌμ΄ μ΄λ―Έ μμ΅λλ€" + +#: builtin/init-db.c:403 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "%s%s μμ κΈ°μ‘΄ 곡μ κΉ μ μ₯μλ₯Ό λ€μ μ΄κΈ°ννμ΅λλ€\n" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "%s%s μμ κΈ°μ‘΄ κΉ μ μ₯μλ₯Ό λ€μ μ΄κΈ°ννμ΅λλ€\n" -#: builtin/init-db.c:407 +#: builtin/init-db.c:408 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "%s%s μμ λΉ κ³΅μ κΉ μ μ₯μλ₯Ό λ€μ μ΄κΈ°ννμ΅λλ€\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "%s%s μμ λΉ κΉ μ μ₯μλ₯Ό λ€μ μ΄κΈ°ννμ΅λλ€\n" -#: builtin/init-db.c:455 +#: builtin/init-db.c:457 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7878,25 +8439,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<μμ-λλ ν°λ¦¬>] [--shared[=<κΆ" "ν>]] [<λλ ν°λ¦¬>]" -#: builtin/init-db.c:478 +#: builtin/init-db.c:480 msgid "permissions" msgstr "κΆν" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "κΉ μ μ₯μλ₯Ό λ€λ₯Έ μ¬μ©μκ° κ³΅μ ν μ μκ² μ§μ " -#: builtin/init-db.c:513 builtin/init-db.c:518 +#: builtin/init-db.c:515 builtin/init-db.c:520 #, c-format msgid "cannot mkdir %s" msgstr "%sμ λν΄ mkdirλ₯Ό ν μ μμ΅λλ€" -#: builtin/init-db.c:522 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "%sμ λν΄ chdirλ₯Ό ν μ μμ΅λλ€" -#: builtin/init-db.c:543 +#: builtin/init-db.c:545 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7905,7 +8466,7 @@ msgstr "" "%s (λλ --work-tree=<λλ ν°λ¦¬>) νμ©λμ§ μμ. %s (λλ --git-" "dir=<directory>) μ§μ μ΄ μμΌλ©΄" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "μμ
ν΄λ '%s'μ μ κ·Όν μ μμ΅λλ€" @@ -8016,37 +8577,34 @@ msgstr "λ²μκ° μλλλ€." msgid "Cover letter needs email format" msgstr "컀λ²λ ν°λ μ μλ©μΌ νμμ΄μ΄μΌ ν©λλ€" -#: builtin/log.c:1064 +#: builtin/log.c:1063 #, c-format msgid "insane in-reply-to: %s" msgstr "μ μ λκ° in-reply-to ν€λ: %s" -#: builtin/log.c:1092 +#: builtin/log.c:1091 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<μ΅μ
>] [<μμμκ°> | <리λΉμ -λ²μ>]" -#: builtin/log.c:1137 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "μΆλ ₯ λλ ν°λ¦¬κ° λκ°?" -#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897 +#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 #, c-format msgid "Unknown commit %s" msgstr "μ μ μλ μ»€λ° %s" -#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305 -#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425 -#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594 -#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "'%s'μ(λ₯Ό) μ¬λ°λ₯Έ λ νΌλ°μ€λ‘ μμλ΄λλ° μ€ν¨νμ΅λλ€." -#: builtin/log.c:1259 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "μ νν λ³ν© κΈ°μ€μ μ μ°Ύμ μ μμ΅λλ€." -#: builtin/log.c:1263 +#: builtin/log.c:1267 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -8057,209 +8615,213 @@ msgstr "" "μλλ©΄ μ§μ '--base=<κΈ°μ€μ -컀λ°-ID>' μ΅μ
μΌλ‘ κΈ°μ€μ 컀λ°μ μ§μ ν \n" "μλ μμ΅λλ€." -#: builtin/log.c:1283 +#: builtin/log.c:1287 msgid "Failed to find exact merge base" msgstr "μ νν λ³ν© κΈ°μ€μ μ μ°Ύλλ° μ€ν¨νμ΅λλ€" -#: builtin/log.c:1294 +#: builtin/log.c:1298 msgid "base commit should be the ancestor of revision list" msgstr "κΈ°μ€μ 컀λ°μ 리λΉμ λͺ©λ‘μ μμ 컀λ°μ΄μ΄μΌ ν©λλ€" -#: builtin/log.c:1298 +#: builtin/log.c:1302 msgid "base commit shouldn't be in revision list" msgstr "κΈ°μ€μ 컀λ°μ 리λΉμ λͺ©λ‘μ λ€μ΄ μμΌλ©΄ μ λ©λλ€" -#: builtin/log.c:1347 +#: builtin/log.c:1351 msgid "cannot get patch id" msgstr "ν¨μΉ IDλ₯Ό μμλΌ μ μμ΅λλ€" -#: builtin/log.c:1404 +#: builtin/log.c:1408 msgid "use [PATCH n/m] even with a single patch" msgstr "νλμ ν¨μΉμ λν΄μλ [PATCh n/m]μ λΆμ
λλ€" -#: builtin/log.c:1407 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "μ¬λ¬ κ° ν¨μΉμ λν΄μλ [PATCH]λ₯Ό λΆμ
λλ€" -#: builtin/log.c:1411 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "ν¨μΉλ₯Ό νμ€ μΆλ ₯μΌλ‘ νμν©λλ€" -#: builtin/log.c:1413 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "컀λ²λ ν°λ₯Ό λ§λλλ€" -#: builtin/log.c:1415 +#: builtin/log.c:1419 msgid "use simple number sequence for output file names" msgstr "μΆλ ₯ νμΌ μ΄λ¦μ κ°λ¨ν μΌλ ¨ λ²νΈλ₯Ό μ¬μ©ν©λλ€" -#: builtin/log.c:1416 +#: builtin/log.c:1420 msgid "sfx" msgstr "νμ₯μ" -#: builtin/log.c:1417 +#: builtin/log.c:1421 msgid "use <sfx> instead of '.patch'" msgstr "'.patch' λμ <νμ₯μ>λ₯Ό μ¬μ©ν©λλ€" -#: builtin/log.c:1419 +#: builtin/log.c:1423 msgid "start numbering patches at <n> instead of 1" msgstr "ν¨μΉ λ²νΈλ₯Ό 1 λμ <n>μμ μμν©λλ€" -#: builtin/log.c:1421 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "μ리μ¦λ₯Ό Nλ²μ§Έ re-rollλ‘ νμν©λλ€" -#: builtin/log.c:1423 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "[PATCH] λμ [RFC PATCH]λ₯Ό μ¬μ©ν©λλ€" + +#: builtin/log.c:1430 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[PATCH] λμ [<μ λμ΄>]λ₯Ό μ¬μ©ν©λλ€" -#: builtin/log.c:1426 +#: builtin/log.c:1433 msgid "store resulting files in <dir>" msgstr "κ²°κ³Ό νμΌμ <λλ ν°λ¦¬>μ μ μ₯ν©λλ€" -#: builtin/log.c:1429 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "[PATCH]λ₯Ό μλ₯΄κ±°λ μΆκ°νμ§ μμ΅λλ€" -#: builtin/log.c:1432 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "λ°μ΄λ리 diffλ₯Ό λ§λ€μ§ μμ΅λλ€" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "From ν€λμμ λͺ¨λ 0μΈ ν΄μλ₯Ό μΆλ ₯ν©λλ€" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't include a patch matching a commit upstream" msgstr "μ
μ€νΈλ¦Όμ μλ ν¨μΉλ₯Ό ν¬ν¨νμ§ μμ΅λλ€" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "κΈ°λ³Έκ° (ν¨μΉ + ν΅κ³) λμ ν¨μΉ νμμ νμν©λλ€" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "Messaging" msgstr "λ©μμ§" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "header" msgstr "ν€λ" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "add email header" msgstr "μ μλ©μΌ ν€λ" -#: builtin/log.c:1443 builtin/log.c:1445 +#: builtin/log.c:1450 builtin/log.c:1452 msgid "email" msgstr "μ μλ©μΌ" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "add To: header" msgstr "To: ν€λλ₯Ό μΆκ°ν©λλ€" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "add Cc: header" msgstr "Cc: ν€λλ₯Ό μΆκ°ν©λλ€" -#: builtin/log.c:1447 +#: builtin/log.c:1454 msgid "ident" msgstr "μ μ" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "set From address to <ident> (or committer ident if absent)" msgstr "<μ μ>μμ From μ£Όμλ₯Ό μ€μ ν©λλ€ (μμΌλ©΄ μ»€λ―Έν° μ£Όμ μ μ μ¬μ©)" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "message-id" msgstr "λ©μμ§-ID" -#: builtin/log.c:1451 +#: builtin/log.c:1458 msgid "make first mail a reply to <message-id>" msgstr "첫 λ©μΌμ <λ©μμ§-ID>μ λν λ΅μ₯ λ©μΌλ‘ λ§λλλ€" -#: builtin/log.c:1452 builtin/log.c:1455 +#: builtin/log.c:1459 builtin/log.c:1462 msgid "boundary" msgstr "κ²½κ³" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "attach the patch" msgstr "ν¨μΉλ₯Ό 첨λΆν©λλ€" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "inline the patch" msgstr "ν¨μΉλ₯Ό λ³Έλ¬Έμ ν¬ν¨ν©λλ€" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "enable message threading, styles: shallow, deep" msgstr "λ©μμ§μ μ€λ λλ₯Ό μ¬μ©, μ€νμΌ: shallow, deep" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "signature" msgstr "μλͺ
" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "add a signature" msgstr "μλͺ
μ μΆκ°ν©λλ€" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "base-commit" msgstr "λ² μ΄μ€-컀λ°" -#: builtin/log.c:1465 +#: builtin/log.c:1472 msgid "add prerequisite tree info to the patch series" msgstr "μ μ 쑰건 νΈλ¦¬ μ 보λ₯Ό ν¨μΉ μ리μ¦μ μΆκ°ν©λλ€" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "add a signature from a file" msgstr "νμΌμμ μλͺ
μ μΆκ°ν©λλ€" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "don't print the patch filenames" msgstr "ν¨μΉ νμΌ μ΄λ¦μ νμνμ§ μμ΅λλ€" -#: builtin/log.c:1558 +#: builtin/log.c:1565 msgid "-n and -k are mutually exclusive." msgstr "-n λ° -k μ΅μ
μ νλλ§ μ¨μΌ ν©λλ€." -#: builtin/log.c:1560 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix λ° -k μ΅μ
μ νλλ§ μ¨μΌ ν©λλ€." +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "--subject-prefix/--rfc λ° -k μ΅μ
μ νλλ§ μ¨μΌ ν©λλ€." -#: builtin/log.c:1568 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "--name-only μ΅μ
μ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/log.c:1570 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "--name-status μ΅μ
μ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/log.c:1572 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "--check μ΅μ
μ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "νμ€ μΆλ ₯μ΄λ λλ ν°λ¦¬ μ€μ νλλ§ μ§μ ν΄μΌ ν©λλ€." -#: builtin/log.c:1604 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "'%s' λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/log.c:1698 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "'%s' μλͺ
νμΌμ μ½μ μ μμ΅λλ€" -#: builtin/log.c:1769 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "μΆλ ₯ νμΌμ λ§λλλ° μ€ν¨νμ΅λλ€" -#: builtin/log.c:1818 +#: builtin/log.c:1826 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<μ
μ€νΈλ¦Ό> [<ν€λ> [<νκ³κ°>]]]" -#: builtin/log.c:1872 +#: builtin/log.c:1880 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -8267,99 +8829,103 @@ msgstr "" "μΆμ λλ 리λͺ¨νΈ λΈλμΉλ₯Ό μ°Ύμ μ μμ΅λλ€. <μ
μ€νΈλ¦Ό>μ μλμΌλ‘ μ§μ νμμ" "μ€.\n" -#: builtin/ls-files.c:379 +#: builtin/ls-files.c:458 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<μ΅μ
>] [<νμΌ>...]" -#: builtin/ls-files.c:428 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "νμΌ μνλ₯Ό νκ·Έμ κ°μ΄ νμν©λλ€" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "'λ³κ²½λμ§ μμλ€κ³ κ°μ ' νμΌμ μλ¬Έμλ₯Ό μ¬μ©ν©λλ€" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "μΆλ ₯μ μΊμλ νμΌμ νμν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "μΆλ ₯μ μμ λ νμΌμ νμν©λλ€" -#: builtin/ls-files.c:436 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "μΆλ ₯μ μμ λ νμΌμ νμν©λλ€" -#: builtin/ls-files.c:438 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "μΆλ ₯μ κΈ°ν νμΌμ νμν©λλ€" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "μΆλ ₯μ 무μλ νμΌμ νμν©λλ€" -#: builtin/ls-files.c:443 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "μΆλ ₯μ μ»€λ° νμλ λ΄μ©μ μ€λΈμ νΈ μ΄λ¦μ νμν©λλ€" -#: builtin/ls-files.c:445 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "νμΌ μμ€ν
μμ μ κ±°ν΄μΌ νλ νμΌμ νμν©λλ€" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "κΈ°ν λλ ν°λ¦¬μ μ΄λ¦λ§ νμν©λλ€" -#: builtin/ls-files.c:449 +#: builtin/ls-files.c:528 msgid "show line endings of files" msgstr "νμΌμ μ€ λμ νμν©λλ€" -#: builtin/ls-files.c:451 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "λΉ λλ ν°λ¦¬ νμνμ§ μκΈ°" -#: builtin/ls-files.c:454 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "μΆλ ₯μ λ³ν©νμ§ μμ νμΌμ νμν©λλ€" -#: builtin/ls-files.c:456 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "resolve-undo μ 보λ₯Ό νμν©λλ€" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:537 msgid "skip files matching pattern" msgstr "ν¨ν΄μ μΌμΉνλ νμΌμ 건λλλλ€" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:540 msgid "exclude patterns are read from <file>" msgstr "μ μΈν ν¨ν΄μ <νμΌ>μμ μ½μ΅λλ€" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:543 msgid "read additional per-directory exclude patterns in <file>" msgstr "<νμΌ>μμ μΆκ°μ μΈ λλ ν°λ¦¬λ³ μ μΈ ν¨ν΄μ μ½μ΅λλ€" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:545 msgid "add the standard git exclusions" msgstr "νμ€ κΉ μ μΈ ν¨ν΄μ μΆκ°ν©λλ€" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:548 msgid "make the output relative to the project top directory" msgstr "μ΅μμ λλ ν°λ¦¬ μλ κ²½λ‘λ‘ μΆλ ₯ν©λλ€" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:551 +msgid "recurse through submodules" +msgstr "νμ λͺ¨λμ μ¬κ·μ μΌλ‘ μ μ©" + +#: builtin/ls-files.c:553 msgid "if any <file> is not in the index, treat this as an error" msgstr "<νμΌ>μ΄ μΈλ±μ€ μμ μμΌλ©΄ μ€λ₯λ‘ μ·¨κΈν©λλ€" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:554 msgid "tree-ish" msgstr "νΈλ¦¬-λ°μ" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:555 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "<νΈλ¦¬-λ°μ> λ€λ‘ μ κ±°ν κ²½λ‘κ° μλ€κ³ κ°μ ν©λλ€" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:557 msgid "show debugging data" msgstr "λλ²κΉ
λ°μ΄ν°λ₯Ό νμν©λλ€" @@ -8476,31 +9042,31 @@ msgstr "μ¬μ© κ°λ₯ν μ λ΅μ:" msgid "Available custom strategies are:" msgstr "μ¬μ© κ°λ₯ν μ¬μ©μ μ€μ μ λ΅μ:" -#: builtin/merge.c:195 builtin/pull.c:126 +#: builtin/merge.c:195 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "λ³ν©μ΄ λλ λ diffstatμ νμνμ§ μμ΅λλ€" -#: builtin/merge.c:198 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "λ³ν©μ΄ λλ λ diffstatμ νμν©λλ€" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(--stat μ΅μ
κ³Ό λμΌ)" -#: builtin/merge.c:201 builtin/pull.c:135 +#: builtin/merge.c:201 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "λ³ν© 컀λ°μ λ©μμ§μ shortlog νλͺ©μ (μ΅λ <n>κ°) μΆκ°ν©λλ€" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "λ³ν©νλ λμ νλμ 컀λ°μ λ§λλλ€" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:206 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "λ³ν©μ΄ μ±κ³΅νλ©΄ 컀λ°μ ν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/merge.c:208 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "μ»€λ° μ μ λ©μμ§λ₯Ό νΈμ§ν©λλ€" @@ -8508,28 +9074,28 @@ msgstr "μ»€λ° μ μ λ©μμ§λ₯Ό νΈμ§ν©λλ€" msgid "allow fast-forward (default)" msgstr "μ λ°©ν₯ μ§νμ νμ©ν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/merge.c:211 builtin/pull.c:150 +#: builtin/merge.c:211 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "μ λ°©ν₯ μ§νμ΄ λΆκ°λ₯νλ©΄ μ€μ§ν©λλ€" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:215 builtin/pull.c:154 msgid "verify that the named commit has a valid GPG signature" msgstr "μ§μ ν 컀λ°μ μ¬λ°λ₯Έ GPG μλͺ
μ΄ μλμ§ κ²μ¦ν©λλ€" -#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "μ λ΅" -#: builtin/merge.c:217 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "μ¬μ©ν λ³ν© μ λ΅" -#: builtin/merge.c:218 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "μ΅μ
=κ°" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "μ νν λ³ν© μ λ΅μ λν μ΅μ
" @@ -8541,7 +9107,7 @@ msgstr "λ³ν© μ»€λ° λ©μμ§ (μ λ°©ν₯μ΄ μλ λ³ν©μ λν΄)" msgid "abort the current in-progress merge" msgstr "νμ¬ μ§ν μ€μΈ λ³ν©μ μ€μ§ν©λλ€" -#: builtin/merge.c:227 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "κ΄κ³ μλ μ»€λ° λ΄μμ λ³ν©μ νμ©ν©λλ€" @@ -8759,55 +9325,55 @@ msgstr "κ΄κ³ μλ μ»€λ° λ΄μμ λ³ν©μ κ±°λΆν©λλ€" msgid "Already up-to-date." msgstr "μ΄λ―Έ μ
λ°μ΄νΈ μνμ
λλ€." -#: builtin/merge.c:1382 +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "μ
λ°μ΄νΈ μ€ %s..%s\n" -#: builtin/merge.c:1419 +#: builtin/merge.c:1418 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "μμ£Ό κ°λ¨ν μΈλ±μ€ λ΄λΆ λ³ν©μ μλν©λλ€...\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "μλ.\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 msgid "Already up-to-date. Yeeah!" msgstr "μ΄λ―Έ μ
λ°μ΄νΈ μνμ
λλ€. μΌνΈ!" -#: builtin/merge.c:1457 +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "μ λ°©ν₯μ΄ λΆκ°λ₯νλ―λ‘, μ€μ§ν©λλ€." -#: builtin/merge.c:1480 builtin/merge.c:1559 +#: builtin/merge.c:1479 builtin/merge.c:1558 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "νΈλ¦¬λ₯Ό λ³Έλ μμΉλ‘ λλ립λλ€...\n" -#: builtin/merge.c:1484 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "λ³ν© μ λ΅ %s μλ...\n" -#: builtin/merge.c:1550 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "λ³ν©μ μ²λ¦¬ν μ λ΅μ΄ μμ΅λλ€.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "μ λ΅ %s(μΌ)λ‘ λ³ν©μ΄ μ€ν¨νμ΅λλ€.\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1560 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "μλ ν΄κ²°μ μ€λΉλ₯Ό μν΄ %s μ λ΅μ μ¬μ©ν©λλ€.\n" -#: builtin/merge.c:1573 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "μλ λ³ν©μ΄ μ μ§νλμμ΅λλ€. μμ²νλλ‘ μ»€λ° μ μ μ€μ§ν©λλ€\n" @@ -8832,23 +9398,23 @@ msgstr "git merge-base --is-ancestor <컀λ°> <컀λ°>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <λ νΌλ°μ€> [<컀λ°>]" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "λͺ¨λ κ³Όκ±° κ³΅ν΅ μ»€λ°μ μΆλ ₯ν©λλ€" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "νλμ n-λ°©ν₯ λ³ν©μ λν κ³Όκ±° 컀λ°μ μ°Ύμ΅λλ€" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "λ€λ₯Έ κ³³μμ μ κ·Ό λΆκ°λ₯ν 리λΉμ λͺ©λ‘μ μΆλ ₯ν©λλ€" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "첫λ²μ§Έκ° λ€λ₯Έ κ²μ κ³Όκ±° 컀λ°μΈμ§ μ¬λΆ?" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where <commit> forked from reflog of <ref>" msgstr "<λ νΌλ°μ€>μ reflogμμ <컀λ°>μ΄ λΆλ¦¬λ μμΉλ₯Ό μ°Ύμ΅λλ€" @@ -8892,6 +9458,36 @@ msgstr "μΆ©λμ λν΄ κ²½κ³ νμ§ μμ΅λλ€" msgid "set labels for file1/orig-file/file2" msgstr "<νμΌ1>/<λ³Έλ-νμΌ>/<νμΌ2>μ λν λ μ΄λΈμ μ€μ ν©λλ€" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "μ μ μλ μ΅μ
: %s" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "'%s' μ€λΈμ νΈλ₯Ό νμ±ν μ μμ΅λλ€" + +#: builtin/merge-recursive.c:55 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "λ² μ΄μ€λ₯Ό %dκ° λ³΄λ€ λ§μ΄ μΈ μ μμ΅λλ€. %s 무μν©λλ€." + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "λ κ°μ ν€λ λ³ν© μΈμλ μ²λ¦¬νμ§ μμ΅λλ€." + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "'%s' λ νΌλ°μ€λ₯Ό μμλΌ μ μμ΅λλ€" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "%s λ³ν©, %s νλͺ©κ³Ό\n" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -9000,43 +9596,43 @@ msgstr "μ΄λ¦ λ°κΎΈκΈ°, '%s'μμ '%s'(μΌ)λ‘\n" msgid "renaming '%s' failed" msgstr "'%s'μ μ΄λ¦ λ°κΎΈκΈ°κ° μ€ν¨νμ΅λλ€" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<μ΅μ
>] <컀λ°>..." -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<μ΅μ
>] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<μ΅μ
>] --stdin" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "μ΄λ¦λ§ νμ (SHA-1 μμ΄)" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "컀λ°μ μ§μ ν λ νκ·Έλ§ μ¬μ©ν©λλ€" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching <pattern>" msgstr "<ν¨ν΄>κ³Ό μΌμΉνλ λ νΌλ°μ€λ§ μ¬μ©ν©λλ€" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "λͺ¨λ λ νΌλ°μ€μμ μ κ·Ό κ°λ₯ν λͺ¨λ μ»€λ° λͺ©λ‘μ νμν©λλ€" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "νμ€μ
λ ₯μμ μ½μ΅λλ€" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "`μ μλμ§ μμ' μ΄λ¦ νμλ₯Ό νμ©ν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "μ
λ ₯μ νκ·Έ λ νΌλ°μ€λ₯Ό λ°λΌκ°λλ€ (λ΄λΆ μ¬μ©)" @@ -9170,7 +9766,7 @@ msgid "failed to finish 'show' for object '%s'" msgstr "μ€λΈμ νΈ '%s'μ λν΄ 'show'λ₯Ό λ§μΉλλ° μ€ν¨νμ΅λλ€" #: builtin/notes.c:194 -msgid "Please supply the note contents using either -m or -F option" +msgid "please supply the note contents using either -m or -F option" msgstr "λ
ΈνΈ λ΄μ©μ -m λλ -F μ΅μ
μΌλ‘ μ
λ ₯νμμμ€" #: builtin/notes.c:203 @@ -9179,7 +9775,7 @@ msgstr "λ
ΈνΈ μ€λΈμ νΈλ₯Ό μΈ μ μμ΅λλ€" #: builtin/notes.c:205 #, c-format -msgid "The note contents have been left in %s" +msgid "the note contents have been left in %s" msgstr "λ
ΈνΈ λ΄μ©μ %sμ λ¨μ΅λλ€" #: builtin/notes.c:233 builtin/tag.c:439 @@ -9192,52 +9788,76 @@ msgstr "'%s'μ(λ₯Ό) μ½μ μ μμ΅λλ€" msgid "could not open or read '%s'" msgstr "'%s'μ(λ₯Ό) μ΄κ±°λ μ½μ μ μμ΅λλ€" +#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 +#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#, c-format +msgid "failed to resolve '%s' as a valid ref." +msgstr "'%s'μ(λ₯Ό) μ¬λ°λ₯Έ λ νΌλ°μ€λ‘ μμλ΄λλ° μ€ν¨νμ΅λλ€." + #: builtin/notes.c:257 #, c-format -msgid "Failed to read object '%s'." +msgid "failed to read object '%s'." msgstr "'%s' μ€λΈμ νΈ μ½κΈ°μ μ€ν¨νμ΅λλ€." #: builtin/notes.c:261 #, c-format -msgid "Cannot read note data from non-blob object '%s'." +msgid "cannot read note data from non-blob object '%s'." msgstr "λΈλ‘μ΄ μλ '%s' μ€λΈμ νΈμ λν΄ λ
ΈνΈ λ°μ΄ν°λ₯Ό μ½μ μ μμ΅λλ€." -#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 -#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 -#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "μλͺ»λ νμμ μ
λ ₯ μ€: '%s'." + +#: builtin/notes.c:316 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "'%s'μμ '%s'(μΌ)λ‘ λ
ΈνΈλ₯Ό 볡μ¬νλλ° μ€ν¨νμ΅λλ€" + +#. TRANSLATORS: the first %s will be replaced by a +#. git notes command: 'add', 'merge', 'remove', etc. +#: builtin/notes.c:345 +#, c-format +msgid "refusing to %s notes in %s (outside of refs/notes/)" +msgstr "%sμμ λ
ΈνΈλ₯Ό %s νκΈ°λ₯Ό κ±°λΆν©λλ€ (refs/notes/ λ°μ)" + +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 +#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 msgid "too many parameters" msgstr "νλΌλ―Έν°κ° λ무 λ§μ΅λλ€" -#: builtin/notes.c:376 builtin/notes.c:663 +#: builtin/notes.c:378 builtin/notes.c:665 #, c-format -msgid "No note found for object %s." +msgid "no note found for object %s." msgstr "%s μ€λΈμ νΈμ λν΄ λ
ΈνΈκ° μμ΅λλ€." -#: builtin/notes.c:397 builtin/notes.c:560 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "λ¬Έμμ΄λ‘ λ
ΈνΈ λ΄μ©" -#: builtin/notes.c:400 builtin/notes.c:563 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "νμΌ μμ λ
ΈνΈ λ΄μ©" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "μ§μ ν λ
ΈνΈ μ€λΈμ νΈλ₯Ό μ¬μ¬μ©νκ³ νΈμ§ν©λλ€" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "μ§μ ν λ
ΈνΈ μ€λΈμ νΈλ₯Ό μ¬μ¬μ©ν©λλ€" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "λΉ λ
ΈνΈ μ μ₯μ νμ©ν©λλ€" -#: builtin/notes.c:410 builtin/notes.c:481 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "κΈ°μ‘΄ λ
ΈνΈλ₯Ό λ°κΏλλ€" -#: builtin/notes.c:435 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9246,29 +9866,29 @@ msgstr "" "λ
ΈνΈλ₯Ό μΆκ°ν μ μμ΅λλ€. %s μ€λΈμ νΈμ λν κΈ°μ‘΄ λ
ΈνΈκ° μμ΅λλ€. κΈ°μ‘΄ λ
ΈνΈ" "λ₯Ό λμ΄μ°λ €λ©΄ '-f' μ΅μ
μ μ¬μ©νμμμ€" -#: builtin/notes.c:450 builtin/notes.c:529 +#: builtin/notes.c:452 builtin/notes.c:531 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "%s μ€λΈμ νΈμ λν κΈ°μ‘΄ λ
ΈνΈλ₯Ό λμ΄μλλ€\n" -#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887 +#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 #, c-format msgid "Removing note for object %s\n" msgstr "%s μ€λΈμ νΈμ λν λ
ΈνΈλ₯Ό μ κ±°ν©λλ€\n" -#: builtin/notes.c:482 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "νμ€ μ
λ ₯μμ μ€λΈμ νΈλ₯Ό μ½μ΅λλ€" -#: builtin/notes.c:484 +#: builtin/notes.c:486 msgid "load rewriting config for <command> (implies --stdin)" msgstr "<λͺ
λ Ή>μ λν λ€μμ°κΈ° μ€μ μ μ½μ΄λ€μ
λλ€ (--stdin μ΅μ
ν¬ν¨)" -#: builtin/notes.c:502 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "νλΌλ―Έν°κ° λ무 μ μ΅λλ€" -#: builtin/notes.c:523 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9277,12 +9897,12 @@ msgstr "" "λ
ΈνΈλ₯Ό 볡μ¬ν μ μμ΅λλ€. %s μ€λΈμ νΈμ λν κΈ°μ‘΄ λ
ΈνΈκ° μμ΅λλ€. κΈ°μ‘΄ λ
ΈνΈ" "λ₯Ό λμ΄μ°λ €λ©΄ '-f' μ΅μ
μ μ¬μ©νμμμ€" -#: builtin/notes.c:535 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." +msgid "missing notes on source object %s. Cannot copy." msgstr "μλ³Έ %s μ€λΈμ νΈμ λν λ
ΈνΈκ° μμ΅λλ€. 볡μ¬ν μ μμ΅λλ€." -#: builtin/notes.c:587 +#: builtin/notes.c:589 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -9291,20 +9911,52 @@ msgstr "" "-m/-F/-c/-C μ΅μ
μ 'edit' νμ λͺ
λ Ήμ λν΄ μ¬μ©μ κΆνμ§ μμ΅λλ€.\n" "λμ μ 'git notes add -f -m/-F/-c/-C' λͺ
λ Ήμ μ¬μ©νμμμ€.\n" -#: builtin/notes.c:753 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "NOTES_MERGE_PARTIAL λ νΌλ°μ€ μμ μ μ€ν¨νμ΅λλ€" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "NOTES_MERGE_REF λ νΌλ°μ€ μμ μ μ€ν¨νμ΅λλ€" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "'git notes merge' μμ
νΈλ¦¬ μ κ±°μ μ€ν¨νμ΅λλ€" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "NOTES_MERGE_PARTIAL λ νΌλ°μ€ μ½κΈ°μ μ€ν¨νμ΅λλ€" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "NOTES_MERGE_PARTIALμμ 컀λ°μ μ°Ύμ μ μμ΅λλ€." + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "NOTES_MERGE_PARTIALμμ 컀λ°μ νμ±ν μ μμ΅λλ€." + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "NOTES_MERGE_REF μμλ΄κΈ°μ μ€ν¨νμ΅λλ€" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "λ
ΈνΈ λ³ν©μ λ§μΉλλ° μ€ν¨νμ΅λλ€" + +#: builtin/notes.c:755 #, c-format msgid "unknown notes merge strategy %s" msgstr "μ μ μλ λ
ΈνΈ λ³ν© μ λ΅ %s" -#: builtin/notes.c:769 +#: builtin/notes.c:771 msgid "General options" msgstr "μΌλ° μ΅μ
" -#: builtin/notes.c:771 +#: builtin/notes.c:773 msgid "Merge options" msgstr "λ³ν© μ΅μ
" -#: builtin/notes.c:773 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -9312,274 +9964,273 @@ msgstr "" "μ£Όμ΄μ§ μ λ΅μ μ¬μ©ν΄ λ
ΈνΈ μΆ©λμ ν΄κ²°ν©λλ€ (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:775 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "λ³ν©νμ§ μμ λ
ΈνΈ 컀λ°" -#: builtin/notes.c:777 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "λ³ν©νμ§ μμ λ
ΈνΈλ₯Ό 컀λ°ν΄ λ
ΈνΈ λ³ν©μ λ§μΉ©λλ€" -#: builtin/notes.c:779 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "λ
ΈνΈ λ³ν© ν΄κ²° μ€μ§" -#: builtin/notes.c:781 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "λ
ΈνΈ λ³ν©μ μ€μ§ν©λλ€" -#: builtin/notes.c:792 +#: builtin/notes.c:794 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "--commit, --abort, -s/--strategy μ΅μ
μ μμ΄ μΈ μ μμ΅λλ€" -#: builtin/notes.c:797 -msgid "Must specify a notes ref to merge" +#: builtin/notes.c:799 +msgid "must specify a notes ref to merge" msgstr "λ³ν©ν λ
ΈνΈ λ νΌλ°μ€λ₯Ό μ§μ ν΄μΌ ν©λλ€" -#: builtin/notes.c:821 +#: builtin/notes.c:823 #, c-format -msgid "Unknown -s/--strategy: %s" +msgid "unknown -s/--strategy: %s" msgstr "μ μ μλ μ λ΅(-s/--strategy): %s" -#: builtin/notes.c:858 +#: builtin/notes.c:860 #, c-format -msgid "A notes merge into %s is already in-progress at %s" +msgid "a notes merge into %s is already in-progress at %s" msgstr "%s μμΉλ‘ λ
ΈνΈ λ³ν©μ΄ μ΄λ―Έ %sμμ μ§νμ€μ
λλ€" -#: builtin/notes.c:861 +#: builtin/notes.c:863 #, c-format -msgid "Failed to store link to current notes ref (%s)" +msgid "failed to store link to current notes ref (%s)" msgstr "νμ¬ λ
ΈνΈ λ νΌλ°μ€μ (%s) λ§ν¬λ₯Ό μ μ₯νλλ° μ€ν¨νμ΅λλ€." -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " "'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" -msgstr "μλ λ
ΈνΈ λ³ν©μ΄ μ€ν¨νμ΅λλ€. %s μμ μΆ©λμ λ°λ‘μ‘κ³ κ²°κ³Όλ₯Ό 'git notes merge --commit' λͺ
λ ΉμΌλ‘ 컀λ°νμμμ€. λλ 'git notes merge --abort' λͺ
λ ΉμΌλ‘ λ³ν©μ μ€μ§νμμμ€.\n" +msgstr "" +"μλ λ
ΈνΈ λ³ν©μ΄ μ€ν¨νμ΅λλ€. %s μμ μΆ©λμ λ°λ‘μ‘κ³ κ²°κ³Όλ₯Ό 'git notes " +"merge --commit' λͺ
λ ΉμΌλ‘ 컀λ°νμμμ€. λλ 'git notes merge --abort' λͺ
λ ΉμΌ" +"λ‘ λ³ν©μ μ€μ§νμμμ€.\n" -#: builtin/notes.c:885 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "%s μ€λΈμ νΈμ λ
ΈνΈκ° μμ΅λλ€\n" -#: builtin/notes.c:897 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "μλ λ
ΈνΈλ₯Ό μ κ±°νλ €λ μλλ₯Ό μ€λ₯κ° μλ κ²μΌλ‘ μ·¨κΈν©λλ€" -#: builtin/notes.c:900 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "νμ€ μ
λ ₯μμ μ€λΈμ νΈ μ΄λ¦μ μ½μ΅λλ€" -#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 msgid "do not remove, show only" msgstr "μ κ±°νμ§ μκ³ , 보μ¬μ£ΌκΈ°λ§ ν©λλ€" -#: builtin/notes.c:939 +#: builtin/notes.c:941 msgid "report pruned notes" msgstr "μλΌλΈ λ
ΈνΈλ₯Ό μ립λλ€" -#: builtin/notes.c:981 +#: builtin/notes.c:983 msgid "notes-ref" msgstr "λ
ΈνΈ-λ νΌλ°μ€" -#: builtin/notes.c:982 +#: builtin/notes.c:984 msgid "use notes from <notes-ref>" msgstr "<λ
ΈνΈ-λ νΌλ°μ€>μμ λ
ΈνΈλ₯Ό μ¬μ©ν©λλ€" -#: builtin/notes.c:1017 builtin/remote.c:1623 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" +msgid "unknown subcommand: %s" msgstr "μ μ μλ νμ λͺ
λ Ή: %s" -#: builtin/pack-objects.c:28 +#: builtin/pack-objects.c:29 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<μ΅μ
>...] [< <λ νΌλ°μ€λͺ©λ‘> | < <μ€λΈμ νΈλͺ©λ‘>]" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<μ΅μ
>...] <λ² μ΄μ€μ΄λ¦> [< <λ νΌλ°μ€λͺ©λ‘> | < <μ€λΈμ νΈλͺ©λ‘" ">]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 #, c-format msgid "deflate error (%d)" msgstr "deflate μ€λ₯ (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:768 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "λ°°νΈλ§΅ μ°κΈ°λ₯Ό νμ§ μμ΅λλ€. λ¬Άμμ pack.packSizeLimit κ°μ λ°λΌ μͺΌκ°μ§λλ€" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "μ€λΈμ νΈ μ°λ μ€" -#: builtin/pack-objects.c:1037 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "λ¬Άμμ λ€μ΄μμ§ μμ μ€λΈμ νΈκ° μμΌλ―λ‘, λΉνΈλ§΅ μ°κΈ°λ₯Ό νμ§ μμ΅λλ€" -#: builtin/pack-objects.c:2197 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "μ€λΈμ νΈ μμΆνλ μ€" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "μ§μνμ§ μλ μΈλ±μ€ λ²μ %s" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "μλͺ»λ μΈλ±μ€ λ²μ '%s'" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "μ§νλ₯ μ νμνμ§ μμ΅λλ€" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "μ§νλ₯ μ νμν©λλ€" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2797 msgid "show progress meter during object writing phase" msgstr "μ€λΈμ νΈ μ°κΈ° λ¨κ³μμ μ§νλ₯ μ νμν©λλ€" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2800 msgid "similar to --all-progress when progress meter is shown" msgstr "μ§νλ₯ μ΄ νμλ λ --all-progressμ λΉμ·ν©λλ€" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2801 msgid "version[,offset]" msgstr "λ²μ [,μ€νμ
]" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2802 msgid "write the pack index file in the specified idx format version" msgstr "μ§μ ν λ²μ μ μΈλ±μ€ νμμ λ°λΌ λ¬Άμ μΈλ±μ€ νμΌμ μλλ€" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2805 msgid "maximum size of each output pack file" msgstr "μΆλ ₯ λ¬Άμ νμΌμ μ΅λ ν¬κΈ°" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2807 msgid "ignore borrowed objects from alternate object store" msgstr "보쑰 μ€λΈμ νΈ μ μ₯μμμ λΉλ €μ¨ μ€λΈμ νΈλ₯Ό 무μν©λλ€" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2809 msgid "ignore packed objects" msgstr "λ¬Άμ μ€λΈμ νΈλ₯Ό 무μν©λλ€" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2811 msgid "limit pack window by objects" msgstr "λ¬Άμ μλμ°λ₯Ό μ€λΈμ νΈ λ¨μλ‘ μ νν©λλ€" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2813 msgid "limit pack window by memory in addition to object limit" msgstr "λ¬Άμ μλμ°λ₯Ό μ€λΈμ νΈ λ¨μμ μΆκ°λ‘ λ©λͺ¨λ¦¬ λ¨μλ‘ μ νν©λλ€" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2815 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "κ²°κ³Όλ¬Ό λ¬Άμμμ νμ©λλ μ΅λ κΈΈμ΄μ λΈν 체μΈ" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "κΈ°μ‘΄ λΈνλ₯Ό μ¬μ¬μ©ν©λλ€" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "κΈ°μ‘΄ μ€λΈμ νΈλ₯Ό μ¬μ¬μ©ν©λλ€" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA μ€λΈμ νΈλ₯Ό μ¬μ©ν©λλ€" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "μ΅μμ λΈν μΌμΉλ₯Ό κ²μνλλ° μ€λ λλ₯Ό μ¬μ©ν©λλ€" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "λΉ λ¬Άμ μΆλ ₯μ λ§λ€μ§ μμ΅λλ€" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr "νμ€ μ
λ ₯μμ 리λΉμ μΈμλ₯Ό μ½μ΅λλ€" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2829 msgid "limit the objects to those that are not yet packed" msgstr "λ¬Άμ§ μλ μ€λΈμ νΈ μλ₯Ό μ νν©λλ€" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "λͺ¨λ λ νΌλ°μ€μμ μ κ·Ό κ°λ₯ν μ€λΈμ νΈλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "reflog νλͺ©μμ λ νΌλ°μ€ν μ μλ μ€λΈμ νΈλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "μΈλ±μ€μμ< λ νΌλ°μ€νλ μ€λΈμ νΈλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/pack-objects.c:2693 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "λ¬Άμμ νμ€ μΆλ ₯μΌλ‘ μΆλ ₯ν©λλ€" -#: builtin/pack-objects.c:2695 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "λ¬Άμμ λ€μ΄κ° μ€λΈμ νΈλ₯Ό λ νΌλ°μ€νλ νκ·Έ μ€λΈμ νΈλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/pack-objects.c:2697 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "μ κ·Ό λΆκ°λ₯ μ€λΈμ νΈλ₯Ό 보쑴ν©λλ€" -#: builtin/pack-objects.c:2699 +#: builtin/pack-objects.c:2847 msgid "pack loose unreachable objects" msgstr "λμ¨ν μ κ·Ό λΆκ°λ₯ μ€λΈμ νΈλ₯Ό λ¬Άμ΅λλ€" -#: builtin/pack-objects.c:2700 parse-options.h:142 -msgid "time" -msgstr "μκ°" - -#: builtin/pack-objects.c:2701 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than <time>" msgstr "<μκ°>λ³΄λ€ μλ‘μ΄ μ κ·Ό λΆκ°λ₯ μ€λΈμ νΈμ λ¬Άμμ νλλ€" -#: builtin/pack-objects.c:2704 +#: builtin/pack-objects.c:2852 msgid "create thin packs" msgstr "μμ λ¬Άμμ λ§λλλ€" -#: builtin/pack-objects.c:2706 +#: builtin/pack-objects.c:2854 msgid "create packs suitable for shallow fetches" msgstr "μμ κ°μ Έμ€κΈ°μ μ ν©ν λ¬Άμμ λ§λλλ€" -#: builtin/pack-objects.c:2708 +#: builtin/pack-objects.c:2856 msgid "ignore packs that have companion .keep file" msgstr "ν΄λΉνλ .keep νμΌμ΄ μλ λ¬Άμμ 무μν©λλ€" -#: builtin/pack-objects.c:2710 +#: builtin/pack-objects.c:2858 msgid "pack compression level" msgstr "λ¬Άμ μμΆ λ¨κ³" # FIXME: graft? -#: builtin/pack-objects.c:2712 +#: builtin/pack-objects.c:2860 msgid "do not hide commits by grafts" msgstr "λΆμ΄ μλ 컀λ°μ μ¨κΈ°μ§ μμ΅λλ€" -#: builtin/pack-objects.c:2714 +#: builtin/pack-objects.c:2862 msgid "use a bitmap index if available to speed up counting objects" msgstr "κ°λ₯νλ©΄ λΉνΈλ§΅ μΈλ±μ€λ₯Ό μ¬μ©ν΄ μ€λΈμ νΈ μΈκΈ° μλλ₯Ό λμ
λλ€" -#: builtin/pack-objects.c:2716 +#: builtin/pack-objects.c:2864 msgid "write a bitmap index together with the pack index" msgstr "λ¬Άμ μΈλ±μ€μ κ°μ΄ λΉνΈλ§΅ μΈλ±μ€λ₯Ό μλλ€" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2993 msgid "Counting objects" msgstr "μ€λΈμ νΈ κ°μ μΈλ μ€" @@ -9619,65 +10270,56 @@ msgstr "<μκ°>λ³΄λ€ μ€λ λ μ€λΈμ νΈκ° λ§λ£λ©λλ€" msgid "cannot prune in a precious-objects repo" msgstr "precious-objects μ μ₯μμμ μλΌλΌ μ μμ΅λλ€" -#: builtin/pull.c:72 +#: builtin/pull.c:51 builtin/pull.c:53 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "%sμ κ°μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€: %s" + +#: builtin/pull.c:73 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<μ΅μ
>] [<μ μ₯μ> [<λ νΌλ°μ€λͺ
μΈ>...]]" -#: builtin/pull.c:120 +#: builtin/pull.c:121 msgid "Options related to merging" msgstr "λ³ν© κ΄λ ¨ μ΅μ
" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "incorporate changes by rebasing rather than merging" msgstr "λ³κ²½ μ¬νμ μ μ©ν λ λ³ν©νλ λμ λ¦¬λ² μ΄μ€ν©λλ€" -#: builtin/pull.c:147 builtin/revert.c:101 +#: builtin/pull.c:148 builtin/revert.c:101 msgid "allow fast-forward" msgstr "μ λ°©ν₯ μ§νμ νμ©ν©λλ€" -#: builtin/pull.c:156 +#: builtin/pull.c:157 msgid "automatically stash/stash pop before and after rebase" msgstr "λ¦¬λ² μ΄μ€ μ κ³Ό νμ stash λ° stash popμ μλμΌλ‘ ν©λλ€" -#: builtin/pull.c:172 +#: builtin/pull.c:173 msgid "Options related to fetching" msgstr "κ°μ Έμ€κΈ° κ΄λ ¨ μ΅μ
" -#: builtin/pull.c:194 +#: builtin/pull.c:195 msgid "number of submodules pulled in parallel" msgstr "λ³λ ¬μ μΌλ‘ νμ μ€νν νμλͺ¨λ κ°μ" -#: builtin/pull.c:283 +#: builtin/pull.c:284 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ffμ λν΄ μλͺ»λ κ°: %s" -#: builtin/pull.c:379 git-sh-setup.sh:226 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "" -"λ¦¬λ² μ΄μ€λ‘ νμ ν μ μμ΅λλ€: μ€ν
μ΄μ§νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." - -#: builtin/pull.c:385 git-sh-setup.sh:252 -msgid "Additionally, your index contains uncommitted changes." -msgstr "μΆκ°λ‘, μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." - -#: builtin/pull.c:387 git-sh-setup.sh:245 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "" -"λ¦¬λ² μ΄μ€λ‘ νμ ν μ μμ΅λλ€: μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." - -#: builtin/pull.c:463 +#: builtin/pull.c:397 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "κ°μ Έμ¨ λ νΌλ°μ€ μ€μ λ¦¬λ² μ΄μ€ν λμ νλ³΄κ° μμ΅λλ€." -#: builtin/pull.c:465 +#: builtin/pull.c:399 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "κ°μ Έμ¨ λ νΌλ°μ€ μ€μ λ³ν©ν λμ νλ³΄κ° μμ΅λλ€." -#: builtin/pull.c:466 +#: builtin/pull.c:400 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9685,7 +10327,7 @@ msgstr "" "λ³΄ν΅ μ΄λ° κ²½μ°λ 리λͺ¨νΈ μͺ½μλ μλ μμΌλμΉ΄λ λ νΌλ°μ€λͺ
μΈκ°\n" "μ£Όμ΄μ‘μ λ μΌμ΄λ©λλ€." -#: builtin/pull.c:469 +#: builtin/pull.c:403 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9696,42 +10338,42 @@ msgstr "" "μ΄ λ¦¬λͺ¨νΈλ νμ¬ λΈλμΉμ λν΄ κΈ°λ³ΈμΌλ‘ μ€μ λ 리λͺ¨νΈκ°\n" "μλκΈ° λλ¬Έμ, λͺ
λ Ήνμμ λΈλμΉλ₯Ό μ§μ ν΄μΌ ν©λλ€." -#: builtin/pull.c:474 git-parse-remote.sh:73 +#: builtin/pull.c:408 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "νμ¬ μ΄λ€ λΈλμΉ μμλ μμ§ μμ΅λλ€." -#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 +#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "μ΄λ€ λΈλμΉλ₯Ό λμμΌλ‘ λ¦¬λ² μ΄μ€ν μ§ μ§μ νμμμ€." -#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "μ΄λ€ λΈλμΉλ₯Ό λμμΌλ‘ λ³ν©ν μ§ μ§μ νμμμ€." -#: builtin/pull.c:479 builtin/pull.c:494 +#: builtin/pull.c:413 builtin/pull.c:428 msgid "See git-pull(1) for details." msgstr "μμΈν μ 보λ git-pull(1) νμ΄μ§λ₯Ό μ°Έκ³ νμμμ€." -#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<리λͺ¨νΈ>" -#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<λΈλμΉ>" -#: builtin/pull.c:489 git-parse-remote.sh:75 +#: builtin/pull.c:423 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "νμ¬ λΈλμΉμ μΆμ μ λ³΄κ° μμ΅λλ€." -#: builtin/pull.c:498 git-parse-remote.sh:95 +#: builtin/pull.c:432 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "μ΄ λΈλμΉμ λν μΆμ μ 보λ₯Ό μ€μ νλ €λ©΄ λ€μκ³Ό κ°μ΄ ν μ μμ΅λλ€:" -#: builtin/pull.c:503 +#: builtin/pull.c:437 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9740,19 +10382,27 @@ msgstr "" "μ€μ μμ 리λͺ¨νΈμ '%s' λ νΌλ°μ€μ λ³ν©νλλ‘ μ§μ νμ§λ§,\n" "κ·Έλ° λ νΌλ°μ€λ₯Ό κ°μ Έμ€μ§ μμμ΅λλ€." -#: builtin/pull.c:820 +#: builtin/pull.c:754 msgid "ignoring --verify-signatures for rebase" msgstr "λ¦¬λ² μ΄μ€μ λν΄ --verify-signatures μ΅μ
μ 무μν©λλ€" -#: builtin/pull.c:867 +#: builtin/pull.c:801 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash μ΅μ
μ --rebase μ΅μ
κ³Ό κ°μ΄ μ¨μΌ ν©λλ€." -#: builtin/pull.c:875 +#: builtin/pull.c:809 msgid "Updating an unborn branch with changes added to the index." msgstr "λ§λ€μ΄μ§μ§ μμ λΈλμΉλ₯Ό μΈλ±μ€μ μΆκ°λ λ³κ²½ μ¬νμΌλ‘ μ
λ°μ΄νΈν©λλ€." -#: builtin/pull.c:903 +#: builtin/pull.c:812 +msgid "pull with rebase" +msgstr "λ¦¬λ² μ΄μ€λ‘ ννκΈ°" + +#: builtin/pull.c:813 +msgid "please commit or stash them." +msgstr "컀λ°νκ±°λ μ€νμμ λ£μΌμμμ€." + +#: builtin/pull.c:838 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9763,7 +10413,7 @@ msgstr "" "μμ
ν΄λλ₯Ό %s 컀λ°μμ μ λ°©ν₯\n" "μ§νν©λλ€." -#: builtin/pull.c:908 +#: builtin/pull.c:843 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9780,11 +10430,11 @@ msgstr "" "$ git reset --hard\n" "볡ꡬλ©λλ€." -#: builtin/pull.c:923 +#: builtin/pull.c:858 msgid "Cannot merge multiple branches into empty head." msgstr "μ¬λ¬ λΈλμΉλ₯Ό λΉ ν€λλ‘ λ³ν©ν μ μμ΅λλ€." -#: builtin/pull.c:927 +#: builtin/pull.c:862 msgid "Cannot rebase onto multiple branches." msgstr "μ¬λ¬ λΈλμΉλ‘ λ¦¬λ² μ΄μ€ν μ μμ΅λλ€." @@ -10160,15 +10810,62 @@ msgstr "λλ¬Έ 체ν¬μμ νν° μ μ©μ 건λλλλ€" msgid "debug unpack-trees" msgstr "unpack-trees λλ²κΉ
" -#: builtin/receive-pack.c:25 +#: builtin/receive-pack.c:26 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:1845 +#: builtin/receive-pack.c:793 +msgid "" +"By default, updating the current branch in a non-bare repository\n" +"is denied, because it will make the index and work tree inconsistent\n" +"with what you pushed, and will require 'git reset --hard' to match\n" +"the work tree to HEAD.\n" +"\n" +"You can set 'receive.denyCurrentBranch' configuration variable to\n" +"'ignore' or 'warn' in the remote repository to allow pushing into\n" +"its current branch; however, this is not recommended unless you\n" +"arranged to update its work tree to match what you pushed in some\n" +"other way.\n" +"\n" +"To squelch this message and still keep the default behaviour, set\n" +"'receive.denyCurrentBranch' configuration variable to 'refuse'." +msgstr "" +"κΈ°λ³Έκ°μΌλ‘ κ°λ΅ν μ μ₯μκ° μλ νμ¬ λΈλμΉμ μ
λ°μ΄νΈλ κ±°λΆλ©λλ€.\n" +"μ
λ°μ΄νΈνλ©΄ μΈλ±μ€μ μμ
νΈλ¦¬κ° νΈμν λ΄μ©κ³Ό μΌμΉνμ§ μκ² λλ―λ‘,\n" +"'git reset --hard'λ‘ μμ
νΈλ¦¬λ₯Ό HEADμ λ§μΆ°μΌ ν©λλ€.\n" +"\n" +"리λͺ¨νΈ μ μ₯μμμ 'receive.denyCurrentBranch' μ€μ λ³μλ₯Ό 'ignore'λ\n" +"'warn'μΌλ‘ μ€μ νλ©΄ νμ¬ λΈλμΉλ‘ νΈμν μ μμ΅λλ€. νμ§λ§ μμ
\n" +"νΈλ¦¬μ λ΄μ©μ νΈμν λ΄μ©μ λ§μΆλ κ² μλλΌλ©΄ μΆμ²νμ§ μμ΅λλ€.\n" +"\n" +"μ΄ λ©μμ§λ₯Ό λ³΄μ§ μκ³ κΈ°λ³Έ λμμ κ³μ νλ €λ©΄,\n" +"'receive.denyCurrentBranch' μ€μ λ³μλ₯Ό 'refuse'λ‘ μ€μ νμμμ€." + +#: builtin/receive-pack.c:813 +msgid "" +"By default, deleting the current branch is denied, because the next\n" +"'git clone' won't result in any file checked out, causing confusion.\n" +"\n" +"You can set 'receive.denyDeleteCurrent' configuration variable to\n" +"'warn' or 'ignore' in the remote repository to allow deleting the\n" +"current branch, with or without a warning message.\n" +"\n" +"To squelch this message, you can set it to 'refuse'." +msgstr "" +"κΈ°λ³Έκ°μΌλ‘, νμ¬ λΈλμΉμ μμ λ κ±°λΆλ©λλ€. λ€μμ 'git clone'ν λ\n" +"μ무 νμΌλ 체ν¬μμνμ§ μκ² λλ―λ‘ νΌλμ μΌμΌν€κΈ° λλ¬Έμ
λλ€.\n" +"\n" +"'receive.denyDeleteCurrent' μ€μ λ³μλ₯Ό 'ignore'λ 'warn'μΌλ‘ μ€μ νλ©΄\n" +"(κ²½κ³ λ©μμ§λ₯Ό ν¬ν¨νκ±°λ ν¬ν¨νμ§ μκ³ ) νμ¬ λΈλμΉλ₯Ό μμ ν μ\n" +"μμ΅λλ€.\n" +"\n" +"μ΄ λ©μμ§λ₯Ό λ³΄μ§ μμΌλ €λ©΄, μ΄ μ€μ λ³μλ₯Ό 'refuse'λ‘ μ€μ νμμμ€." + +#: builtin/receive-pack.c:1883 msgid "quiet" msgstr "μΆλ ₯ μκΈ°" -#: builtin/receive-pack.c:1859 +#: builtin/receive-pack.c:1897 msgid "You must specify a directory." msgstr "λλ ν°λ¦¬λ₯Ό μ§μ ν΄μΌ ν©λλ€." @@ -10495,7 +11192,7 @@ msgstr "* 리λͺ¨νΈ %s" msgid " Fetch URL: %s" msgstr " κ°μ Έμ€κΈ° URL: %s" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 msgid "(no URL)" msgstr "(URL μμ)" @@ -10531,7 +11228,7 @@ msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 리λͺ¨νΈ λΈλμΉ:%s" -#: builtin/remote.c:1179 builtin/remote.c:1206 +#: builtin/remote.c:1179 builtin/remote.c:1205 msgid " (status not queried)" msgstr " (μνλ₯Ό μ§μνμ§ μμ)" @@ -10544,138 +11241,143 @@ msgstr[0] " 'git pull'μ μ¬μ©ν λ‘컬 λΈλμΉλ₯Ό μ€μ :" msgid " Local refs will be mirrored by 'git push'" msgstr " λ‘컬 λ νΌλ°μ€λ₯Ό 'git push'λ‘ λ―Έλ¬λ§ν μμ " -#: builtin/remote.c:1203 +#: builtin/remote.c:1202 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " λ‘컬 λ νΌλ°μ€λ₯Ό 'git push'λ‘ λ―Έλ¬λ§%s:" -#: builtin/remote.c:1224 +#: builtin/remote.c:1223 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "λ νΌλ°μ€/리λͺ¨νΈ/<μ΄λ¦>/HEAD κ°μ 리λͺ¨νΈμ λ§κ² μ€μ ν©λλ€" -#: builtin/remote.c:1226 +#: builtin/remote.c:1225 msgid "delete refs/remotes/<name>/HEAD" msgstr "λ νΌλ°μ€/리λͺ¨νΈ/<μ΄λ¦>/HEAD κ°μ μμ ν©λλ€" -#: builtin/remote.c:1241 +#: builtin/remote.c:1240 msgid "Cannot determine remote HEAD" msgstr "리λͺ¨νΈ HEADλ₯Ό κ²°μ ν μ μμ΅λλ€" -#: builtin/remote.c:1243 +#: builtin/remote.c:1242 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "리λͺ¨νΈ HEAD λΈλμΉκ° μ¬λ¬κ°μ
λλ€. λ€μ μ€ νλλ₯Ό λͺ
μμ μΌλ‘ μ§μ νμμμ€:" -#: builtin/remote.c:1253 +#: builtin/remote.c:1252 #, c-format msgid "Could not delete %s" msgstr "%sμ(λ₯Ό) μμ ν μ μμ΅λλ€" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 #, c-format msgid "Not a valid ref: %s" msgstr "μ¬λ°λ₯Έ λ νΌλ°μ€κ° μλλλ€: %s" -#: builtin/remote.c:1263 +#: builtin/remote.c:1262 #, c-format msgid "Could not setup %s" msgstr "%sμ(λ₯Ό) μ€μ ν μ μμ΅λλ€" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid " %s will become dangling!" msgstr " %sμ μ°κ²°μ΄ λμ΄μ§λλ€!" -#: builtin/remote.c:1282 +#: builtin/remote.c:1281 #, c-format msgid " %s has become dangling!" msgstr " %sμ μ°κ²°μ΄ λμ΄μ‘μ΅λλ€!" -#: builtin/remote.c:1292 +#: builtin/remote.c:1291 #, c-format msgid "Pruning %s" msgstr "μλΌλ: %s" -#: builtin/remote.c:1293 +#: builtin/remote.c:1292 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1309 +#: builtin/remote.c:1308 #, c-format msgid " * [would prune] %s" msgstr " * [μλΌλΌ μμ ] %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1311 #, c-format msgid " * [pruned] %s" msgstr " * [μλΌλ] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1356 msgid "prune remotes after fetching" msgstr "κ°μ Έμ¨ νμ 리λͺ¨νΈλ₯Ό μλΌλ
λλ€" -#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542 +#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 #, c-format msgid "No such remote '%s'" msgstr "κ·Έλ° λ¦¬λͺ¨νΈκ° μμ΅λλ€ ('%s')" -#: builtin/remote.c:1436 +#: builtin/remote.c:1435 msgid "add branch" msgstr "λΈλμΉλ₯Ό μΆκ°ν©λλ€" -#: builtin/remote.c:1443 +#: builtin/remote.c:1442 msgid "no remote specified" msgstr "리λͺ¨νΈλ₯Ό μ§μ νμ§ μμμ΅λλ€" -#: builtin/remote.c:1460 +#: builtin/remote.c:1459 msgid "query push URLs rather than fetch URLs" msgstr "κ°μ Έμ€κΈ° URLμ΄ μλλΌ νΈμ URLμ μ§μν©λλ€" -#: builtin/remote.c:1462 +#: builtin/remote.c:1461 msgid "return all URLs" msgstr "λͺ¨λ URLμ 리ν΄ν©λλ€" -#: builtin/remote.c:1490 +#: builtin/remote.c:1489 #, c-format msgid "no URLs configured for remote '%s'" msgstr "'%s' 리λͺ¨νΈμ λν URLμ μ€μ νμ§ μμμ΅λλ€" -#: builtin/remote.c:1516 +#: builtin/remote.c:1515 msgid "manipulate push URLs" msgstr "νΈμ URLμ μ§μ ν©λλ€" -#: builtin/remote.c:1518 +#: builtin/remote.c:1517 msgid "add URL" msgstr "URLμ μΆκ°ν©λλ€" -#: builtin/remote.c:1520 +#: builtin/remote.c:1519 msgid "delete URLs" msgstr "URLμ μμ ν©λλ€" -#: builtin/remote.c:1527 +#: builtin/remote.c:1526 msgid "--add --delete doesn't make sense" msgstr "--add --delete μ΅μ
μ λλ€ μ°λ©΄ μ λ©λλ€" -#: builtin/remote.c:1568 +#: builtin/remote.c:1567 #, c-format msgid "Invalid old URL pattern: %s" msgstr "μλͺ»λ μ€λμ URL ν¨ν΄: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1575 #, c-format msgid "No such URL found: %s" msgstr "κ·Έλ° URLμ΄ μμ΅λλ€: %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1577 msgid "Will not delete all non-push URLs" msgstr "νΈμμ©μ΄ μλ λͺ¨λ URLμ μμ νμ§ μμ΅λλ€" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 msgid "be verbose; must be placed before a subcommand" msgstr "μμΈν νμν©λλ€ (νμ λͺ
λ Ή μμ μμΌ ν©λλ€)" +#: builtin/remote.c:1622 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "μ μ μλ νμ λͺ
λ Ή: %s" + #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "git repack [<μ΅μ
>]" @@ -10862,8 +11564,8 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<컀λ°>]" #: builtin/reset.c:27 -msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <νΈλ¦¬-λ°μ> [--] <κ²½λ‘>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<νΈλ¦¬-λ°μ>] [--] <κ²½λ‘>..." #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" @@ -10983,27 +11685,27 @@ msgstr "μΈλ±μ€ νμΌμ '%s' 리λΉμ μΌλ‘ 리μ
ν μ μμ΅λλ€." msgid "Could not write new index file." msgstr "μ μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€." -#: builtin/rev-list.c:362 +#: builtin/rev-list.c:354 msgid "rev-list does not support display of notes" msgstr "rev-listλ λ
ΈνΈ νμλ₯Ό μ§μνμ§ μμ΅λλ€" -#: builtin/rev-parse.c:358 +#: builtin/rev-parse.c:386 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<μ΅μ
>] -- [<μΈμ>...]" -#: builtin/rev-parse.c:363 +#: builtin/rev-parse.c:391 msgid "keep the `--` passed as an arg" msgstr "μΈμλ‘ λκΈ΄ `--`λ₯Ό μ μ§ν©λλ€" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:393 msgid "stop parsing after the first non-option argument" msgstr "첫λ²μ§Έ μ΅μ
μ΄ μλ μΈμ λ€μ νμ±μ μ€μ§ν©λλ€" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:396 msgid "output in stuck long form" msgstr "stuck long νμμΌλ‘ μΆλ ₯ν©λλ€" -#: builtin/rev-parse.c:499 +#: builtin/rev-parse.c:527 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11096,7 +11798,7 @@ msgstr "μ¬λΆμ λΉ μ»€λ°μ μ μ§ν©λλ€" msgid "revert failed" msgstr "λλ리기 μ€ν¨" -#: builtin/revert.c:207 +#: builtin/revert.c:205 msgid "cherry-pick failed" msgstr "cherry-pick μ€ν¨" @@ -11258,70 +11960,121 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<λ² μ΄μ€>]] [--list] [<λ νΌλ°μ€>]" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:375 +#, c-format +msgid "ignoring %s; cannot handle more than %d ref" +msgid_plural "ignoring %s; cannot handle more than %d refs" +msgstr[0] "%s 무μ. λ νΌλ°μ€λ₯Ό %dκ°λ³΄λ€ λ§μ΄ μ²λ¦¬ν μ μμ΅λλ€" + +#: builtin/show-branch.c:541 +#, c-format +msgid "no matching refs with %s" +msgstr "%sμ(κ³Ό) μΌμΉνλ λ νΌλ°μ€κ° μμ΅λλ€" + +#: builtin/show-branch.c:639 msgid "show remote-tracking and local branches" msgstr "리λͺ¨νΈ μΆμ λ° λ‘컬 λΈλμΉλ₯Ό νμν©λλ€" -#: builtin/show-branch.c:642 +#: builtin/show-branch.c:641 msgid "show remote-tracking branches" msgstr "리λͺ¨νΈ μΆμ λΈλμΉλ₯Ό νμν©λλ€" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:643 msgid "color '*!+-' corresponding to the branch" msgstr "λΈλμΉμ λ°λ₯Έ '*!+-' νμμ μμ μ
νλλ€" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show <n> more commits after the common ancestor" msgstr "κ³΅ν΅ μ΄μ μ»€λ° λ€μ <n>κ°μ 컀λ°μ νμν©λλ€" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "synonym to more=-1" msgstr "--more=-1 μ΅μ
κ³Ό λμΌ" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "suppress naming strings" msgstr "μ΄λ¦ λ¬Έμμ΄μ νμνμ§ μμ΅λλ€" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "include the current branch" msgstr "νμ¬ λΈλμΉλ₯Ό ν¬ν¨" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "name commits with their object names" msgstr "컀λ°μ μ΄λ¦μ κ·Έ μ€λΈμ νΈ μ΄λ¦μΌλ‘ λΆμ
λλ€" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "show possible merge bases" msgstr "κ°λ₯ν λ³ν© κΈ°μ€μ μ νμν©λλ€" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show refs unreachable from any other ref" msgstr "λ€λ₯Έ μ΄λ€ λ νΌλ°μ€μμλ μ κ·Ό λΆκ°λ₯ν λ νΌλ°μ€λ₯Ό νμν©λλ€" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "show commits in topological order" msgstr "μμ μμμ λ°λΌ 컀λ°μ νμν©λλ€" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show only commits not on the first branch" msgstr "첫 λΈλμΉμ μλ 컀λ°λ§ νμν©λλ€" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show merges reachable from only one tip" msgstr "νλμ λμμλ§ μ κ·Ό κ°λ₯ν λ³ν©μ νμν©λλ€" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "topologically sort, maintaining date order where possible" msgstr "κ°λ₯νλ©΄ μκ° μμλ₯Ό μ μ§νλ©΄μ μμ μμλ‘ μ λ ¬" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "<n>[,<base>]" msgstr "<n>[,<λ² μ΄μ€>]" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show <n> most recent ref-log entries starting at base" msgstr "κΈ°μ€λΆν° μμν΄ μ΅λ <n>κ°μ μ΅κ·Ό ref-log νλͺ©μ νμν©λλ€" +#: builtin/show-branch.c:703 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "--reflog μ΅μ
μ --all, --remotes, --independent, --merge-base μ΅μ
κ³Ό νΈνλμ§ μμ΅λλ€" + +#: builtin/show-branch.c:727 +msgid "no branches given, and HEAD is not valid" +msgstr "λΈλμΉλ₯Ό μ§μ νμ§ μμκ³ , HEADκ° μ¬λ°λ₯΄μ§ μμ΅λλ€" + +#: builtin/show-branch.c:730 +msgid "--reflog option needs one branch name" +msgstr "--reflog μ΅μ
μ λΈλμΉ μ΄λ¦μ΄ νμν©λλ€" + +#: builtin/show-branch.c:733 +#, c-format +msgid "only %d entry can be shown at one time." +msgid_plural "only %d entries can be shown at one time." +msgstr[0] "ν λ²μ %dκ° νλͺ©λ§ νμν μ μμ΅λλ€." + +#: builtin/show-branch.c:737 +#, c-format +msgid "no such ref %s" +msgstr "κ·Έλ° λ νΌλ°μ€κ° μμ΅λλ€: %s" + +#: builtin/show-branch.c:829 +#, c-format +msgid "cannot handle more than %d rev." +msgid_plural "cannot handle more than %d revs." +msgstr[0] "λ νΌλ°μ€λ₯Ό %dκ°λ³΄λ€ λ§μ΄ μ²λ¦¬ν μ μμ΅λλ€." + +#: builtin/show-branch.c:833 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "'%s'μ(λ) μ¬λ°λ₯Έ λ νΌλ°μ€κ° μλλλ€." + +#: builtin/show-branch.c:836 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "%s 컀λ°μ μ°Ύμ μ μμ (%s)" + #: builtin/show-ref.c:10 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -11382,12 +12135,12 @@ msgstr "μ£Όμ λ¬Έμλ‘ μμνλ λͺ¨λ μ€μ 건λλ°κ³ μ κ±°ν©λλ€ msgid "prepend comment character and space to each line" msgstr "κ° μ€μ μμ μ£Όμ λ¬Έμμ 곡백μ λΆμ
λλ€" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 #, c-format msgid "No such ref: %s" msgstr "κ·Έλ° λ νΌλ°μ€κ° μμ΅λλ€: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 #, c-format msgid "Expecting a full ref name, got %s" msgstr "μ 체 λ νΌλ°μ€ μ΄λ¦μ΄ νμνμ§λ§, μ
λ ₯μ %s" @@ -11397,74 +12150,93 @@ msgstr "μ 체 λ νΌλ°μ€ μ΄λ¦μ΄ νμνμ§λ§, μ
λ ₯μ %s" msgid "cannot strip one component off url '%s'" msgstr "'%s' URL νλμ λ¨κ³λ₯Ό μλΌλΌ μ μμ΅λλ€" -#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403 -#: builtin/submodule--helper.c:483 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 +#: builtin/submodule--helper.c:590 msgid "alternative anchor for relative paths" msgstr "μλ κ²½λ‘μ μ¬μ©ν λλ€λ₯Έ κΈ°μ€" -#: builtin/submodule--helper.c:283 +#: builtin/submodule--helper.c:287 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<κ²½λ‘>] [<κ²½λ‘>...]" -#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338 +#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr ".gitmodulesμμ νμ λͺ¨λ κ²½λ‘ '%s'μ λν URLμ΄ μμ΅λλ€" -#: builtin/submodule--helper.c:364 +#: builtin/submodule--helper.c:369 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "νμ λͺ¨λ κ²½λ‘ '%s'μ λν URLμ λ±λ‘νλλ° μ€ν¨νμ΅λλ€" -#: builtin/submodule--helper.c:368 +#: builtin/submodule--helper.c:373 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "'%3$s' κ²½λ‘μ λν΄ '%1$s' (%2$s) νμ λͺ¨λ λ±λ‘\n" -#: builtin/submodule--helper.c:378 +#: builtin/submodule--helper.c:383 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "κ²½κ³ : '%s' νμ λͺ¨λμ λν΄ μ»€λ§¨λ μ
λ°μ΄νΈ λͺ¨λκ° μ μλμμ΅λλ€\n" -#: builtin/submodule--helper.c:385 +#: builtin/submodule--helper.c:390 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "'%s' νμ λͺ¨λμ λν΄ μ
λ°μ΄νΈ λͺ¨λ λ±λ‘μ΄ μ€ν¨νμ΅λλ€" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:409 msgid "Suppress output for initializing a submodule" msgstr "νμ λͺ¨λ μ΄κΈ°νμ μΆλ ₯μ νμ§ μμ΅λλ€" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<κ²½λ‘>]" -#: builtin/submodule--helper.c:430 +#: builtin/submodule--helper.c:435 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <κ²½λ‘>" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:441 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "κ²½λ‘ '%s'μ λν΄ .gitmodulesμ μλ νμλͺ¨λ 맀νμ΄ μμ΅λλ€" -#: builtin/submodule--helper.c:486 +#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "'%s' νμ λͺ¨λμ 보쑰 μ€λΈμ νΈλ₯Ό μΆκ°ν μ μμ΅λλ€: %s" + +#: builtin/submodule--helper.c:563 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "submodule.alternateErrorStrategyμ λν κ°μ΄('%s') μ μ μλ κ°μ
λλ€" + +#: builtin/submodule--helper.c:570 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "submodule.alternateLocationμ λν κ°μ΄('%s') μ μ μλ κ°μ
λλ€" + +#: builtin/submodule--helper.c:593 msgid "where the new submodule will be cloned to" msgstr "μ νμ λͺ¨λμ 볡μ ν λμ μμΉ" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:596 msgid "name of the new submodule" msgstr "μ νμ λͺ¨λ μ΄λ¦" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:599 msgid "url where to clone the submodule from" msgstr "νμ λͺ¨λμ 볡μ ν΄ μ¬ URL" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:605 msgid "depth for shallow clones" msgstr "μμ 볡μ μ μ¬μ©ν κΉμ΄" -#: builtin/submodule--helper.c:504 +#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +msgid "force cloning progress" +msgstr "볡μ μ§ν μν©μ νμ νμν©λλ€" + +#: builtin/submodule--helper.c:613 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -11472,108 +12244,110 @@ msgstr "" "git submodule--helper clone [--prefix=<κ²½λ‘>] [--quiet] [--reference <μ μ₯μ" ">] [--name <μ΄λ¦>] [--depth <κΉμ΄>] --url <url> --path <κ²½λ‘>" -#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535 +#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 #, c-format msgid "could not create directory '%s'" msgstr "'%s' λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/submodule--helper.c:531 +#: builtin/submodule--helper.c:644 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "'%s'μμ νμ λͺ¨λ κ²½λ‘ '%s'μ 볡μ νλλ° μ€ν¨νμ΅λλ€" -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:660 #, c-format msgid "cannot open file '%s'" msgstr "'%s' νμΌμ μ΄ μ μμ΅λλ€" -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:665 #, c-format msgid "could not close file %s" msgstr "%s νμΌμ λ«μ μ μμ΅λλ€" -#: builtin/submodule--helper.c:559 +#: builtin/submodule--helper.c:672 #, c-format msgid "could not get submodule directory for '%s'" msgstr "'%s'μ λν νμ λͺ¨λ λλ ν°λ¦¬λ₯Ό κ°μ Έμ¬ μ μμ΅λλ€" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:726 #, c-format msgid "Submodule path '%s' not initialized" msgstr "'%s' νμ λͺ¨λ κ²½λ‘κ° μ΄κΈ°νλμ§ μμμ΅λλ€" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:730 msgid "Maybe you want to use 'update --init'?" msgstr "'update --init'μ νλ €κ³ ν κ² μλμμ΅λκΉ?" -#: builtin/submodule--helper.c:641 +#: builtin/submodule--helper.c:756 #, c-format msgid "Skipping unmerged submodule %s" msgstr "λ³ν©νμ§ νμ λͺ¨λ %s 건λλ" -#: builtin/submodule--helper.c:662 +#: builtin/submodule--helper.c:777 #, c-format msgid "Skipping submodule '%s'" msgstr "νμ λͺ¨λ '%s' 건λλ" -#: builtin/submodule--helper.c:792 +#: builtin/submodule--helper.c:913 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "'%s' 볡μ νλλ° μ€ν¨νμ΅λλ€. μ¬μλ μμ " -#: builtin/submodule--helper.c:803 +#: builtin/submodule--helper.c:924 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "λλ²μ§Έ '%s' 볡μ νλλ° μ€ν¨νμ΅λλ€. μ€μ§ν©λλ€" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:945 msgid "path into the working tree" msgstr "μμ
ν΄λλ‘ κ°λ κ²½λ‘" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:948 msgid "path into the working tree, across nested submodule boundaries" msgstr "μμ
ν΄λλ‘ κ°λ κ²½λ‘, λ΄μ₯λ νμ λͺ¨λμ κ²½κ³ ν΅κ³Ό" -#: builtin/submodule--helper.c:831 +#: builtin/submodule--helper.c:952 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout λλ none" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:956 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "μ§μ ν κ°μμ 리λΉμ μμ μλ¦° μμ 볡μ λ₯Ό λ§λλλ€" -#: builtin/submodule--helper.c:838 +#: builtin/submodule--helper.c:959 msgid "parallel jobs" msgstr "λ³λ ¬ μμ
κ°μ" -#: builtin/submodule--helper.c:840 +#: builtin/submodule--helper.c:961 msgid "whether the initial clone should follow the shallow recommendation" msgstr "μ΅μ΄ 볡μ κ° μμ 볡μ μΆμ²μ λ°λ₯Όμ§ μ¬λΆ" -#: builtin/submodule--helper.c:841 +#: builtin/submodule--helper.c:962 msgid "don't print cloning progress" msgstr "볡μ κ³Όμ μ νμνμ§ μμ΅λλ€" -#: builtin/submodule--helper.c:846 +#: builtin/submodule--helper.c:969 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<κ²½λ‘>] [<κ²½λ‘>...]" -#: builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:979 msgid "bad value for update parameter" msgstr "νλΌλ―Έν° μ
λ°μ΄νΈμ κ°μ΄ μλͺ»λμμ΅λλ€" -#: builtin/submodule--helper.c:927 +#: builtin/submodule--helper.c:1050 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" -msgstr "νμ λͺ¨λ (%s) λΈλμΉκ° μμ νλ‘μ νΈ λΈλμΉλ₯Ό μ΄μ΄λ°λλ‘ μ€μ λμμ§λ§, μμ νλ‘μ νΈμ λΈλμΉκ° μμ΅λλ€" +msgstr "" +"νμ λͺ¨λ (%s) λΈλμΉκ° μμ νλ‘μ νΈ λΈλμΉλ₯Ό μ΄μ΄λ°λλ‘ μ€μ λμμ§λ§, μμ " +"νλ‘μ νΈμ λΈλμΉκ° μμ΅λλ€" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:1100 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "submodule--helper νμ λͺ
λ Ήμ νμ λͺ
λ ΉμΌλ‘ νΈμΆν΄μΌ ν©λλ€" -#: builtin/submodule--helper.c:984 +#: builtin/submodule--helper.c:1107 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s'μ(λ) μ¬λ°λ₯Έ submodule--helper νμ λͺ
λ Ήμ΄ μλλλ€" @@ -11796,7 +12570,7 @@ msgstr "νλΌλ―Έν°κ° λ무 λ§μ΅λλ€" #: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." -msgstr "'%s'μ9λ) μ¬λ°λ₯Έ νκ·Έ μ΄λ¦μ΄ μλλλ€." +msgstr "'%s'μ(λ) μ¬λ°λ₯Έ νκ·Έ μ΄λ¦μ΄ μλλλ€." #: builtin/tag.c:463 #, c-format @@ -11808,7 +12582,7 @@ msgstr "νκ·Έ '%s'μ΄(κ°) μ΄λ―Έ μμ΅λλ€" msgid "Updated tag '%s' (was %s)\n" msgstr "νκ·Έ '%s' μ
λ°μ΄νΈ (κ³Όκ±° %s)\n" -#: builtin/unpack-objects.c:490 +#: builtin/unpack-objects.c:493 msgid "Unpacking objects" msgstr "μ€λΈμ νΈ λ¬Άμ νΈλ μ€" @@ -11870,132 +12644,144 @@ msgstr "λλ ν°λ¦¬λ₯Ό μμ ν νμ λλ ν°λ¦¬ μ λ³΄κ° λ°λμ§ μμ msgid " OK" msgstr " μ€μΌμ΄" -#: builtin/update-index.c:575 +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<μ΅μ
>] [--] [<νμΌ>...]" -#: builtin/update-index.c:930 +#: builtin/update-index.c:919 msgid "continue refresh even when index needs update" msgstr "μΈλ±μ€μ μ
λ°μ΄νΈκ° νμνλλΌλ μλ‘ κ³ μΉ¨μ κ³μν©λλ€" -#: builtin/update-index.c:933 +#: builtin/update-index.c:922 msgid "refresh: ignore submodules" msgstr "μλ‘ κ³ μΉ¨: νμ λͺ¨λ 무μ" -#: builtin/update-index.c:936 +#: builtin/update-index.c:925 msgid "do not ignore new files" msgstr "μ νμΌμ 무μν μ μμ΅λλ€" -#: builtin/update-index.c:938 +#: builtin/update-index.c:927 msgid "let files replace directories and vice-versa" msgstr "λλ ν°λ¦¬λ₯Ό νμΌλ‘, λλ κ·Έ λ°λλ‘ λ°κΏ μ μκ² νμ©ν©λλ€" -#: builtin/update-index.c:940 +#: builtin/update-index.c:929 msgid "notice files missing from worktree" msgstr "μμ
ν΄λμμ μλ¦Ό νμΌμ΄ μμ΅λλ€" -#: builtin/update-index.c:942 +#: builtin/update-index.c:931 msgid "refresh even if index contains unmerged entries" msgstr "μΈλ±μ€μ λ³ν©νμ§ μμ νλͺ©μ΄ μμ΄λ μλ‘ κ³ μΉ©λλ€" -#: builtin/update-index.c:945 +#: builtin/update-index.c:934 msgid "refresh stat information" msgstr "νμΌ μ 보λ₯Ό μλ‘ κ³ μΉ©λλ€" -#: builtin/update-index.c:949 +#: builtin/update-index.c:938 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "--refreshμ λμΌνμ§λ§, assume-unchanged μ€μ μ 무μν©λλ€" -#: builtin/update-index.c:953 +#: builtin/update-index.c:942 msgid "<mode>,<object>,<path>" msgstr "<λͺ¨λ>,<μ€λΈμ νΈ>,<κ²½λ‘>" -#: builtin/update-index.c:954 +#: builtin/update-index.c:943 msgid "add the specified entry to the index" msgstr "μ§μ ν νλͺ©μ μΈλ±μ€μ μΆκ°ν©λλ€" -#: builtin/update-index.c:963 +#: builtin/update-index.c:952 msgid "mark files as \"not changing\"" msgstr "νμΌμ \"λ°κΎΈμ§ μμ\"μΌλ‘ νμν©λλ€" -#: builtin/update-index.c:966 +#: builtin/update-index.c:955 msgid "clear assumed-unchanged bit" msgstr "λ°κΎΈμ§ μμμΌλ‘ κ°μ (assumed-unchanged) λΉνΈλ₯Ό μ§μλλ€" -#: builtin/update-index.c:969 +#: builtin/update-index.c:958 msgid "mark files as \"index-only\"" msgstr "νμΌμ μΈλ±μ€ μ μ©μΌλ‘ (\"index-only\") νμν©λλ€" -#: builtin/update-index.c:972 +#: builtin/update-index.c:961 msgid "clear skip-worktree bit" msgstr "μμ
ν΄λ 건λλ°κΈ° (skip-worktree) λΉνΈλ₯Ό μ§μλλ€" -#: builtin/update-index.c:975 +#: builtin/update-index.c:964 msgid "add to index only; do not add content to object database" msgstr "" "μΈλ±μ€μλ§ μΆκ°ν©λλ€. λ΄μ©μ μ€λΈμ νΈ λ°μ΄ν°λ² μ΄μ€μ μΆκ°νμ§ μμ΅λλ€" -#: builtin/update-index.c:977 +#: builtin/update-index.c:966 msgid "remove named paths even if present in worktree" msgstr "μμ
ν΄λμ μμ΄λ ν΄λΉ κ²½λ‘λ₯Ό μ κ±°ν©λλ€" -#: builtin/update-index.c:979 +#: builtin/update-index.c:968 msgid "with --stdin: input lines are terminated by null bytes" msgstr "--stdinκ³Ό κ°μ΄ μ¬μ©: μ
λ ₯ μ€μ NUL λ°μ΄νΈλ‘ λλ©λλ€" -#: builtin/update-index.c:981 +#: builtin/update-index.c:970 msgid "read list of paths to be updated from standard input" msgstr "νμ€ μ
λ ₯μμ μ
λ°μ΄νΈν κ²½λ‘μ λͺ©λ‘μ μ½μ΅λλ€" -#: builtin/update-index.c:985 +#: builtin/update-index.c:974 msgid "add entries from standard input to the index" msgstr "νμ€ μ
λ ₯μμ μ½μ νλͺ©μ μΈλ±μ€μ μΆκ°ν©λλ€" -#: builtin/update-index.c:989 +#: builtin/update-index.c:978 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "κ²½λ‘ λͺ©λ‘μ λν΄ #2 λ° #3 μ€ν
μ΄μ§μ λ€μ ν©λλ€" -#: builtin/update-index.c:993 +#: builtin/update-index.c:982 msgid "only update entries that differ from HEAD" msgstr "HEADμ λ€λ₯Έ νλͺ©λ§ μ
λ°μ΄νΈν©λλ€" -#: builtin/update-index.c:997 +#: builtin/update-index.c:986 msgid "ignore files missing from worktree" msgstr "μμ
ν΄λμ μλ νμΌμ 무μν©λλ€" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:989 msgid "report actions to standard output" msgstr "νμ€ μΆλ ₯μ λμμ μ립λλ€" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:991 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "μ μ₯ν ν΄κ²°λμ§ μμ μΆ©λμ 무μν©λλ€ (μ¬μ©μμ© λͺ
λ Ή μ©λ)" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:995 msgid "write index in this format" msgstr "μΈλ±μ€λ₯Ό μ΄ νμμΌλ‘ μλλ€" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:997 msgid "enable or disable split index" msgstr "μ€νλ¦Ώ μΈλ±μ€λ₯Ό μΌκ±°λ λλλ€" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:999 msgid "enable/disable untracked cache" msgstr "μΆμ νμ§ μλ μΊμ μ¬μ©μ μΌκ±°λ λλλ€" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1001 msgid "test if the filesystem supports untracked cache" msgstr "νμΌ μμ€ν
μ΄ μΆμ νμ§ μλ μΊμλ₯Ό μ§μνλμ§ κ²μ¬ν©λλ€" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1003 msgid "enable untracked cache without testing the filesystem" msgstr "νμΌ μμ€ν
μν μμ΄ μΆμ νμ§ μλ μΊμλ₯Ό μ¬μ©ν©λλ€" -#: builtin/update-index.c:1134 +#: builtin/update-index.c:1119 +msgid "" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" +msgstr "core.untrackedCacheκ°μ΄ μ°Έμ
λλ€. μ λ§λ‘ μΆμ νμ§ μλ νμΌ μΊμλ₯Ό μ¬μ©νμ§ μμΌλ €λ©΄ μ΄ κ°μ μ κ±°νκ±°λ λ°κΎΈμμμ€." + +#: builtin/update-index.c:1123 msgid "Untracked cache disabled" -msgstr "μΆμ λμ§ μλ μΊμλ₯Ό μ¬μ©νμ§ μμ΅λλ€" +msgstr "μΆμ λμ§ μλ νμΌ μΊμλ₯Ό μ¬μ©νμ§ μμ΅λλ€" + +#: builtin/update-index.c:1131 +msgid "" +"core.untrackedCache is set to false; remove or change it, if you really want " +"to enable the untracked cache" +msgstr "core.untrackedCacheκ°μ΄ κ±°μ§μ
λλ€. μ λ§λ‘ μΆμ νμ§ μλ νμΌ μΊμλ₯Ό μ¬μ©νλ €λ©΄ μ΄ κ°μ μ κ±°νκ±°λ λ°κΎΈμμμ€." -#: builtin/update-index.c:1146 +#: builtin/update-index.c:1135 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "'%s'μ λν΄ μΆμ λμ§ μλ μΊμλ₯Ό μ¬μ©νμ§ μμ΅λλ€" @@ -12192,26 +12978,40 @@ msgstr "νμ λλ ν°λ¦¬ <μ λμ΄>μ λν΄ νΈλ¦¬ μ€λΈμ νΈλ₯Ό μλλ msgid "only useful for debugging" msgstr "λλ²κΉ
μ©λλ‘λ§ μ¬μ©" -#: upload-pack.c:20 +#: upload-pack.c:22 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<μ΅μ
>] <λλ ν°λ¦¬>" -#: upload-pack.c:837 +#: upload-pack.c:1028 msgid "quit after a single request/response exchange" msgstr "νλμ μμ²/μλ΅ κ΅ν λ€μ λλ©λλ€" -#: upload-pack.c:839 +#: upload-pack.c:1030 msgid "exit immediately after initial ref advertisement" msgstr "μ΅μ΄ λ νΌλ°μ€ μλ¦Ό λ€μ μ¦μ λλ©λλ€" -#: upload-pack.c:841 +#: upload-pack.c:1032 msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "<λλ ν°λ¦¬>κ° κΉ λλ ν°λ¦¬κ° μλλ©΄ <λλ ν°λ¦¬>/.git/ ν΄λλ₯Ό μλνμ§ μμ΅λλ€." +msgstr "" +"<λλ ν°λ¦¬>κ° κΉ λλ ν°λ¦¬κ° μλλ©΄ <λλ ν°λ¦¬>/.git/ ν΄λλ₯Ό μλνμ§ μμ΅λλ€." -#: upload-pack.c:843 +#: upload-pack.c:1034 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "<n>μ΄ λμ λ°μμ΄ μμΌλ©΄ μ μ‘μ μ€μ§ν©λλ€" +#: credential-cache--daemon.c:223 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"μμΌ λλ ν°λ¦¬μ κΆνμ΄ λ무 λμ¨ν©λλ€. λ€λ₯Έ μ¬μ©μκ°\n" +"μΊμμ λ€μ΄ μλ λΉλ° μ 보λ₯Ό μ½μ μ μμ΅λλ€. λ€μμ μ€νν΄ λ³΄μμμ€:\n" +"\n" +"\tchmod 0700 %s" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "λλ²κΉ
λ©μμ§λ₯Ό νμ€μ€λ₯λ‘ μΆλ ₯ν©λλ€" @@ -12226,7 +13026,12 @@ msgstr "" "λͺ©λ‘μ λ³Ό μ μμ΅λλ€. νΉμ νμ λͺ
λ Ήμ΄λ κ°λ
μ λν΄ μ½μ΄ λ³΄λ €λ©΄ 'git help\n" "<λͺ
λ Ή>' λλ 'git help <κ°λ
>' λͺ
λ Ήμ μ€ννμμμ€." -#: http.c:323 +# HTTP delegation +#: http.c:342 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "λ리κ²μ΄μ
컨νΈλ‘€μ cURL 7.44.0 μ λ²μ μμλ μ§μνμ§ μμ΅λλ€" + +#: http.c:351 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "κ³΅κ° ν€ κ³ μ μ cURL 7.44.0 μ λ²μ μμλ μ§μνμ§ μμ΅λλ€" @@ -12342,15 +13147,15 @@ msgstr "λ§λ£-μκ°" msgid "no-op (backward compatibility)" msgstr "μ무 λμλ νμ§ μμ (νΈνμ©)" -#: parse-options.h:237 +#: parse-options.h:238 msgid "be more verbose" msgstr "λ μμΈν νμν©λλ€" -#: parse-options.h:239 +#: parse-options.h:240 msgid "be more quiet" msgstr "λ κ°λ΅ν νμν©λλ€" -#: parse-options.h:245 +#: parse-options.h:246 msgid "use <n> digits to display SHA-1s" msgstr "SHA-1 νμμ <n>κ°μ μ«μλ₯Ό μ¬μ©ν©λλ€" @@ -12566,7 +13371,7 @@ msgid "Automated merge did not work." msgstr "μλ λ³ν©μ΄ λμνμ§ μμμ΅λλ€." #: git-merge-octopus.sh:62 -msgid "Should not be doing an Octopus." +msgid "Should not be doing an octopus." msgstr "μ₯ν νΌμ€ μ λ΅ λ³ν©μ ν μ μμ΅λλ€." #: git-merge-octopus.sh:73 @@ -12752,6 +13557,10 @@ msgstr "μμ§ μ΅μ΄ 컀λ°μ΄ μμ΅λλ€" msgid "Cannot save the current index state" msgstr "νμ¬ μΈλ±μ€ μνλ₯Ό μ μ₯ν μ μμ΅λλ€" +#: git-stash.sh:103 +msgid "Cannot save the untracked files" +msgstr "μΆμ νμ§ μλ νμΌμ μ μ₯ν μ μμ΅λλ€" + #: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "νμ¬ μμ
ν΄λ μνλ₯Ό μ μ₯ν μ μμ΅λλ€" @@ -12792,6 +13601,10 @@ msgstr "" "μ€λ₯: 'stash save'μ λν΄ μ μ μλ μ΅μ
: $option\n" " λ©μμ§λ₯Ό λκΈ°λ €λ©΄, λ€μκ³Ό κ°μ΄ μ°μμμ€: git stash save -- '$option'" +#: git-stash.sh:251 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "--patch μ΅μ
κ³Ό --include-untracked λλ --all μ΅μ
μ λμμ μΈ μ μμ΅λλ€" + #: git-stash.sh:259 msgid "No local changes to save" msgstr "μ μ₯ν λ‘컬 λ³κ²½ μ¬νμ΄ μμ΅λλ€" @@ -12813,96 +13626,100 @@ msgstr "μμ
ν΄λμ $stash_msg μΈλ±μ€ μνλ₯Ό μ μ₯νμ΅λλ€" msgid "Cannot remove worktree changes" msgstr "μμ
ν΄λ λ³κ²½ μ¬νμ μ κ±°ν μ μμ΅λλ€" -#: git-stash.sh:404 +#: git-stash.sh:403 #, sh-format msgid "unknown option: $opt" msgstr "μ μ μλ μ΅μ
: $opt" -#: git-stash.sh:414 +#: git-stash.sh:416 msgid "No stash found." msgstr "μ€νμκ° μμ΅λλ€." -#: git-stash.sh:421 +#: git-stash.sh:423 #, sh-format msgid "Too many revisions specified: $REV" msgstr "λ무 λ§μ 리λΉμ μ μ§μ νμ΅λλ€: $REV" -#: git-stash.sh:427 +#: git-stash.sh:438 #, sh-format msgid "$reference is not a valid reference" msgstr "$referenceμ(λ) μ¬λ°λ₯Έ λ νΌλ°μ€κ° μλλλ€" -#: git-stash.sh:455 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args'μ(λ) μ€νμ 컀λ°μ΄ μλλλ€" -#: git-stash.sh:466 +#: git-stash.sh:477 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args'μ(λ) μ€νμ λ νΌλ°μ€κ° μλλλ€" -#: git-stash.sh:474 +#: git-stash.sh:485 msgid "unable to refresh index" msgstr "μΈλ±μ€λ₯Ό μλ‘ κ³ μΉ μ μμ΅λλ€" -#: git-stash.sh:478 +#: git-stash.sh:489 msgid "Cannot apply a stash in the middle of a merge" msgstr "λ³ν© λμ€μ μ€νμλ₯Ό μ μ©ν μ μμ΅λλ€" -#: git-stash.sh:486 +#: git-stash.sh:497 msgid "Conflicts in index. Try without --index." msgstr "μΈλ±μ€μ μΆ©λ. --index μμ΄ μλν΄ λ³΄μμμ€." -#: git-stash.sh:488 +#: git-stash.sh:499 msgid "Could not save index tree" msgstr "μΈλ±μ€ νΈλ¦¬λ₯Ό μ μ₯ν μ μμ΅λλ€" -#: git-stash.sh:522 +#: git-stash.sh:508 +msgid "Could not restore untracked files from stash" +msgstr "μ€νμμμ μΆμ νμ§ μλ νμΌμ 볡ꡬν μ μμ΅λλ€" + +#: git-stash.sh:533 msgid "Cannot unstage modified files" msgstr "μμ ν νμΌμ μ€ν
μ΄μ§μμ λΊ μ μμ΅λλ€" -#: git-stash.sh:537 +#: git-stash.sh:548 msgid "Index was not unstashed." msgstr "μΈλ±μ€κ° μ€νμμμ λΉ μ‘μ΅λλ€." -#: git-stash.sh:551 +#: git-stash.sh:562 msgid "The stash is kept in case you need it again." msgstr "λ€μ νμν λλ₯Ό λλΉν΄ μ€νμλ₯Ό 보κ΄ν©λλ€." -#: git-stash.sh:560 +#: git-stash.sh:571 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} μ§μ ($s)" -#: git-stash.sh:561 +#: git-stash.sh:572 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: μ€νμ νλͺ©μ μ§μΈ μ μμ΅λλ€" -#: git-stash.sh:569 +#: git-stash.sh:580 msgid "No branch name specified" msgstr "λΈλμΉ μ΄λ¦μ μ§μ νμ§ μμμ΅λλ€" -#: git-stash.sh:641 +#: git-stash.sh:652 msgid "(To restore them type \"git stash apply\")" msgstr "(볡ꡬνλ €λ©΄ \"git stash apply\"λ₯Ό μ€ννμμμ€)" -#: git-submodule.sh:183 +#: git-submodule.sh:184 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "μλ κ²½λ‘λ μμ
ν΄λμ μ΅μμμμλ§ μΈ μ μμ΅λλ€" -#: git-submodule.sh:193 +#: git-submodule.sh:194 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "μ μ₯μ URL: '$repo' κ°μ μ λ κ²½λ‘κ±°λ ./ λλ ../λ‘ μμν΄μΌ ν©λλ€." -#: git-submodule.sh:210 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path'μ(λ) μ΄λ―Έ μΈλ±μ€μ μμ΅λλ€" -#: git-submodule.sh:214 +#: git-submodule.sh:215 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12913,22 +13730,22 @@ msgstr "" "$sm_path\n" "μ λ§λ‘ μΆκ°νλ €λ©΄ -f μ΅μ
μ μ¬μ©νμμμ€." -#: git-submodule.sh:232 +#: git-submodule.sh:233 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "'$sm_path'μ κΈ°μ‘΄ μ μ₯μλ₯Ό μΈλ±μ€μ μΆκ°ν©λλ€" -#: git-submodule.sh:234 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path'μ΄(κ°) μ΄λ―Έ μκ³ μ¬λ°λ₯Έ git μ μ₯μκ° μλλλ€" -#: git-submodule.sh:242 +#: git-submodule.sh:243 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "'$sm_name'μ λν κΉ λλ ν°λ¦¬κ° λ‘컬μμ 리λͺ¨νΈκ° μλ μ±λ‘ μμ΅λλ€:" -#: git-submodule.sh:244 +#: git-submodule.sh:245 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -12943,47 +13760,47 @@ msgstr "" "'--force' μ΅μ
μ μ¬μ©νμμμ€. λ‘컬 κΉ λλ ν°λ¦¬κ° μ¬λ°λ₯Έ μ μ₯μκ° μλκ±°λ\n" "λ¬΄μ¨ μλ―ΈμΈμ§ μ λͺ¨λ₯΄κ² μΌλ©΄ '--name' μ΅μ
μΌλ‘ λ€λ₯Έ μ΄λ¦μ μ ννμμμ€." -#: git-submodule.sh:250 +#: git-submodule.sh:251 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "λ‘컬 κΉ λλ ν°λ¦¬λ₯Ό '$sm_name' νμλͺ¨λλ‘ λ€μ νμ±νν©λλ€." -#: git-submodule.sh:262 +#: git-submodule.sh:263 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "'$sm_path' νμ λͺ¨λμ 체ν¬μμν μ μμ΅λλ€" -#: git-submodule.sh:267 +#: git-submodule.sh:268 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "'$sm_path' νμ λͺ¨λμ μΆκ°νλλ° μ€ν¨νμ΅λλ€" -#: git-submodule.sh:276 +#: git-submodule.sh:277 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "'$sm_path' νμ λͺ¨λμ λ±λ‘νλλ° μ€ν¨νμ΅λλ€" -#: git-submodule.sh:323 +#: git-submodule.sh:324 #, sh-format msgid "Entering '$displaypath'" msgstr "'$displaypath' λ€μ΄κ°" -#: git-submodule.sh:343 +#: git-submodule.sh:344 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "'$displaypath'μμ λ©μΆ€. μ€ν¬λ¦½νΈκ° 0μ΄ μλ μνλ₯Ό 리ν΄ν¨." -#: git-submodule.sh:414 +#: git-submodule.sh:415 #, sh-format msgid "pathspec and --all are incompatible" msgstr "κ²½λ‘λͺ
μΈ λ° --all μ΅μ
μ νΈνλμ§ μμ΅λλ€" -#: git-submodule.sh:419 +#: git-submodule.sh:420 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "μ λ§λ‘ λͺ¨λ νμ λͺ¨λ μ΄κΈ°νλ₯Ό ν΄μ νλ €λ©΄ '--all'μ μ¬μ©νμμμ€" -#: git-submodule.sh:439 +#: git-submodule.sh:440 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -12992,7 +13809,7 @@ msgstr "" "νμ λͺ¨λ μμ
ν΄λ '$displaypath'μ .git λλ ν°λ¦¬κ° λ€μ΄ μμ΅λλ€\n" "(μ λ§λ‘ κ·Έ μ»€λ° λ΄μκΉμ§ ν¬ν¨ν΄ μ κ±°νλ €λ©΄ 'rm -rf'λ₯Ό μ¬μ©νμμμ€)" -#: git-submodule.sh:447 +#: git-submodule.sh:448 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -13001,136 +13818,136 @@ msgstr "" "νμ λͺ¨λ μμ
ν΄λμ ('$displaypath') λ‘컬 μμ μ¬νμ΄ μμ΅λλ€. λ²λ¦¬λ €λ©΄ '-" "f'λ₯Ό μ¬μ©νμμμ€" -#: git-submodule.sh:450 +#: git-submodule.sh:451 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "'$displaypath' λλ ν°λ¦¬λ₯Ό μ§μλλ€" -#: git-submodule.sh:451 +#: git-submodule.sh:452 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "νμ λͺ¨λ λλ ν°λ¦¬λ₯Ό ('$displaypath') μ κ±°ν μ μμ΅λλ€" -#: git-submodule.sh:454 +#: git-submodule.sh:455 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "λΉ νμ λͺ¨λ λλ ν°λ¦¬λ₯Ό ('$displaypath') λ§λ€ μ μμ΅λλ€" -#: git-submodule.sh:463 +#: git-submodule.sh:464 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "'$name' νμ λͺ¨λμ΄ ($url) '$displaypath' κ²½λ‘μ λν΄ λ±λ‘λμ§ μμμ΅λλ€" -#: git-submodule.sh:612 +#: git-submodule.sh:617 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘μμ ('$displaypath') νμ¬ λ¦¬λΉμ μ μ°Ύμ μ μμ΅λλ€" -#: git-submodule.sh:622 +#: git-submodule.sh:627 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "νμ λͺ¨λ κ²½λ‘ '$sm_path'μμ κ°μ Έμ¬ μ μμ΅λλ€" -#: git-submodule.sh:627 +#: git-submodule.sh:632 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" -msgstr "νμ λͺ¨λ κ²½λ‘ '$sm_path'μμ νμ¬ ${remote_name}/${branch} 리λΉμ μ μ°Ύμ μ μμ΅λλ€" +msgstr "" +"νμ λͺ¨λ κ²½λ‘ '$sm_path'μμ νμ¬ ${remote_name}/${branch} 리λΉμ μ μ°Ύμ μ " +"μμ΅λλ€" -#: git-submodule.sh:645 +#: git-submodule.sh:650 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ κ°μ Έμ¬ μ μμ΅λλ€" -#: git-submodule.sh:651 +#: git-submodule.sh:656 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." -msgstr "'$displaypath' νμ λͺ¨λ κ²½λ‘μμ κ°μ Έμμ§λ§, $sha1 컀λ°μ΄ λ€μ΄μμ§ μμ΅λλ€. μ΄ μ»€λ°μ μ§μ κ°μ Έμ€λλ° μ€ν¨νμ΅λλ€." +msgstr "" +"'$displaypath' νμ λͺ¨λ κ²½λ‘μμ κ°μ Έμμ§λ§, $sha1 컀λ°μ΄ λ€μ΄μμ§ μμ΅λ" +"λ€. μ΄ μ»€λ°μ μ§μ κ°μ Έμ€λλ° μ€ν¨νμ΅λλ€." -#: git-submodule.sh:658 +#: git-submodule.sh:663 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ '$sha1'μ(λ₯Ό) 체ν¬μμν μ μμ΅λλ€" -#: git-submodule.sh:659 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath': '$sha1' 체ν¬μμ" -#: git-submodule.sh:663 +#: git-submodule.sh:668 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ '$sha1'μ(λ₯Ό) λ¦¬λ² μ΄μ€ν μ μμ΅λλ€" -#: git-submodule.sh:664 +#: git-submodule.sh:669 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath': '$sha1'(μΌ)λ‘ λ¦¬λ² μ΄μ€" -#: git-submodule.sh:669 +#: git-submodule.sh:674 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ '$sha1' λ³ν©ν μ μμ΅λλ€" -#: git-submodule.sh:670 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath': '$sha1'μμ λ³ν©" -#: git-submodule.sh:675 +#: git-submodule.sh:680 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "'$command $sha1' μ€νμ΄ νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ μ€ν¨νμ΅λλ€" -#: git-submodule.sh:676 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath': '$command $sha1'" -#: git-submodule.sh:707 +#: git-submodule.sh:712 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "μ¬κ·μ μΌλ‘ νμ λͺ¨λ κ²½λ‘ '$displaypath'μ λ€μ΄κ°λλ° μ€ν¨νμ΅λλ€" -#: git-submodule.sh:815 +#: git-submodule.sh:820 msgid "The --cached option cannot be used with the --files option" msgstr "--cached μ΅μ
μ --files μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€" -#: git-submodule.sh:867 +#: git-submodule.sh:872 #, sh-format msgid "unexpected mode $mod_dst" msgstr "μμμΉ λͺ»ν λͺ¨λ $mod_dst" -#: git-submodule.sh:887 +#: git-submodule.sh:892 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " κ²½κ³ : '$display_name'μ '$sha1_src' 컀λ°μ΄ λ€μ΄μμ§ μμ΅λλ€" -#: git-submodule.sh:890 +#: git-submodule.sh:895 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " κ²½κ³ : '$display_name'μ '$sha1_dst' 컀λ°μ΄ λ€μ΄μμ§ μμ΅λλ€" -#: git-submodule.sh:893 +#: git-submodule.sh:898 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " κ²½κ³ : '$display_name'μ '$sha1_src' λ° '$sha1_dst' 컀λ°μ΄ λ€μ΄μμ§ μμ΅λλ€" -#: git-submodule.sh:918 -msgid "blob" -msgstr "λΈλ‘" - -#: git-submodule.sh:1040 +#: git-submodule.sh:1045 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "μ¬κ·μ μΌλ‘ νμ λͺ¨λ κ²½λ‘ '$sm_path'μ λ€μ΄κ°λλ° μ€ν¨νμ΅λλ€" -#: git-submodule.sh:1107 +#: git-submodule.sh:1112 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "νμ λͺ¨λ URLμ '$displaypath'μ λν΄ λκΈ°ν" @@ -13175,13 +13992,17 @@ msgstr "" msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" -msgstr "\nμ€μ μ κ±°νμ§ μμ΅λλ€. 컀λ°μ μ κ±°νλ €λ©΄ λͺ
μμ μΌλ‘ 'drop'μ μ¬μ©νμμμ€.\n" +msgstr "" +"\n" +"μ€μ μ κ±°νμ§ μμ΅λλ€. 컀λ°μ μ κ±°νλ €λ©΄ λͺ
μμ μΌλ‘ 'drop'μ μ¬μ©νμμμ€.\n" #: git-rebase--interactive.sh:166 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" -msgstr "\nμ¬κΈ° μ€μ μ κ±°νλ©΄ ν΄λΉ 컀λ°μ μμ΄λ²λ¦½λλ€!\n" +msgstr "" +"\n" +"μ¬κΈ° μ€μ μ κ±°νλ©΄ ν΄λΉ 컀λ°μ μμ΄λ²λ¦½λλ€!\n" #: git-rebase--interactive.sh:202 #, sh-format @@ -13246,166 +14067,42 @@ msgstr "$sha1 λ³ν©μ λ€μ νλλ° μ€λ₯" msgid "Could not pick $sha1" msgstr "$sha1μ λΉΌμ€κΈ° ν μ μμ΅λλ€" -#: git-rebase--interactive.sh:408 git-rebase--interactive.sh:474 -msgid "This is the 1st commit message:" -msgstr "1λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:409 -msgid "This is the 2nd commit message:" -msgstr "2λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:410 -msgid "This is the 3rd commit message:" -msgstr "3λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:411 -msgid "This is the 4th commit message:" -msgstr "4λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" +#: git-rebase--interactive.sh:407 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "μ»€λ° λ©μμ§ #${n}λ²μ
λλ€:" #: git-rebase--interactive.sh:412 -msgid "This is the 5th commit message:" -msgstr "5λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:413 -msgid "This is the 6th commit message:" -msgstr "6λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:414 -msgid "This is the 7th commit message:" -msgstr "7λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:415 -msgid "This is the 8th commit message:" -msgstr "8λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:416 -msgid "This is the 9th commit message:" -msgstr "9λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:417 -msgid "This is the 10th commit message:" -msgstr "10λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#. TRANSLATORS: if the language you are translating into -#. doesn't allow you to compose a sentence in this fashion, -#. consider translating as if this and the following few strings -#. were "This is the commit message ${n}:" -#: git-rebase--interactive.sh:422 #, sh-format -msgid "This is the ${n}th commit message:" -msgstr "${n}λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" +msgid "The commit message #${n} will be skipped:" +msgstr "#${n}λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" #: git-rebase--interactive.sh:423 #, sh-format -msgid "This is the ${n}st commit message:" -msgstr "${n}λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:424 -#, sh-format -msgid "This is the ${n}nd commit message:" -msgstr "${n}λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:425 -#, sh-format -msgid "This is the ${n}rd commit message:" -msgstr "${n}λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" - -#: git-rebase--interactive.sh:426 -#, sh-format -msgid "This is the commit message ${n}:" -msgstr "μ»€λ° λ©μμ§ ${n}μ
λλ€:" - -#: git-rebase--interactive.sh:432 -msgid "The 1st commit message will be skipped:" -msgstr "1λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:433 -msgid "The 2nd commit message will be skipped:" -msgstr "2λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:434 -msgid "The 3rd commit message will be skipped:" -msgstr "3λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:435 -msgid "The 4th commit message will be skipped:" -msgstr "4λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:436 -msgid "The 5th commit message will be skipped:" -msgstr "5λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:437 -msgid "The 6th commit message will be skipped:" -msgstr "6λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:438 -msgid "The 7th commit message will be skipped:" -msgstr "7λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:439 -msgid "The 8th commit message will be skipped:" -msgstr "8λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:440 -msgid "The 9th commit message will be skipped:" -msgstr "9λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:441 -msgid "The 10th commit message will be skipped:" -msgstr "10λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#. TRANSLATORS: if the language you are translating into -#. doesn't allow you to compose a sentence in this fashion, -#. consider translating as if this and the following few strings -#. were "The commit message ${n} will be skipped:" -#: git-rebase--interactive.sh:446 -#, sh-format -msgid "The ${n}th commit message will be skipped:" -msgstr "${n}λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:447 -#, sh-format -msgid "The ${n}st commit message will be skipped:" -msgstr "${n}λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:448 -#, sh-format -msgid "The ${n}nd commit message will be skipped:" -msgstr "${n}λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:449 -#, sh-format -msgid "The ${n}rd commit message will be skipped:" -msgstr "${n}λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:450 -#, sh-format -msgid "The commit message ${n} will be skipped:" -msgstr "${n}λ²μ§Έ μ»€λ° λ©μμ§λ₯Ό 건λλλλ€:" - -#: git-rebase--interactive.sh:462 -#, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "μ»€λ° $countκ°κ° μμΈ κ²°κ³Όμ
λλ€." -#: git-rebase--interactive.sh:470 +#: git-rebase--interactive.sh:431 #, sh-format msgid "Cannot write $fixup_msg" msgstr "$fixup_msgλ₯Ό μΈ μ μμ΅λλ€" -#: git-rebase--interactive.sh:473 +#: git-rebase--interactive.sh:434 msgid "This is a combination of 2 commits." msgstr "μ»€λ° 2κ°κ° μμΈ κ²°κ³Όμ
λλ€." -#: git-rebase--interactive.sh:514 git-rebase--interactive.sh:557 -#: git-rebase--interactive.sh:560 +#: git-rebase--interactive.sh:435 +msgid "This is the 1st commit message:" +msgstr "1λ²μ§Έ μ»€λ° λ©μμ§μ
λλ€:" + +#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 +#: git-rebase--interactive.sh:521 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "λ€μμ μ μ©ν (apply) μ μμ΅λλ€: $sha1... $rest" -#: git-rebase--interactive.sh:588 +#: git-rebase--interactive.sh:549 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -13418,31 +14115,31 @@ msgstr "" "λλΆλΆμ κ²½μ° λΉ μ»€λ° λ©μμ§ λλ¬Έμ΄κ±°λ, λλ μ»€λ° μ νν¬κ° μ€ν¨νκΈ°\n" "λλ¬Έμ
λλ€. μ»€λ° λ©μμ§λ₯Ό μμ νκΈ° μ μ μ΄ λ¬Έμ λ₯Ό λ¨Όμ ν΄κ²°ν΄μΌ ν©λλ€." -#: git-rebase--interactive.sh:603 +#: git-rebase--interactive.sh:564 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "λ€μμμ λ©μΆ₯λλ€: $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:618 +#: git-rebase--interactive.sh:579 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "μ΄μ μ»€λ° μμ΄ '$squash_style' μνν μ μμ΅λλ€" -#: git-rebase--interactive.sh:660 +#: git-rebase--interactive.sh:621 #, sh-format msgid "Executing: $rest" msgstr "μ€ν μ€: $rest" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:629 #, sh-format msgid "Execution failed: $rest" msgstr "μ€ν μ€ν¨: $rest" -#: git-rebase--interactive.sh:670 +#: git-rebase--interactive.sh:631 msgid "and made changes to the index and/or the working tree" msgstr "κ·Έλ¦¬κ³ μΈλ±μ€ κ·Έλ¦¬κ³ /λλ μμ
ν΄λμ λ³κ²½ μ¬νμ΄ μμ΅λλ€" -#: git-rebase--interactive.sh:672 +#: git-rebase--interactive.sh:633 msgid "" "You can fix the problem, and then run\n" "\n" @@ -13453,7 +14150,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:685 +#: git-rebase--interactive.sh:646 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -13468,25 +14165,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:696 +#: git-rebase--interactive.sh:657 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "μ μ μλ λͺ
λ Ή: $command $sha1 $rest" -#: git-rebase--interactive.sh:697 +#: git-rebase--interactive.sh:658 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "'git rebase --edit-todo' λͺ
λ ΉμΌλ‘ λ°λ‘μ‘μΌμμμ€." -#: git-rebase--interactive.sh:732 +#: git-rebase--interactive.sh:693 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "μ±κ³΅μ μΌλ‘ λ¦¬λ² μ΄μ€νκ³ $head_name μ
λ°μ΄νΈνμ΅λλ€." -#: git-rebase--interactive.sh:779 +#: git-rebase--interactive.sh:740 msgid "Could not skip unnecessary pick commands" msgstr "λΆνμν λΉΌμ€κΈ° λͺ
λ Ήμ 건λλΈ μ μμ΅λλ€" -#: git-rebase--interactive.sh:937 +#: git-rebase--interactive.sh:898 #, sh-format msgid "" "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" @@ -13495,7 +14192,7 @@ msgstr "" "κ²½κ³ : λ€μ μ€μμ ν΄λΉ SHA-1μ΄ μκ±°λ 컀λ°μ΄ μλλλ€:\n" " - $line" -#: git-rebase--interactive.sh:970 +#: git-rebase--interactive.sh:931 #, sh-format msgid "" "Warning: the command isn't recognized in the following line:\n" @@ -13504,11 +14201,11 @@ msgstr "" "κ²½κ³ : λ€μ μ€μμ λͺ
λ Ήμ΄κ° 무μμΈμ§ μ μ μμ΅λλ€:\n" " - $line" -#: git-rebase--interactive.sh:1009 +#: git-rebase--interactive.sh:970 msgid "could not detach HEAD" msgstr "HEADλ λΆλ¦¬ν μ μμ΅λλ€" -#: git-rebase--interactive.sh:1047 +#: git-rebase--interactive.sh:1008 msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):" @@ -13516,7 +14213,7 @@ msgstr "" "κ²½κ³ : μΌλΆ 컀λ°μ΄ μλμΉ μκ² λ²λ €μ‘μ μλ μμ΅λλ€.\n" "λ²λ €μ§ μ»€λ° (μ΅κ·Όμμ κ³Όκ±° μμ):" -#: git-rebase--interactive.sh:1055 +#: git-rebase--interactive.sh:1016 msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" @@ -13524,31 +14221,37 @@ msgid "" "warnings.\n" "The possible behaviours are: ignore, warn, error." msgstr "" -"μ΄ λ©μμ§λ₯Ό λ³΄μ§ μμΌλ €λ©΄, \"drop\"μ μ¬μ©ν΄ λͺ
μμ μΌλ‘ 컀λ°μ μ κ±°νμμμ€.\n" +"μ΄ λ©μμ§λ₯Ό λ³΄μ§ μμΌλ €λ©΄, \"drop\"μ μ¬μ©ν΄ λͺ
μμ μΌλ‘ 컀λ°μ μ κ±°νμμ" +"μ€.\n" "\n" -"'git config rebase.missingCommitsCheck' λͺ
λ ΉμΌλ‘ κ²½κ³ λ¨κ³λ₯Ό λ°κΏ μ μμ΅λλ€.\n" +"'git config rebase.missingCommitsCheck' λͺ
λ ΉμΌλ‘ κ²½κ³ λ¨κ³λ₯Ό λ°κΏ μ μμ΅λ" +"λ€.\n" "κ°λ₯ν λμμ: ignore, warn, error" -#: git-rebase--interactive.sh:1066 +#: git-rebase--interactive.sh:1027 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " "Ignoring." -msgstr "rebase.missingCommitsCheck μ΅μ
μ λν΄ μΈμν μ μλ $check_level μ€μ . 무μν©λλ€." +msgstr "" +"rebase.missingCommitsCheck μ΅μ
μ λν΄ μΈμν μ μλ $check_level μ€μ . 무μ" +"ν©λλ€." -#: git-rebase--interactive.sh:1083 -msgid "You can fix this with 'git rebase --edit-todo'." -msgstr "'git rebase --edit-todo' λͺ
λ ΉμΌλ‘ λ°λ‘μ‘μ μ μμ΅λλ€." +#: git-rebase--interactive.sh:1044 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'." +msgstr "'git rebase --edit-todo' λͺ
λ ΉμΌλ‘ λ°λ‘μ‘μ μ μκ³ 'git rebase --continue' λͺ
λ Ήμ μ€νν©λλ€." -#: git-rebase--interactive.sh:1084 +#: git-rebase--interactive.sh:1045 msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "μλλ©΄ 'git rebase --abort' λͺ
λ ΉμΌλ‘ λ¦¬λ² μ΄μ€λ₯Ό μ€μ§ν μλ μμ΅λλ€." -#: git-rebase--interactive.sh:1108 +#: git-rebase--interactive.sh:1069 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "CHERRY_PICK_HEADλ₯Ό μ κ±°ν μ μμ΅λλ€" -#: git-rebase--interactive.sh:1113 +#: git-rebase--interactive.sh:1074 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -13561,7 +14264,7 @@ msgid "" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" -"In both case, once you're done, continue with:\n" +"In both cases, once you're done, continue with:\n" "\n" " git rebase --continue\n" msgstr "" @@ -13579,11 +14282,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1130 +#: git-rebase--interactive.sh:1091 msgid "Error trying to find the author identity to amend commit" msgstr "컀λ°μ μμ ν μμ±μ μ μμ μ°Ύλλ° μ€λ₯" -#: git-rebase--interactive.sh:1135 +#: git-rebase--interactive.sh:1096 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -13591,11 +14294,11 @@ msgstr "" "μμ
ν΄λμ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€. μ΄ μ¬νμ λ¨Όμ \n" "컀λ°νκ³ 'git rebase --continue' λͺ
λ Ήμ λ€μ μ€ννμμμ€." -#: git-rebase--interactive.sh:1140 git-rebase--interactive.sh:1144 +#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 msgid "Could not commit staged changes." msgstr "μ€ν
μ΄μ§ν λ³κ²½ μ¬νμ 컀λ°ν μ μμ΅λλ€." -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:1129 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -13609,50 +14312,49 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1176 git-rebase--interactive.sh:1337 +#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295 msgid "Could not execute editor" msgstr "νΈμ§κΈ°λ₯Ό μ€νν μ μμ΅λλ€" -#: git-rebase--interactive.sh:1184 -msgid "You need to set your committer info first" -msgstr "λ¨Όμ 컀λ°νλ μ¬λ μ 보λ₯Ό μ€μ ν΄μΌ ν©λλ€" - -#: git-rebase--interactive.sh:1192 +#: git-rebase--interactive.sh:1150 #, sh-format msgid "Could not checkout $switch_to" msgstr "$switch_toλ₯Ό 체ν¬μμν μ μμ΅λλ€" -#: git-rebase--interactive.sh:1197 +#: git-rebase--interactive.sh:1155 msgid "No HEAD?" msgstr "HEADκ° μμ΅λλ€?" -#: git-rebase--interactive.sh:1198 +#: git-rebase--interactive.sh:1156 #, sh-format msgid "Could not create temporary $state_dir" msgstr "μμλ‘ $state_dir λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" -#: git-rebase--interactive.sh:1200 +#: git-rebase--interactive.sh:1158 msgid "Could not mark as interactive" msgstr "λννμΌλ‘ νμν μ μμ΅λλ€." -#: git-rebase--interactive.sh:1210 git-rebase--interactive.sh:1215 +#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173 msgid "Could not init rewritten commits" msgstr "λ€μ μμ±λ 컀λ°μ μ΄κΈ°νν μ μμ΅λλ€" -#: git-rebase--interactive.sh:1315 +#: git-rebase--interactive.sh:1273 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "λ¦¬λ² μ΄μ€ $shortrevisions, $shortonto μλ‘ (λͺ
λ Ή $todocountκ°)" -#: git-rebase--interactive.sh:1320 +#: git-rebase--interactive.sh:1278 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" -msgstr "\nνμ§λ§ λͺ¨λ μ κ±°ν κ²½μ°, λ¦¬λ² μ΄μ€λ₯Ό μ€μ§ν©λλ€.\n\n" +msgstr "" +"\n" +"νμ§λ§ λͺ¨λ μ κ±°ν κ²½μ°, λ¦¬λ² μ΄μ€λ₯Ό μ€μ§ν©λλ€.\n" +"\n" -#: git-rebase--interactive.sh:1327 +#: git-rebase--interactive.sh:1285 msgid "Note that empty commits are commented out" msgstr "λ¨ λΉ μ»€λ°μ μ£Όμ μ²λ¦¬λμμ΅λλ€." @@ -13679,6 +14381,11 @@ msgstr "λ¦¬λ² μ΄μ€ν μ μμ΅λλ€: μ€ν
μ΄μ§νμ§ μμ λ³κ²½ μ¬ν msgid "Cannot rewrite branches: You have unstaged changes." msgstr "λΈλμΉλ₯Ό λ€μ μΈ μ μμ΅λλ€: μ€ν
μ΄μ§νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." +#: git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "" +"λ¦¬λ² μ΄μ€λ‘ νμ ν μ μμ΅λλ€: μ€ν
μ΄μ§νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." + #: git-sh-setup.sh:229 #, sh-format msgid "Cannot $action: You have unstaged changes." @@ -13688,11 +14395,20 @@ msgstr "$action ν μ μμ΅λλ€: μ€ν
μ΄μ§νμ§ μμ λ³κ²½ μ¬νμ΄ msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "λ¦¬λ² μ΄μ€ν μ μμ΅λλ€: μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "" +"λ¦¬λ² μ΄μ€λ‘ νμ ν μ μμ΅λλ€: μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." + #: git-sh-setup.sh:248 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "$action ν μ μμ΅λλ€: μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "μΆκ°λ‘, μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." + #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." msgstr "μ΄ λͺ
λ Ήμ μμ
ν΄λμ μ΅μμμμλ§ μΈ μ μμ΅λλ€." |