diff options
| author | Changwoo Ryu <cwryu@debian.org> | 2017-10-17 16:20:34 +0900 |
|---|---|---|
| committer | Changwoo Ryu <cwryu@debian.org> | 2017-10-17 16:24:11 +0900 |
| commit | d9e43e139b91fd857f0c5f083b98303f855ed6f1 (patch) | |
| tree | 13421de022170ef00a05bc5dbf239d23ceaf3135 | |
| parent | 9c07fab78c26b09b14ae3c3090f9816c134da09e (diff) | |
| download | git-d9e43e139b91fd857f0c5f083b98303f855ed6f1.tar.gz | |
l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| -rw-r--r-- | po/ko.po | 4946 |
1 files changed, 2535 insertions, 2411 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: 2017-07-24 21:54+0800\n" -"PO-Revision-Date: 2017-08-01 12:26+0900\n" +"POT-Creation-Date: 2017-10-17 09:44+0800\n" +"PO-Revision-Date: 2017-10-17 16:23+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-" "ko>\n" @@ -111,7 +111,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "ํด๊ฒฐํ์ง ๋ชปํ ์ถฉ๋ ๋๋ฌธ์ ๋๋ฉ๋๋ค." -#: advice.c:117 builtin/merge.c:1184 +#: advice.c:117 builtin/merge.c:1211 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "๋ณํฉ ์์
์ ๋ค ๋ง์น์ง ์์์ต๋๋ค (MERGE_HEAD ํ์ผ์ด ์์ต๋๋ค)." @@ -160,86 +160,86 @@ msgstr "์ ์ ์๋ ๊ณต๋ฐฑ ์ต์
'%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "์ ์ ์๋ ๊ณต๋ฐฑ ๋ฌด์ ์ต์
'%s'" -#: apply.c:126 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject ๋ฐ --3way ์ต์
์ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค." -#: apply.c:128 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached ๋ฐ --3way ์ต์
์ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค." -#: apply.c:131 +#: apply.c:130 msgid "--3way outside a repository" msgstr "์ ์ฅ์ ๋ฐ์์ --3way ์ต์
์ฌ์ฉ" -#: apply.c:142 +#: apply.c:141 msgid "--index outside a repository" msgstr "์ ์ฅ์ ๋ฐ์์ --index ์ต์
์ฌ์ฉ" -#: apply.c:145 +#: apply.c:144 msgid "--cached outside a repository" msgstr "์ ์ฅ์ ๋ฐ์์ --cached ์ต์
์ฌ์ฉ" -#: apply.c:836 +#: apply.c:845 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "ํ์์คํฌํ ์ ๊ท์์ ์ค๋นํ ์ ์์ต๋๋ค (%s)" -#: apply.c:845 +#: apply.c:854 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec()์์ ๋ค์ ์
๋ ฅ์ ๋ํด %d๋ฒ์ ๋ฆฌํดํ์ต๋๋ค: %s" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "unable to find filename in patch at line %d" msgstr "ํจ์น์ %d๋ฒ ์ค์ ํ์ผ ์ด๋ฆ์ ์ฐพ์ ์ ์์ต๋๋ค" -#: apply.c:967 +#: apply.c:966 #, 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:973 +#: apply.c:972 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ์๋ชป๋ git-diff - %d๋ฒ ์ค์ ์ ํ์ผ ์ด๋ฆ์ด ์ฌ๋ฐ๋ฅด์ง ์์ต๋๋ค" -#: apply.c:974 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ์๋ชป๋ git-diff - %d๋ฒ ์ค์ ์์ ํ์ผ ์ด๋ฆ์ด ์ฌ๋ฐ๋ฅด์ง ์์ต๋๋ค" -#: apply.c:979 +#: apply.c:978 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ์๋ชป๋ git-diff - %d๋ฒ ์ค์์ /dev/null์ ๊ธฐ๋ํ์ต๋๋ค" -#: apply.c:1008 +#: apply.c:1007 #, c-format msgid "invalid mode on line %d: %s" msgstr "%d๋ฒ ์ค์ ์๋ชป๋ ๋ชจ๋: %s" -#: apply.c:1326 +#: apply.c:1325 #, c-format msgid "inconsistent header lines %d and %d" msgstr "์ผ๊ด์ฑ ์๋ ํค๋ ์ค %d๋ฒ ๋ฐ %d๋ฒ" -#: apply.c:1498 +#: apply.c:1497 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: ์์์น ๋ชปํ ์ค: %.*s" -#: apply.c:1567 +#: apply.c:1566 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "%d๋ฒ ์ค์ ํค๋ ์๋ ํจ์น ๋ถ๋ถ: %.*s" -#: apply.c:1587 +#: apply.c:1586 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -251,81 +251,81 @@ msgstr[0] "" "๊ฒฝ๋ก ์ด๋ฆ ๋ถ๋ถ์์ %d๊ฐ๋ฅผ ์ ๊ฑฐ๋ผ ๋ git diff ํค๋์ ํ์ผ ์ด๋ฆ ์ ๋ณด๊ฐ ์์ต๋" "๋ค. (%d๋ฒ ์ค)" -#: apply.c:1600 +#: apply.c:1599 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff ํค๋์ ํ์ผ ์ด๋ฆ ์ ๋ณด๊ฐ ์์ต๋๋ค (%d๋ฒ ์ค)" -#: apply.c:1770 +#: apply.c:1787 msgid "new file depends on old contents" msgstr "์ ํ์ผ์ด ์์ ๋ด์ฉ์ ์์กดํฉ๋๋ค" -#: apply.c:1772 +#: apply.c:1789 msgid "deleted file still has contents" msgstr "์ญ์ ํ ํ์ผ์ ์์ง ๋ด์ฉ์ด ๋ค์ด ์์ต๋๋ค" -#: apply.c:1806 +#: apply.c:1823 #, c-format msgid "corrupt patch at line %d" msgstr "ํจ์น๊ฐ %d๋ฒ ์ค์์ ๋ง๊ฐ์ก์ต๋๋ค" -#: apply.c:1843 +#: apply.c:1860 #, c-format msgid "new file %s depends on old contents" msgstr "์ ํ์ผ %s์ด(๊ฐ) ์์ ๋ด์ฉ์ ์์กดํฉ๋๋ค" -#: apply.c:1845 +#: apply.c:1862 #, c-format msgid "deleted file %s still has contents" msgstr "์ญ์ ํ ํ์ผ %s์ด(๊ฐ) ์์ง ๋ด์ฉ์ด ๋ค์ด ์์ต๋๋ค" -#: apply.c:1848 +#: apply.c:1865 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** ๊ฒฝ๊ณ : %s ํ์ผ์ ๋ด์ฉ์ด ๋น์ด ์์ง๋ง ์ญ์ ๋์ง ์์์ต๋๋ค" -#: apply.c:1995 +#: apply.c:2012 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "%d๋ฒ ์ค์ ๋ฐ์ด๋๋ฆฌ ํจ์น๊ฐ ์์๋์์ต๋๋ค: %.*s" -#: apply.c:2032 +#: apply.c:2049 #, c-format msgid "unrecognized binary patch at line %d" msgstr "%d๋ฒ ์ค์ ๋ฐ์ด๋๋ฆฌ ํจ์น๊ฐ ์ดํดํ ์ ์์ต๋๋ค" -#: apply.c:2193 +#: apply.c:2209 #, c-format msgid "patch with only garbage at line %d" msgstr "%d๋ฒ ์ค์ ์ฐ๋ ๊ธฐ ๋ฐ์ดํฐ๋ง ์๋ ํจ์น" -#: apply.c:2276 +#: apply.c:2295 #, c-format msgid "unable to read symlink %s" msgstr "%s ์ฌ๋ณผ๋ฆญ ๋งํฌ๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: apply.c:2280 +#: apply.c:2299 #, c-format msgid "unable to open or read %s" msgstr "%s์(๋ฅผ) ์ด๊ฑฐ๋ ์ฝ์ ์ ์์ต๋๋ค" -#: apply.c:2933 +#: apply.c:2958 #, c-format msgid "invalid start of line: '%c'" msgstr "์ค ์์์ด ์๋ชป๋จ: '%c'" -#: apply.c:3052 +#: apply.c:3077 #, 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:3064 +#: apply.c:3089 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "์ปจํ
์คํธ๊ฐ (%ld/%ld)๋ก ์ค์ด๋ญ๋๋ค. (%d๋ฒ ์ค์์ ์ ์ฉ)" -#: apply.c:3070 +#: apply.c:3095 #, c-format msgid "" "while searching for:\n" @@ -334,438 +334,439 @@ msgstr "" "๋ค์์ ๊ฒ์ํ๋ ์ค:\n" "%.*s" -#: apply.c:3092 +#: apply.c:3117 #, c-format msgid "missing binary patch data for '%s'" msgstr "'%s'์ ๋ํ ๋ฐ์ด๋๋ฆฌ ํจ์น ๋ฐ์ดํฐ๊ฐ ์์ต๋๋ค" -#: apply.c:3100 +#: apply.c:3125 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "๋ฐ๋ ํํฌ๊ฐ ์์ผ๋ฉด '%s'์ ๋ํ ๋ฐ์ด๋๋ฆฌ ํจ์น๋ฅผ ๋ฐ๋๋ก ์ ์ฉํ ์ ์์ต๋๋ค" -#: apply.c:3146 +#: apply.c:3171 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "์ ์ฒด ์ธ๋ฑ์ค ๋ผ์ธ์ด ์์ผ๋ฉด '%s'์ ๋ํ ๋ฐ์ด๋๋ฆฌ ํจ์น๋ฅผ ์ ์ฉํ ์ ์์ต๋๋ค" -#: apply.c:3156 +#: apply.c:3181 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "ํจ์น๊ฐ '%s'(%s)์ ์ ์ฉ๋์ง๋ง, ํ์ฌ ๋ด์ฉ๊ณผ ์ผ์นํ์ง ์์ต๋๋ค." -#: apply.c:3164 +#: apply.c:3189 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "ํจ์น๋ ๋น '%s'์ ์ ์ฉ๋์ง๋ง, ํ์ฌ ๋น์ด ์์ง ์์ต๋๋ค" -#: apply.c:3182 +#: apply.c:3207 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "'%2$s'์ ๋ํ ํ์ํ %1$s ํฌ์คํธ์ด๋ฏธ์ง๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: apply.c:3195 +#: apply.c:3220 #, c-format msgid "binary patch does not apply to '%s'" msgstr "๋ฐ์ด๋๋ฆฌ ํจ์น๋ฅผ '%s'์ ์ ์ฉํ ์ ์์ต๋๋ค" -#: apply.c:3201 +#: apply.c:3226 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "'%s'์ ๋ํ ๋ฐ์ด๋๋ฆฌ ํจ์น๊ฐ ์ฌ๋ฐ๋ฅด์ง ์์ ๊ฒฐ๊ณผ๋ฅผ ๋ง๋ญ๋๋ค. (๊ธฐ๋ํ ๊ฐ %s, ์ค" "์ %s)" -#: apply.c:3222 +#: apply.c:3247 #, c-format msgid "patch failed: %s:%ld" msgstr "ํจ์น ์คํจ: %s:%ld" -#: apply.c:3344 +#: apply.c:3369 #, c-format msgid "cannot checkout %s" msgstr "%s์(๋ฅผ) ๊ฐ์ ธ์ฌ ์ ์์ต๋๋ค" -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 #, c-format msgid "failed to read %s" msgstr "%s์(๋ฅผ) ์ฝ๋๋ฐ ์คํจํ์ต๋๋ค" -#: apply.c:3400 +#: apply.c:3426 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "์ฌ๋ณผ๋ฆญ ๋งํฌ ๋ค์ ์๋ '%s' ์ฝ๊ธฐ" -#: apply.c:3429 apply.c:3669 +#: apply.c:3455 apply.c:3695 #, c-format msgid "path %s has been renamed/deleted" msgstr "%s ๊ฒฝ๋ก๊ฐ ์ด๋ฆ์ด ๋ฐ๋์๊ฑฐ๋ ์ญ์ ๋์์ต๋๋ค" -#: apply.c:3512 apply.c:3683 +#: apply.c:3538 apply.c:3709 #, c-format msgid "%s: does not exist in index" msgstr "%s: ์ธ๋ฑ์ค์ ์์ต๋๋ค" -#: apply.c:3521 apply.c:3691 +#: apply.c:3547 apply.c:3717 #, c-format msgid "%s: does not match index" msgstr "%s: ์ธ๋ฑ์ค์ ๋ง์ง ์์ต๋๋ค" -#: apply.c:3556 +#: apply.c:3582 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "์ ์ฅ์์ 3-๋ฐฉํฅ ๋ณํฉ์ผ๋ก ๋์ ํ ๋ ํ์ํ ๋ธ๋กญ์ด ์์ต๋๋ค." -#: apply.c:3559 +#: apply.c:3585 #, c-format msgid "Falling back to three-way merge...\n" msgstr "3-๋ฐฉํฅ ๋ณํฉ์ผ๋ก ๋์ ํฉ๋๋ค...\n" -#: apply.c:3575 apply.c:3579 +#: apply.c:3601 apply.c:3605 #, c-format msgid "cannot read the current contents of '%s'" msgstr "'%s'์ ํ์ฌ ๋ด์ฉ์ ์ฝ์ ์ ์์ต๋๋ค" -#: apply.c:3591 +#: apply.c:3617 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "3-๋ฐฉํฅ ๋ณํฉ์ผ๋ก ๋์ ํ๋๋ฐ ์คํจํ์ต๋๋ค...\n" -#: apply.c:3605 +#: apply.c:3631 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "ํจ์น๋ฅผ '%s'์ ์ถฉ๋์ด ์๋ ์ํ๋ก ์ ์ฉ.\n" -#: apply.c:3610 +#: apply.c:3636 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "ํจ์น๋ฅผ '%s'์ ํจ์น ๋ฌธ์ ์์ด ์ ์ฉ.\n" -#: apply.c:3636 +#: apply.c:3662 msgid "removal patch leaves file contents" msgstr "์ ๊ฑฐํ๋ ํจ์น ๋ค์์ ํ์ผ ๋ด์ฉ์ด ๋จ์์ต๋๋ค" -#: apply.c:3708 +#: apply.c:3734 #, c-format msgid "%s: wrong type" msgstr "%s: ์๋ชป๋ ์ข
๋ฅ" -#: apply.c:3710 +#: apply.c:3736 #, c-format msgid "%s has type %o, expected %o" msgstr "%s์ ์ข
๋ฅ๊ฐ %o์ด์ง๋ง %o์ด(๊ฐ) ๋์ด์ผ ํฉ๋๋ค" -#: apply.c:3860 apply.c:3862 +#: apply.c:3886 apply.c:3888 #, c-format msgid "invalid path '%s'" msgstr "์๋ชป๋ ๊ฒฝ๋ก '%s'" -#: apply.c:3918 +#: apply.c:3944 #, c-format msgid "%s: already exists in index" msgstr "%s: ์ด๋ฏธ ์ธ๋ฑ์ค์ ์์ต๋๋ค" -#: apply.c:3921 +#: apply.c:3947 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ์ด๋ฏธ ์์
๋๋ ํฐ๋ฆฌ์ ์์ต๋๋ค" -#: apply.c:3941 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s์ ์ ๋ชจ๋(%1$o)๊ฐ ์์ ๋ชจ๋(%3$o)์ ๋ค๋ฆ
๋๋ค" -#: apply.c:3946 +#: apply.c:3972 #, 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:3966 +#: apply.c:3992 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "์ํฅ ๋ฐ๋ '%s' ํ์ผ์ด ์ฌ๋ณผ๋ฆญ ๋งํฌ ๋ค์ ์์ต๋๋ค" -#: apply.c:3970 +#: apply.c:3996 #, c-format msgid "%s: patch does not apply" msgstr "%s: ํจ์น๋ฅผ ์ ์ฉํ์ง ์์ต๋๋ค" -#: apply.c:3985 +#: apply.c:4011 #, c-format msgid "Checking patch %s..." msgstr "%s ํจ์น๋ฅผ ํ์ธํ๋ ์ค์
๋๋ค..." -#: apply.c:4076 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1 ์ ๋ณด๊ฐ ์๊ฑฐ๋ %s ํ์ ๋ชจ๋์์ ์ธ ์ ์์ต๋๋ค" -#: apply.c:4083 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s์ ๋ํ ๋ชจ๋ ๋ณ๊ฒฝ์ด์ง๋ง, ํ์ฌ HEAD์ ์์ต๋๋ค" -#: apply.c:4086 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 ์ ๋ณด๊ฐ ์๊ฑฐ๋ ์ธ ์ ์์ต๋๋ค (%s)." -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "๊ฒฝ๋ก '%s'์ ๋ํด make_cache_entry ์คํจ" -#: apply.c:4095 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "์์ ์ธ๋ฑ์ค์ %s ํญ๋ชฉ์ ์ถ๊ฐํ ์ ์์ต๋๋ค" -#: apply.c:4105 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "์์ ์ธ๋ฑ์ค๋ฅผ %s์ ์ธ ์ ์์ต๋๋ค" -#: apply.c:4243 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "์ธ๋ฑ์ค์์ %s์(๋ฅผ) ์ ๊ฑฐํ ์ ์์ต๋๋ค" -#: apply.c:4278 +#: apply.c:4304 #, c-format msgid "corrupt patch for submodule %s" msgstr "ํ์ ๋ชจ๋ %s์ ๋ํด ์์๋ ํจ์น" -#: apply.c:4284 +#: apply.c:4310 #, c-format msgid "unable to stat newly created file '%s'" msgstr "์๋ก ๋ง๋ ํ์ผ '%s'์ ๋ํด stat()ํ ์ ์์ต๋๋ค" -#: apply.c:4292 +#: apply.c:4318 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "์๋ก ๋ง๋ ํ์ผ '%s'์ ๋ํด ์๋น ์ ์ฅ์๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: apply.c:4298 apply.c:4442 +#: apply.c:4324 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "%s์ ๋ํด ์บ์ ํญ๋ชฉ์ ์ถ๊ฐํ ์ ์์ต๋๋ค" -#: apply.c:4339 +#: apply.c:4365 #, c-format msgid "failed to write to '%s'" msgstr "'%s'์ ์ฐ๋๋ฐ ์คํจํ์ต๋๋ค" -#: apply.c:4343 +#: apply.c:4369 #, c-format msgid "closing file '%s'" msgstr "'%s' ํ์ผ์ ๋ซ๋ ์ค์
๋๋ค" -#: apply.c:4413 +#: apply.c:4439 #, c-format msgid "unable to write file '%s' mode %o" msgstr "'%s' ํ์ผ์ ์ธ ์ ์์ต๋๋ค ('%o' ๋ชจ๋)" -#: apply.c:4511 +#: apply.c:4537 #, c-format msgid "Applied patch %s cleanly." msgstr "%s ํจ์น ๊น๋ํ๊ฒ ์ ์ฉ." -#: apply.c:4519 +#: apply.c:4545 msgid "internal error" msgstr "๋ด๋ถ ์ค๋ฅ" -#: apply.c:4522 +#: apply.c:4548 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "%%s ํจ์น๋ฅผ (%d๊ฐ ๊ฑฐ๋ถ) ์ ์ฉ..." -#: apply.c:4533 +#: apply.c:4559 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncating .rej ํ์ผ ์ด๋ฆ์ '%.*s.rej'(์ผ)๋ก ์๋ฆ" -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 #, c-format msgid "cannot open %s" msgstr "%s์(๋ฅผ) ์ด ์ ์์ต๋๋ค" -#: apply.c:4555 +#: apply.c:4581 #, c-format msgid "Hunk #%d applied cleanly." msgstr "ํจ์น ๋ถ์ #%d ๊น๋ํ๊ฒ ์ ์ฉ." -#: apply.c:4559 +#: apply.c:4585 #, c-format msgid "Rejected hunk #%d." msgstr "ํจ์น ๋ถ์ #%d ๊ฑฐ๋ถ๋จ." -#: apply.c:4669 +#: apply.c:4695 #, c-format msgid "Skipped patch '%s'." msgstr "ํจ์น '%s' ๊ฑด๋๋." -#: apply.c:4677 +#: apply.c:4703 msgid "unrecognized input" msgstr "์ธ์ํ ์ ์๋ ์
๋ ฅ" -#: apply.c:4696 +#: apply.c:4722 msgid "unable to read index file" msgstr "์ธ๋ฑ์ค ํ์ผ์ ์ฝ์ ์ ์์ต๋๋ค" -#: apply.c:4833 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "'%s' ํจ์น๋ฅผ ์ด ์ ์์ต๋๋ค: %s" -#: apply.c:4860 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "๊ณต๋ฐฑ ์ค๋ฅ %d๊ฐ๋ฅผ ๋์ด๊ฐ๋๋ค" -#: apply.c:4866 apply.c:4881 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d๋ฒ ์ค์์ ๊ณต๋ฐฑ ์ค๋ฅ๋ฅผ ์ถ๊ฐํฉ๋๋ค." -#: apply.c:4874 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "๊ณต๋ฐฑ ์ค๋ฅ๋ฅผ ๋ฐ๋ก์ก์ ๋ค์ %d๋ฒ ์ค ์ ์ฉ." -#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "์ ์ธ๋ฑ์ค ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 #: git-add--interactive.perl:197 msgid "path" msgstr "๊ฒฝ๋ก" -#: apply.c:4922 +#: apply.c:4948 msgid "don't apply changes matching the given path" msgstr "์ฃผ์ด์ง ๊ฒฝ๋ก์ ํด๋นํ๋ ๋ณ๊ฒฝ ์ฌํญ์ ์ ์ฉํ์ง ์์ต๋๋ค" -#: apply.c:4925 +#: apply.c:4951 msgid "apply changes matching the given path" msgstr "์ฃผ์ด์ง ๊ฒฝ๋ก์ ํด๋นํ๋ ๋ณ๊ฒฝ ์ฌํญ์ ์ ์ฉํฉ๋๋ค" -#: apply.c:4927 builtin/am.c:2266 +#: apply.c:4953 builtin/am.c:2265 msgid "num" msgstr "๊ฐ์" -#: apply.c:4928 +#: apply.c:4954 msgid "remove <num> leading slashes from traditional diff paths" msgstr "์ ํต์ ์ธ diff ๊ฒฝ๋ก ์์ <๊ฐ์>๊ฐ์ ์ ์ฌ๋์(/)๋ฅผ ์ ๊ฑฐํฉ๋๋ค" -#: apply.c:4931 +#: apply.c:4957 msgid "ignore additions made by the patch" msgstr "ํจ์น์์ ์ถ๊ฐํ๋ ํ์ผ์ ๋ฌด์ํฉ๋๋ค" -#: apply.c:4933 +#: apply.c:4959 msgid "instead of applying the patch, output diffstat for the input" msgstr "ํจ์น๋ฅผ ์ ์ฉํ๋ ๋์ , ์
๋ ฅ์ ๋ํ diffstat์ ์ถ๋ ฅํฉ๋๋ค" -#: apply.c:4937 +#: apply.c:4963 msgid "show number of added and deleted lines in decimal notation" msgstr "์ญ์ง์๋ก ์ถ๊ฐ ๋ฐ ์ญ์ ํ ์ค ์๋ฅผ ํ์ํฉ๋๋ค" -#: apply.c:4939 +#: apply.c:4965 msgid "instead of applying the patch, output a summary for the input" msgstr "ํจ์น๋ฅผ ์ ์ฉํ๋ ๋์ , ์
๋ ฅ์ ๋ํ ์์ฝ์ ์ถ๋ ฅํฉ๋๋ค" -#: apply.c:4941 +#: apply.c:4967 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ํจ์น๋ฅผ ์ ์ฉํ๋ ๋์ , ํจ์น๋ฅผ ์ ์ฉ ๊ฐ๋ฅํ์ง ํ์ธํฉ๋๋ค" -#: apply.c:4943 +#: apply.c:4969 msgid "make sure the patch is applicable to the current index" msgstr "ํ์ฌ ์ธ๋ฑ์ค์์ ํจ์น๊ฐ ์ ์ฉ ๊ฐ๋ฅํ์ง ํ์ธํฉ๋๋ค" -#: apply.c:4945 +#: apply.c:4971 msgid "apply a patch without touching the working tree" msgstr "์์
ํด๋๋ฅผ ๋ฐ๊พธ์ง ์๊ณ ํจ์น๋ฅผ ์ ์ฉํฉ๋๋ค" -#: apply.c:4947 +#: apply.c:4973 msgid "accept a patch that touches outside the working area" msgstr "์์
์์ญ ๋ฐ์ ํ์ผ์ ๋ฐ๊พธ๋ ํจ์น๋ฅผ ํ์ฉํฉ๋๋ค" -#: apply.c:4949 +#: apply.c:4975 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "๊ทธ๋ฆฌ๊ณ ํจ์น๋ ์ ์ฉํฉ๋๋ค (--stat/--summary/--check ์ต์
๊ณผ ๊ฐ์ด ์ฌ์ฉ)" -#: apply.c:4951 +#: apply.c:4977 msgid "attempt three-way merge if a patch does not apply" msgstr "ํจ์น๋ฅผ ์ ์ฉํ์ง ์์ผ๋ฉด 3-๋ฐฉํฅ ๋ณํฉ์ ์๋ํฉ๋๋ค" -#: apply.c:4953 +#: apply.c:4979 msgid "build a temporary index based on embedded index information" msgstr "๋ด์ฅ ์ธ๋ฑ์ค ์ ๋ณด๋ฅผ ์ฌ์ฉํด ์์ ์ธ๋ฑ์ค๋ฅผ ๋ง๋ญ๋๋ค" -#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 msgid "paths are separated with NUL character" msgstr "๊ฒฝ๋ก๋ฅผ NUL ๋ฌธ์๋ก ๊ตฌ๋ถํฉ๋๋ค" -#: apply.c:4958 +#: apply.c:4984 msgid "ensure at least <n> lines of context match" msgstr "์ต์ํ <n>์ค์ด ์ปจํ
์คํธ์ ์ผ์นํ๋์ง ํ์ธํฉ๋๋ค" -#: apply.c:4959 builtin/am.c:2245 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 msgid "action" msgstr "๋์" -#: apply.c:4960 +#: apply.c:4986 msgid "detect new or modified lines that have whitespace errors" msgstr "๊ณต๋ฐฑ ์ค๋ฅ๊ฐ ์๋ ์ถ๊ฐ๋๊ฑฐ๋ ์์ ๋ ์ค์ ์ฐพ์ต๋๋ค" -#: apply.c:4963 apply.c:4966 +#: apply.c:4989 apply.c:4992 msgid "ignore changes in whitespace when finding context" msgstr "์ปจํ
์คํธ๋ฅผ ์ฐพ์ ๋ ๊ณต๋ฐฑ ๋ณ๊ฒฝ ์ฌํญ์ ๋ฌด์ํฉ๋๋ค" -#: apply.c:4969 +#: apply.c:4995 msgid "apply the patch in reverse" msgstr "ํจ์น๋ฅผ ๋ฐ๋ ์์๋ก ์ ์ฉํฉ๋๋ค" -#: apply.c:4971 +#: apply.c:4997 msgid "don't expect at least one line of context" msgstr "์ต์ํ์ ์ปจํ
์คํธ ํ ์ค๋ ์์ด ์ ์ฉํฉ๋๋ค" -#: apply.c:4973 +#: apply.c:4999 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "๊ฑฐ๋ถ๋ ํจ์น ๋ถ๋ถ์ ๋์๋๋ *.rej ํ์ผ์ ๋จ๊ฒจ๋ก๋๋ค" -#: apply.c:4975 +#: apply.c:5001 msgid "allow overlapping hunks" msgstr "ํจ์น ๋ถ๋ถ์ด ๊ฒน์ณ๋ ํ์ฉํฉ๋๋ค" -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "์์ธํ ํ์" -#: apply.c:4978 +#: apply.c:5004 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "ํ์ผ ๋์ ์ค๋ฐ๊ฟ์ด ๋น ์ก์์ ์๋ชป ๊ฒ์ํ ๊ฒฝ์ฐ์ ๋ฌด์ํฉ๋๋ค" -#: apply.c:4981 +#: apply.c:5007 msgid "do not trust the line counts in the hunk headers" msgstr "ํจ์น ๋ถ๋ถ์ ํค๋์ ์ค ์๋ฅผ ์ ์ฉํ์ง ์์ต๋๋ค" -#: apply.c:4983 builtin/am.c:2254 +#: apply.c:5009 builtin/am.c:2253 msgid "root" msgstr "์ต์์" -#: apply.c:4984 +#: apply.c:5010 msgid "prepend <root> to all filenames" msgstr "๋ชจ๋ ํ์ผ ์ด๋ฆ์ <์ต์์>๋ฅผ ์์ ๋ถ์
๋๋ค" @@ -788,108 +789,108 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <์ ์ฅ์> [--exec <๋ช
๋ น>] --list" -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "'%s' ๊ฒฝ๋ก๋ช
์ธ๊ฐ ์ด๋ค ํ์ผ๊ณผ๋ ์ผ์นํ์ง ์์ต๋๋ค" -#: archive.c:418 +#: archive.c:436 msgid "fmt" msgstr "ํ์" -#: archive.c:418 +#: archive.c:436 msgid "archive format" msgstr "์์ถ ํ์" -#: archive.c:419 builtin/log.c:1446 +#: archive.c:437 builtin/log.c:1452 msgid "prefix" msgstr "์ ๋์ด" -#: archive.c:420 +#: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "์์นด์ด๋ธ์ ๊ฐ ๊ฒฝ๋ก ์ด๋ฆ์ ์์ ์ง์ ํ ๊ฒฝ๋ก๋ฅผ ๋ถ์
๋๋ค" -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "ํ์ผ" -#: archive.c:422 builtin/archive.c:89 +#: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "์์นด์ด๋ธ๋ฅผ ์ด ํ์ผ์ ์๋๋ค" -#: archive.c:424 +#: archive.c:442 msgid "read .gitattributes in working directory" msgstr "์์
ํด๋์ .gitattributes๋ฅผ ์ฝ์ต๋๋ค" -#: archive.c:425 +#: archive.c:443 msgid "report archived files on stderr" msgstr "์์นด์ด๋ธ์ ํฌํจ๋ ํ์ผ์ ํ์ค์ค๋ฅ๋ก ํ์ํฉ๋๋ค" -#: archive.c:426 +#: archive.c:444 msgid "store only" msgstr "์ ์ฅ๋ง ํ๊ธฐ" -#: archive.c:427 +#: archive.c:445 msgid "compress faster" msgstr "๋ ๋น ๋ฅด๊ฒ ์์ถ" -#: archive.c:435 +#: archive.c:453 msgid "compress better" msgstr "๋ ์๊ฒ ์์ถ" -#: archive.c:438 +#: archive.c:456 msgid "list supported archive formats" msgstr "์ง์ํ๋ ์์ถ ํ์์ ๋ชฉ๋ก์ ํ์ํฉ๋๋ค" -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 msgid "repo" msgstr "์ ์ฅ์" -#: archive.c:441 builtin/archive.c:91 +#: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "์๊ฒฉ ์ ์ฅ์ <์ ์ฅ์>์์ ์์นด์ด๋ธ๋ฅผ ๊ฐ์ ธ์ต๋๋ค" -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "๋ช
๋ น" -#: archive.c:443 builtin/archive.c:93 +#: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "์๊ฒฉ git-upload-archive ๋ช
๋ น์ ๊ฒฝ๋ก" -#: archive.c:450 +#: archive.c:468 msgid "Unexpected option --remote" msgstr "์์์น ๋ชปํ ์ต์
--remote" -#: archive.c:452 +#: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "--exec ์ต์
์ --remote ์ต์
๊ณผ ๊ฐ์ด ์ฌ์ฉํ ๊ฒฝ์ฐ์๋ง ์ธ ์ ์์ต๋๋ค." -#: archive.c:454 +#: archive.c:472 msgid "Unexpected option --output" msgstr "์์์น ๋ชปํ ์ต์
--output" -#: archive.c:476 +#: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "์ ์ ์๋ ์์นด์ด๋ธ ํ์ '%s'" -#: archive.c:483 +#: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "'%s' ํ์์์๋ ์ง์ํ์ง ์๋ ์ธ์: -%d" -#: attr.c:214 +#: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s์(๋) ์ฌ๋ฐ๋ฅธ ์์ฑ ์ด๋ฆ์ด ์๋๋๋ค" -#: attr.c:410 +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -966,31 +967,31 @@ msgstr "" msgid "Bisecting: a merge base must be tested\n" msgstr "์ด๋ฑ๋ถ: ๋ณํฉ ๋ฒ ์ด์ค๋ฅผ ์ํํด์ผ ํฉ๋๋ค\n" -#: bisect.c:849 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "ํ๋์ %s ๋ฆฌ๋น์ ์ด ํ์ํฉ๋๋ค" -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "'%s' ํ์ผ์ ๋ง๋ค ์ ์์ต๋๋ค" -#: bisect.c:917 +#: bisect.c:918 #, c-format msgid "could not read file '%s'" msgstr "'%s' ํ์ผ์ ์ฝ์ ์ ์์ต๋๋ค" -#: bisect.c:947 +#: bisect.c:948 msgid "reading bisect refs failed" msgstr "์ด๋ฑ๋ถ ๋ ํผ๋ฐ์ค ์ฝ๊ธฐ์ ์คํจํ์ต๋๋ค" -#: bisect.c:967 +#: bisect.c:968 #, c-format msgid "%s was both %s and %s\n" msgstr "%s์(๋) %s ๋ฐ %s ๋ชจ๋์ ํด๋น๋ฉ๋๋ค\n" -#: bisect.c:975 +#: bisect.c:976 #, c-format msgid "" "No testable commit found.\n" @@ -999,7 +1000,7 @@ msgstr "" "์ํ ๊ฐ๋ฅํ ์ปค๋ฐ์ด ์์ต๋๋ค.\n" "์๋ชป๋๋ ๊ฒฝ๋ก ํ๋ผ๋ฏธํฐ๋ก ์์ํ์ง ์์์ต๋๊น?\n" -#: bisect.c:994 +#: bisect.c:995 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1008,7 +1009,7 @@ msgstr[0] "(๋๋ต %d ๋จ๊ณ)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1000 +#: bisect.c:1001 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1027,10 +1028,10 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse ๋ฐ --first-parent ์ต์
์ ๊ฐ์ด ์ฐ๋ฉด ์ต๊ทผ ์ปค๋ฐ์ ์ง์ ํด์ผ ํฉ๋๋ค" -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 -#: builtin/shortlog.c:177 +#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "๋ฆฌ๋น์ walk ์ค๋น๊ฐ ์คํจํ์ต๋๋ค" @@ -1071,48 +1072,43 @@ msgstr "%s ๋ธ๋์น๋ฅผ ์์ ์ ์
์คํธ๋ฆผ์ผ๋ก ์ง์ ํ์ง ์์." #: branch.c:93 #, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." -msgstr "" -"%s ๋ธ๋์น๊ฐ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ํตํด ๋ฆฌ๋ชจํธ์ %s ๋ธ๋์น๋ฅผ (%s์์) ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์" -"์ต๋๋ค." +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." +msgstr "'%s' ๋ธ๋์น๊ฐ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ํตํด ๋ฆฌ๋ชจํธ์ '%s' ๋ธ๋์น๋ฅผ ('%s'์์) ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." #: branch.c:94 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." -msgstr "%s ๋ธ๋์น๊ฐ ๋ฆฌ๋ชจํธ์ %s ๋ธ๋์น๋ฅผ (%s์์) ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +msgstr "'%s' ๋ธ๋์น๊ฐ ๋ฆฌ๋ชจํธ์ '%s' ๋ธ๋์น๋ฅผ ('%s'์์) ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." #: branch.c:98 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "" -"%s ๋ธ๋์น๊ฐ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ํตํด ๋ฆฌ๋ชจํธ์ %s ๋ธ๋์น๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." +msgid "Branch '%s' set up to track local branch '%s' by rebasing." +msgstr "'%s' ๋ธ๋์น๊ฐ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ํตํด ๋ฆฌ๋ชจํธ์ '%s' ๋ธ๋์น๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." #: branch.c:99 #, c-format -msgid "Branch %s set up to track local branch %s." -msgstr "%s ๋ธ๋์น๊ฐ %s ๋ธ๋์น๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." +msgid "Branch '%s' set up to track local branch '%s'." +msgstr "'%s' ๋ธ๋์น๊ฐ '%s' ๋ธ๋์น๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." #: branch.c:104 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." -msgstr "" -"%s ๋ธ๋์น๊ฐ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ํตํด ๋ฆฌ๋ชจํธ์ %s ๋ ํผ๋ฐ์ค๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +msgstr "'%s' ๋ธ๋์น๊ฐ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ํตํด ๋ฆฌ๋ชจํธ์ '%s' ๋ ํผ๋ฐ์ค๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." #: branch.c:105 #, c-format -msgid "Branch %s set up to track remote ref %s." -msgstr "%s ๋ธ๋์น๊ฐ ๋ฆฌ๋ชจํธ์ %s ๋ ํผ๋ฐ์ค๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." +msgid "Branch '%s' set up to track remote ref '%s'." +msgstr "'%s' ๋ธ๋์น๊ฐ ๋ฆฌ๋ชจํธ์ '%s' ๋ ํผ๋ฐ์ค๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." #: branch.c:109 #, c-format -msgid "Branch %s set up to track local ref %s by rebasing." -msgstr "" -"%s ๋ธ๋์น๊ฐ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ํตํด ๋ก์ปฌ์ %s ๋ ํผ๋ฐ์ค๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." +msgid "Branch '%s' set up to track local ref '%s' by rebasing." +msgstr "'%s' ๋ธ๋์น๊ฐ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ํตํด ๋ก์ปฌ์ '%s' ๋ ํผ๋ฐ์ค๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." #: branch.c:110 #, c-format -msgid "Branch %s set up to track local ref %s." -msgstr "%s ๋ธ๋์น๊ฐ ๋ก์ปฌ์ %s ๋ ํผ๋ฐ์ค๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." +msgid "Branch '%s' set up to track local ref '%s'." +msgstr "'%s' ๋ธ๋์น๊ฐ ๋ก์ปฌ์ '%s' ๋ ํผ๋ฐ์ค๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ก ์ค์ ๋์์ต๋๋ค." #: branch.c:119 msgid "Unable to write upstream branch configuration" @@ -1133,22 +1129,22 @@ msgstr "'%s'์(๋) ์ฌ๋ฐ๋ฅธ ๋ธ๋์น ์ด๋ฆ์ด ์๋๋๋ค." msgid "A branch named '%s' already exists." msgstr "์ด๋ฆ์ด '%s'์ธ ๋ธ๋์น๊ฐ ์ด๋ฏธ ์์ต๋๋ค." -#: branch.c:198 +#: branch.c:197 msgid "Cannot force update the current branch." msgstr "ํ์ฌ ๋ธ๋์น๋ฅผ ๊ฐ์ ๋ก ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค." -#: branch.c:218 +#: branch.c:217 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "๋ฐ๋ผ๊ฐ๊ธฐ ์ ๋ณด๋ฅผ ์ค์ ํ ์ ์์ต๋๋ค. ์์ ์์น '%s'์ด(๊ฐ) ๋ธ๋์น๊ฐ ์๋๋๋ค." -#: branch.c:220 +#: branch.c:219 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "์์ฒญํ ์
์คํธ๋ฆผ '%s' ๋ธ๋์น๊ฐ ์์ต๋๋ค" -#: branch.c:222 +#: branch.c:221 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1166,22 +1162,22 @@ msgstr "" "์ ๋ก์ปฌ ๋ธ๋์น๋ฅผ ๊ฑฐ๊ธฐ์ ํด๋นํ๋ ๋ฆฌ๋ชจํธ ๋ธ๋์น๋ก pushํ๋ ค๋ฉด,\n" "\"git push -u\"๋ก pushํ๋ ์
์คํธ๋ฆผ์ ์ค์ ํ ์ ์์ต๋๋ค." -#: branch.c:265 +#: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "์ฌ๋ฐ๋ฅธ ์ค๋ธ์ ํธ ์ด๋ฆ์ด ์๋๋๋ค: '%s'." -#: branch.c:285 +#: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "์ ๋งคํ ์ค๋ธ์ ํธ ์ด๋ฆ: '%s'." -#: branch.c:290 +#: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "์ฌ๋ฐ๋ฅธ ๋ธ๋์น ์์น๊ฐ ์๋๋๋ค: '%s'." -#: branch.c:344 +#: branch.c:343 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s'์(๋) ์ด๋ฏธ '%s' ์์น์ ๋ฐ์์ ธ ์์ต๋๋ค" @@ -1201,7 +1197,9 @@ msgstr "'%s' ํ์ผ์ด ๋ฒ์ 2 ๋ฒ๋ค ํ์ผ๋ก ๋ณด์ด์ง ์์ต๋๋ค" msgid "unrecognized header: %s%s (%d)" msgstr "์ธ์ํ ์ ์๋ ํค๋: %s%s (%d)" -#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 +#: sequencer.c:2949 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "'%s'์(๋ฅผ) ์ด ์ ์์ต๋๋ค" @@ -1210,54 +1208,54 @@ msgstr "'%s'์(๋ฅผ) ์ด ์ ์์ต๋๋ค" msgid "Repository lacks these prerequisite commits:" msgstr "์ ์ฅ์์ ํ์์ ์ธ ๋ค์ ์ปค๋ฐ์ด ์์ต๋๋ค:" -#: bundle.c:186 +#: bundle.c:193 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "๋ฒ๋ค์ ๋ค์ ๋ ํผ๋ฐ์ค %d๊ฐ๊ฐ ์์ต๋๋ค:" -#: bundle.c:193 +#: bundle.c:200 msgid "The bundle records a complete history." msgstr "๋ฒ๋ค์ ์ ์ฒด ์ปค๋ฐ ๋ด์ญ์ ๊ธฐ๋กํฉ๋๋ค." -#: bundle.c:195 +#: bundle.c:202 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "๋ฒ๋ค์ ๋ค์ ๋ ํผ๋ฐ์ค %d๊ฐ๊ฐ ํ์ํฉ๋๋ค:" -#: bundle.c:254 +#: bundle.c:261 msgid "Could not spawn pack-objects" msgstr "pack-objects ๋ช
๋ น์ ์คํํ ์ ์์ต๋๋ค" -#: bundle.c:265 +#: bundle.c:272 msgid "pack-objects died" msgstr "pack-objects ๋ช
๋ น์ด ์ฃฝ์์ต๋๋ค" -#: bundle.c:307 +#: bundle.c:314 msgid "rev-list died" msgstr "rev-list ๋ช
๋ น์ด ์ฃฝ์์ต๋๋ค" -#: bundle.c:356 +#: bundle.c:363 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "rev-list ์ต์
์์ '%s' ๋ ํผ๋ฐ์ค๊ฐ ์ ์ธ๋์์ต๋๋ค" -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "์ ์ ์๋ ์ธ์: %s" -#: bundle.c:454 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "๋น ๋ฒ๋ค์ ๋ง๋ค์ง ์์ต๋๋ค." -#: bundle.c:466 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "'%s'์(๋ฅผ) ๋ง๋ค ์ ์์ต๋๋ค" -#: bundle.c:494 +#: bundle.c:501 msgid "index-pack died" msgstr "index-pack ๋ช
๋ น์ด ์ฃฝ์์ต๋๋ค" @@ -1266,8 +1264,8 @@ msgstr "index-pack ๋ช
๋ น์ด ์ฃฝ์์ต๋๋ค" msgid "invalid color value: %.*s" msgstr "์๋ชป๋ ์ ๊ฐ: %.*s" -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 -#: builtin/am.c:1469 builtin/am.c:2107 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1467 builtin/am.c:2105 #, c-format msgid "could not parse %s" msgstr "parse %s์(๋ฅผ) ํ์ฑํ ์ ์์ต๋๋ค" @@ -1277,7 +1275,7 @@ msgstr "parse %s์(๋ฅผ) ํ์ฑํ ์ ์์ต๋๋ค" msgid "%s %s is not a commit!" msgstr "%s %s, ์ปค๋ฐ์ด ์๋๋๋ค" -#: commit.c:1511 +#: commit.c:1517 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" @@ -1291,152 +1289,152 @@ msgstr "" msgid "memory exhausted" msgstr "๋ฉ๋ชจ๋ฆฌ ๋ฐ๋ฅ๋จ" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "์๋ ๊ฒฝ๋ก ์ค์ include ์กฐ๊ฑด์ ํ์ผ์์ ์์ผ ํฉ๋๋ค" -#: config.c:720 +#: config.c:721 #, c-format msgid "bad config line %d in blob %s" msgstr "๋ธ๋กญ %2$s ์์ %1$d๋ฒ ์ค์ ์๋ชป๋ ์ค์ " -#: config.c:724 +#: config.c:725 #, c-format msgid "bad config line %d in file %s" msgstr "ํ์ผ %2$s ์์ %1$d๋ฒ ์ค์ ์๋ชป๋ ์ค์ " -#: config.c:728 +#: config.c:729 #, c-format msgid "bad config line %d in standard input" msgstr "ํ์ค ์
๋ ฅ ์์ %d๋ฒ ์ค์ ์๋ชป๋ ์ค์ " -#: config.c:732 +#: config.c:733 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ํ์ ๋ชจ๋ ๋ธ๋กญ %2$s ์์ %1$d๋ฒ ์ค์ ์๋ชป๋ ์ค์ " -#: config.c:736 +#: config.c:737 #, c-format msgid "bad config line %d in command line %s" msgstr "๋ช
๋ นํ %2$s ์์ %1$d๋ฒ ์ค์ ์๋ชป๋ ์ค์ " -#: config.c:740 +#: config.c:741 #, c-format msgid "bad config line %d in %s" msgstr "%2$s ์์ %1$d๋ฒ ์ค์ ์๋ชป๋ ์ค์ " -#: config.c:868 +#: config.c:869 msgid "out of range" msgstr "๋ฒ์๋ฅผ ๋ฒ์ด๋จ" -#: config.c:868 +#: config.c:869 msgid "invalid unit" msgstr "๋จ์๊ฐ ์๋ชป๋จ" -#: config.c:874 +#: config.c:875 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "์๋ชป๋ ์์น ์ค์ ๊ฐ '%s' (ํค '%s'): %s" -#: config.c:879 +#: config.c:880 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "์๋ชป๋ ์์น ์ค์ ๊ฐ '%s' (ํค '%s', ๋ธ๋กญ %s): %s" -#: config.c:882 +#: config.c:883 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "์๋ชป๋ ์์น ์ค์ ๊ฐ '%s' (ํค '%s', ํ์ผ %s): %s" -#: config.c:885 +#: config.c:886 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "์๋ชป๋ ์์น ์ค์ ๊ฐ '%s' (ํค '%s', ํ์ค์
๋ ฅ): %s" -#: config.c:888 +#: config.c:889 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "์๋ชป๋ ์์น ์ค์ ๊ฐ '%s' (ํค '%s', ํ์ ๋ชจ๋ ๋ธ๋กญ %s): %s" -#: config.c:891 +#: config.c:892 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "์๋ชป๋ ์์น ์ค์ ๊ฐ '%s' (ํค '%s', ๋ช
๋ นํ %s): %s" -#: config.c:894 +#: config.c:895 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "์๋ชป๋ ์์น ์ค์ ๊ฐ '%s' (ํค '%s', %s ์์): %s" -#: config.c:989 +#: config.c:990 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "๋ค์์ ์ฌ์ฉ์ ๋๋ ํฐ๋ฆฌ ํ์ฅ์ ์คํจ: '%s'" -#: config.c:1084 config.c:1095 +#: config.c:1085 config.c:1096 #, c-format msgid "bad zlib compression level %d" msgstr "%d๋ฒ์ ์ฌ๋ฐ๋ฅธ zlib ์์ถ ๋จ๊ณ๊ฐ ์๋๋๋ค" -#: config.c:1212 +#: config.c:1213 #, c-format msgid "invalid mode for object creation: %s" msgstr "์ค๋ธ์ ํธ ์์ฑ ๋ชจ๋๊ฐ ์ฌ๋ฐ๋ฅด์ง ์์ต๋๋ค: %s" -#: config.c:1368 +#: config.c:1372 #, c-format msgid "bad pack compression level %d" msgstr "์๋ชป ๋ฌถ์ ์์ถ ๋จ๊ณ %d" -#: config.c:1564 +#: config.c:1568 msgid "unable to parse command-line config" msgstr "๋ช
๋ นํ ์ค์ ์ ํ์ฑํ ์ ์์ต๋๋ค" -#: config.c:1894 +#: config.c:1900 msgid "unknown error occurred while reading the configuration files" msgstr "์ค์ ํ์ผ์ ์ฝ๋ ์ค ์ ์ ์๋ ์ค๋ฅ๊ฐ ์๊ฒผ์ต๋๋ค" -#: config.c:2064 +#: config.c:2087 #, c-format msgid "Invalid %s: '%s'" msgstr "์๋ชป๋ %s: '%s'" -#: config.c:2085 +#: config.c:2130 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "์ ์ ์๋ core.untrackedCache ๊ฐ '%s'; ๊ธฐ๋ณธ๊ฐ์ผ๋ก 'keep' ์ฌ์ฉ" -#: config.c:2111 +#: config.c:2156 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange ๊ฐ('%d')์ 0์์ 100 ์ฌ์ด์ฌ์ผ ํฉ๋๋ค" -#: config.c:2122 +#: config.c:2167 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "๋ช
๋ นํ ์ค์ ์์ '%s'์(๋ฅผ) ์ค์ ํ ์ ์์ต๋๋ค" -#: config.c:2124 +#: config.c:2169 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "'%2$s' ํ์ผ์ %3$d๋ฒ ์ค '%1$s' ์ค์ ๋ณ์๊ฐ ์๋ชป๋์์ต๋๋ค" -#: config.c:2183 +#: config.c:2228 #, c-format msgid "%s has multiple values" msgstr "%s์(๋) ์ฌ๋ฌ ๊ฐ ๊ฐ์ด ์์ต๋๋ค" -#: config.c:2517 config.c:2745 +#: config.c:2571 config.c:2789 #, c-format msgid "fstat on %s failed" msgstr "%s์ ๋ํด fstat ์คํจ" -#: config.c:2635 +#: config.c:2678 #, c-format msgid "could not set '%s' to '%s'" msgstr "'%s'์(๋ฅผ) '%s'(์ผ)๋ก ์ค์ ํ ์ ์์ต๋๋ค" -#: config.c:2637 builtin/remote.c:775 +#: config.c:2680 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "'%s' ์ค์ ์ ์ง์ธ ์ ์์ต๋๋ค" @@ -1457,19 +1455,19 @@ msgstr "" "์ฌ๋ฐ๋ฅธ ์ ๊ทผ ๊ถํ์ด ์๋์ง, ๊ทธ๋ฆฌ๊ณ ์ ์ฅ์๊ฐ ์๋์ง\n" "ํ์ธํ์ญ์์ค." -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 msgid "Checking connectivity" msgstr "์ฐ๊ฒฐ์ ํ์ธํ๋ ์ค์
๋๋ค" -#: connected.c:75 +#: connected.c:76 msgid "Could not run 'git rev-list'" msgstr "'git rev-list'๋ฅผ ์คํํ ์ ์์ต๋๋ค" -#: connected.c:95 +#: connected.c:96 msgid "failed write to rev-list" msgstr "rev-list ์ฐ๊ธฐ์ ์คํจํ์ต๋๋ค" -#: connected.c:102 +#: connected.c:103 msgid "failed to close rev-list's stdin" msgstr "rev-list์ ํ์ค์
๋ ฅ์ ๋ซ๋๋ฐ ์คํจํ์ต๋๋ค" @@ -1569,27 +1567,33 @@ msgstr "'%s' ์์ ํ์ผ์ ์ฝ๋๋ฐ ์คํจํ์ต๋๋ค" msgid "Performing inexact rename detection" msgstr "๋ถ์ ํํ ์ด๋ฆ ๋ฐ๊พธ๊ธฐ ํ์์ ์ํํ๋ ์ค" -#: diff.c:63 +#: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "'%s' ์ต์
์๋ ๊ฐ์ด ํ์ํฉ๋๋ค" -#: diff.c:125 +#: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " dirstat ์๋ฆ ํผ์ผํธ ๊ฐ '%s' ํ์ฑ์ ์คํจํ์ต๋๋ค\n" -#: diff.c:130 +#: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " ์ ์ ์๋ dirstat ํ๋ผ๋ฏธํฐ '%s'\n" -#: diff.c:282 +#: diff.c:281 +msgid "" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " +"'plain'" +msgstr "์ฎ๊น ์ ์ค์ ์ 'no', 'default', 'zebra', 'dimmed_zebra', 'plain' ์ค์ ํ๋์
๋๋ค." + +#: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "'diff.submodule' ์ค์ ๋ณ์์ ์ ์ ์๋ ๊ฐ: '%s'" -#: diff.c:342 +#: diff.c:398 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1598,21 +1602,21 @@ msgstr "" "'diff.submodule' ์ค์ ๋ณ์์ ์ค๋ฅ:\n" "%s'" -#: diff.c:3101 +#: diff.c:3861 #, c-format msgid "external diff died, stopping at %s" msgstr "์ธ๋ถ diff ํ๋ก๊ทธ๋จ์ด ์ฃฝ์, %s ์์น์์ ๋ฉ์ถค" -#: diff.c:3427 +#: diff.c:4189 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "\"--name-only, --name-status, --check, -s ์ต์
์ค ํ๋๋ง ์ธ ์ ์์ต๋๋ค" -#: diff.c:3517 +#: diff.c:4279 msgid "--follow requires exactly one pathspec" msgstr "--follow ์ต์
์๋ ์ ํํ ํ๋์ ๊ฒฝ๋ก๋ช
์ธ๊ฐ ํ์ํฉ๋๋ค" -#: diff.c:3680 +#: diff.c:4445 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1621,226 +1625,230 @@ msgstr "" "--dirstat/-X ์ต์
ํ๋ผ๋ฏธํฐ๋ฅผ ํ์ฑํ๋๋ฐ ์คํจํ์ต๋๋ค:\n" "%s" -#: diff.c:3694 +#: diff.c:4459 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "--submodule ์ต์
ํ๋ผ๋ฏธํฐ ํ์ฑ์ ์คํจํ์ต๋๋ค: '%s'" -#: diff.c:4716 +#: diff.c:5505 msgid "inexact rename detection was skipped due to too many files." msgstr "ํ์ผ์ด ๋๋ฌด ๋ง์์ ๋ถ์ ํํ ์ด๋ฆ ๋ฐ๊พธ๊ธฐ ๊ฒ์ ๊ธฐ๋ฅ์ ๊ฑด๋๋๋๋ค." -#: diff.c:4719 +#: diff.c:5508 msgid "only found copies from modified paths due to too many files." msgstr "ํ์ผ์ด ๋๋ฌด ๋ง์์ ์์ ํ ๊ฒฝ๋ก์ ๋ณต์ฌ๋ณธ๋ง ์ฐพ์์ต๋๋ค." -#: diff.c:4722 +#: diff.c:5511 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "%s ๋ณ์๋ฅผ ์ต์ํ %d(์ผ)๋ก ์ค์ ํ๊ณ ๋ช
๋ น์ ๋ค์ ์๋ํด ๋ณด์ญ์์ค." -#: dir.c:1948 +#: dir.c:1983 msgid "failed to get kernel name and information" msgstr "์ปค๋ ์ด๋ฆ๊ณผ ์ ๋ณด๋ฅผ ๊ฐ์ ธ์ค๋๋ฐ ์คํจํ์ต๋๋ค" -#: dir.c:2067 +#: dir.c:2102 msgid "Untracked cache is disabled on this system or location." msgstr "์ด ์์คํ
๋๋ ์์น์์๋ ์ถ์ ๋์ง ์๋ ์บ์๋ฅผ ์ฌ์ฉํ์ง ์์ต๋๋ค." -#: dir.c:2846 dir.c:2851 +#: dir.c:2885 dir.c:2890 #, c-format msgid "could not create directories for %s" msgstr "%s์ ํ์ํ ๋๋ ํฐ๋ฆฌ๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: dir.c:2876 +#: dir.c:2915 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "'%s'์์ '%s'(์ผ)๋ก git ๋๋ ํฐ๋ฆฌ๋ฅผ ์ฎ๊ฒจ์ฌ ์ ์์ต๋๋ค" -#: entry.c:281 +#: entry.c:176 +msgid "Filtering content" +msgstr "๋ด์ฉ ํํฐ๋ง" + +#: entry.c:433 #, c-format msgid "could not stat file '%s'" msgstr "'%s' ํ์ผ์ stat์ ํ ์ ์์ต๋๋ค" -#: fetch-pack.c:251 +#: fetch-pack.c:252 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: ์์ ๋ชฉ๋ก์ ์์ํจ" -#: fetch-pack.c:263 +#: fetch-pack.c:264 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack: ACK/NAK๊ฐ ์์ผ ํ์ง๋ง, EOF๋ฅผ ๋ฐ์์ต๋๋ค" -#: fetch-pack.c:282 builtin/archive.c:63 +#: fetch-pack.c:283 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "๋ฆฌ๋ชจํธ ์ค๋ฅ: %s" -#: fetch-pack.c:283 +#: fetch-pack.c:284 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK๊ฐ ์์ผ ํ์ง๋ง, '%s'์(๋ฅผ) ๋ฐ์์ต๋๋ค" -#: fetch-pack.c:335 +#: fetch-pack.c:336 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc ์ต์
์ multi_ack_detailed๊ฐ ํ์ํฉ๋๋ค" -#: fetch-pack.c:421 +#: fetch-pack.c:422 #, c-format msgid "invalid shallow line: %s" msgstr "shallow ์ค์ด ์๋ชป๋จ: %s" -#: fetch-pack.c:427 +#: fetch-pack.c:428 #, c-format msgid "invalid unshallow line: %s" msgstr "unshallow ์ค์ด ์๋ชป๋จ: %s" -#: fetch-pack.c:429 +#: fetch-pack.c:430 #, c-format msgid "object not found: %s" msgstr "์ค๋ธ์ ํธ๊ฐ ์์ต๋๋ค: %s" -#: fetch-pack.c:432 +#: fetch-pack.c:433 #, c-format msgid "error in object: %s" msgstr "์ค๋ธ์ ํธ์ ์ค๋ฅ: %s" -#: fetch-pack.c:434 +#: fetch-pack.c:435 #, c-format msgid "no shallow found: %s" msgstr "shallow๊ฐ ์์ต๋๋ค: %s" -#: fetch-pack.c:437 +#: fetch-pack.c:438 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "shallow/unshallow๊ฐ ์์ผ ํ์ง๋ง, %s์(๋ฅผ) ๋ฐ์์ต๋๋ค" -#: fetch-pack.c:476 +#: fetch-pack.c:477 #, c-format msgid "got %s %d %s" msgstr "๋ฐ์: %s %d %s" -#: fetch-pack.c:490 +#: fetch-pack.c:491 #, c-format msgid "invalid commit %s" msgstr "์๋ชป๋ ์ปค๋ฐ %s" -#: fetch-pack.c:523 +#: fetch-pack.c:524 msgid "giving up" msgstr "ํฌ๊ธฐํจ" -#: fetch-pack.c:533 progress.c:237 +#: fetch-pack.c:534 progress.c:242 msgid "done" msgstr "์๋ฃ" -#: fetch-pack.c:545 +#: fetch-pack.c:546 #, c-format msgid "got %s (%d) %s" msgstr "๋ฐ์: %s (%d) %s" -#: fetch-pack.c:591 +#: fetch-pack.c:592 #, c-format msgid "Marking %s as complete" msgstr "%s ํญ๋ชฉ์ ์๋ฃ๋ก ํ์" -#: fetch-pack.c:775 +#: fetch-pack.c:776 #, c-format msgid "already have %s (%s)" msgstr "์ด๋ฏธ %s (%s) ์์" -#: fetch-pack.c:813 +#: fetch-pack.c:814 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: ์ฌ์ด๋๋ฐด๋ ๋๋ฉํฐํ๋ ์๋ฅผ forkํ ์ ์์ต๋๋ค" -#: fetch-pack.c:821 +#: fetch-pack.c:822 msgid "protocol error: bad pack header" msgstr "ํ๋กํ ์ฝ ์ค๋ฅ: ์๋ชป๋ ๋ฌถ์ ํค๋" -#: fetch-pack.c:877 +#: fetch-pack.c:878 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: %s ๋ช
๋ น์ forkํ ์ ์์ต๋๋ค" -#: fetch-pack.c:893 +#: fetch-pack.c:894 #, c-format msgid "%s failed" msgstr "%s ์คํจ" -#: fetch-pack.c:895 +#: fetch-pack.c:896 msgid "error in sideband demultiplexer" msgstr "์ฌ์ด๋๋ฐด๋ ๋๋ฉํฐํ๋ ์์ ์ค๋ฅ" -#: fetch-pack.c:922 +#: fetch-pack.c:923 msgid "Server does not support shallow clients" msgstr "์๋ฒ์์ shallow ํด๋ผ์ด์ธํธ๋ฅผ ์ง์ํ์ง ์์ต๋๋ค" -#: fetch-pack.c:926 +#: fetch-pack.c:927 msgid "Server supports multi_ack_detailed" msgstr "์๋ฒ์์ multi_ack_detailed๋ฅผ ์ง์ํฉ๋๋ค" -#: fetch-pack.c:929 +#: fetch-pack.c:930 msgid "Server supports no-done" msgstr "์๋ฒ์์ no-done์ ์ง์ํฉ๋๋ค" -#: fetch-pack.c:935 +#: fetch-pack.c:936 msgid "Server supports multi_ack" msgstr "์๋ฒ์์ multi_ack๋ฅผ ์ง์ํฉ๋๋ค" -#: fetch-pack.c:939 +#: fetch-pack.c:940 msgid "Server supports side-band-64k" msgstr "์๋ฒ์์ side-band-64k๋ฅผ ์ง์ํฉ๋๋ค" -#: fetch-pack.c:943 +#: fetch-pack.c:944 msgid "Server supports side-band" msgstr "์๋ฒ์์ side-band๋ฅผ ์ง์ํฉ๋๋ค" -#: fetch-pack.c:947 +#: fetch-pack.c:948 msgid "Server supports allow-tip-sha1-in-want" msgstr "์๋ฒ์์ allow-tip-sha1-in-want๋ฅผ ์ง์ํฉ๋๋ค" -#: fetch-pack.c:951 +#: fetch-pack.c:952 msgid "Server supports allow-reachable-sha1-in-want" msgstr "์๋ฒ์์ allow-reachable-sha1-in-want๋ฅผ ์ง์ํฉ๋๋ค" -#: fetch-pack.c:961 +#: fetch-pack.c:962 msgid "Server supports ofs-delta" msgstr "์๋ฒ์์ ofs-delta๋ฅผ ์ง์ํฉ๋๋ค" -#: fetch-pack.c:968 +#: fetch-pack.c:969 #, c-format msgid "Server version is %.*s" msgstr "์๋ฒ ๋ฒ์ ์ด %.*s์
๋๋ค" -#: fetch-pack.c:974 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "์๋ฒ์์ --shallow-signed ์ต์
์ ์ง์ํ์ง ์์ต๋๋ค" -#: fetch-pack.c:978 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "์๋ฒ์์ --shallow-exclude ์ต์
์ ์ง์ํ์ง ์์ต๋๋ค" -#: fetch-pack.c:980 +#: fetch-pack.c:981 msgid "Server does not support --deepen" msgstr "์๋ฒ์์ --deepen ์ต์
์ ์ง์ํ์ง ์์ต๋๋ค" -#: fetch-pack.c:991 +#: fetch-pack.c:992 msgid "no common commits" msgstr "๊ณตํต ์ปค๋ฐ ์์" -#: fetch-pack.c:1003 +#: fetch-pack.c:1004 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: ๊ฐ์ ธ์ค๊ธฐ ์คํจ." -#: fetch-pack.c:1165 +#: fetch-pack.c:1166 msgid "no matching remote head" msgstr "ํด๋นํ๋ ๋ฆฌ๋ชจํธ ํค๋๊ฐ ์์ต๋๋ค" -#: fetch-pack.c:1187 +#: fetch-pack.c:1188 #, c-format msgid "no such remote ref %s" msgstr "๊ทธ๋ฐ ๋ฆฌ๋ชจํธ๊ฐ ๋ ํผ๋ฐ์ค๊ฐ ์์ต๋๋ค: %s" -#: fetch-pack.c:1190 +#: fetch-pack.c:1191 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "์๋ฒ์์ ์๋ ค์ง์ง ์์ %s ์ค๋ธ์ ํธ์ ๋ํ ์์ฒญ์ ํ์ฉํ์ง ์์ต๋๋ค" @@ -1853,7 +1861,7 @@ msgstr "gpg์์ ๋ฐ์ดํฐ๋ฅผ ์๋ช
ํ๋๋ฐ ์คํจํ์ต๋๋ค." msgid "could not create temporary file" msgstr "์์ ํ์ผ์ ๋ง๋ค ์ ์์ต๋๋ค" -#: gpg-interface.c:213 +#: gpg-interface.c:214 #, c-format msgid "failed writing detached signature to '%s'" msgstr "๋ถ๋ฆฌ๋ ์๋ช
์ '%s'์ ์ฐ๋๋ฐ ์คํจํ์ต๋๋ค" @@ -1863,17 +1871,17 @@ msgstr "๋ถ๋ฆฌ๋ ์๋ช
์ '%s'์ ์ฐ๋๋ฐ ์คํจํ์ต๋๋ค" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "log.graphColors์ ์๋ชป๋ ์์ ('%.*s') ๋ฌด์ํฉ๋๋ค" -#: grep.c:1981 +#: grep.c:1970 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %s์(๋ฅผ) ์ฝ์ ์ ์์ต๋๋ค" -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "'%s'์ ๋ํด stat()์ด ์คํจํ์ต๋๋ค" -#: grep.c:2009 +#: grep.c:1998 #, c-format msgid "'%s': short read" msgstr "'%s': ์ฝ๋ค๊ฐ ์๋ฆผ" @@ -2009,12 +2017,12 @@ msgstr "๋น ์ด๋ฆ์ ์ ์ ์ ๋ณด๋ (<%s>์ ๋ํด) ํ์ฉํ์ง ์์ต๋๋ msgid "name consists only of disallowed characters: %s" msgstr "์ด๋ฆ์ด ํ์ฉํ์ง ์๋ ๋ฌธ์๋ก๋ง ์ด๋ฃจ์ด์ ธ ์์ต๋๋ค: %s" -#: ident.c:416 builtin/commit.c:612 +#: ident.c:416 builtin/commit.c:616 #, c-format msgid "invalid date format: %s" msgstr "์๊ฐ ํ์์ด ์๋ชป๋์์ต๋๋ค: %s" -#: lockfile.c:152 +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -2033,7 +2041,7 @@ msgstr "" "์ ์ฅ์์์ ๊น ํ๋ก์ธ์ค๊ฐ ์ ์ ์ด์ ์ข
๋ฃํ์ ์๋ ์์ต๋๋ค:\n" "์๋์ผ๋ก ํด๋น ํ์ผ์ ์ ๊ฑฐํ๊ณ ๊ณ์ํ์ญ์์ค." -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "'%s.lock'์ ๋ง๋ค ์ ์์ต๋๋ค: %s" @@ -2042,78 +2050,78 @@ msgstr "'%s.lock'์ ๋ง๋ค ์ ์์ต๋๋ค: %s" msgid "failed to read the cache" msgstr "์บ์๋ฅผ ์ฝ๋๋ฐ ์คํจํ์ต๋๋ค" -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 -#: builtin/checkout.c:591 builtin/clone.c:753 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 +#: builtin/checkout.c:595 builtin/clone.c:754 msgid "unable to write new index file" msgstr "์ ์ธ๋ฑ์ค ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: merge-recursive.c:210 +#: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "(์๋ชป๋ ์ปค๋ฐ)\n" -#: merge-recursive.c:232 merge-recursive.c:240 +#: merge-recursive.c:257 merge-recursive.c:265 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "'%s' ๊ฒฝ๋ก์ ๋ํด addinfo_cache๊ฐ ์คํจํ์ต๋๋ค" -#: merge-recursive.c:304 +#: merge-recursive.c:329 msgid "error building trees" msgstr "ํธ๋ฆฌ ๋น๋์ ์ค๋ฅ" -#: merge-recursive.c:728 +#: merge-recursive.c:752 #, c-format msgid "failed to create path '%s'%s" msgstr "'%s' ๊ฒฝ๋ก ๋ง๋ค๊ธฐ์ ์คํจํ์ต๋๋ค%s" -#: merge-recursive.c:739 +#: merge-recursive.c:763 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "ํ์ ๋๋ ํฐ๋ฆฌ์ ๊ณต๊ฐ์ ๋ง๋๋ ค๊ณ %s์(๋ฅผ) ์ ๊ฑฐํฉ๋๋ค\n" -#: merge-recursive.c:753 merge-recursive.c:772 +#: merge-recursive.c:777 merge-recursive.c:796 msgid ": perhaps a D/F conflict?" msgstr ": ์๋ง๋ D/F ์ถฉ๋?" -#: merge-recursive.c:762 +#: merge-recursive.c:786 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "'%s' ์์น์ ์ถ์ ๋์ง ์๋ ํ์ผ์ ์๊ธฐ๋ฅผ ๊ฑฐ๋ถํฉ๋๋ค" -#: merge-recursive.c:804 builtin/cat-file.c:36 +#: merge-recursive.c:828 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "%s '%s' ์ค๋ธ์ ํธ๋ฅผ ์ฝ์ ์ ์์" -#: merge-recursive.c:806 +#: merge-recursive.c:830 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s'์ ๋ํด ๋ธ๋กญ์ ์์" -#: merge-recursive.c:830 +#: merge-recursive.c:854 #, c-format msgid "failed to open '%s': %s" msgstr "'%s'์(๋ฅผ) ์ฌ๋๋ฐ ์คํจ: %s" -#: merge-recursive.c:841 +#: merge-recursive.c:865 #, c-format msgid "failed to symlink '%s': %s" msgstr "'%s' ์ฌ๋ณผ๋ฆญ ๋งํฌ์ ์คํจ: %s" -#: merge-recursive.c:846 +#: merge-recursive.c:870 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "๋ค์์ ์ด๋ป๊ฒ ํ ์ง ์ ์ ์์ต๋๋ค: %06o %s '%s'" -#: merge-recursive.c:986 +#: merge-recursive.c:1010 msgid "Failed to execute internal merge" msgstr "๋ด๋ถ ๋ณํฉ ์คํ์ ์คํจ" -#: merge-recursive.c:990 +#: merge-recursive.c:1014 #, c-format msgid "Unable to add %s to database" msgstr "%s์(๋ฅผ) ๋ฐ์ดํฐ๋ฒ ์ด์ค์ ์ถ๊ฐํ ์ ์์ต๋๋ค" -#: merge-recursive.c:1093 +#: merge-recursive.c:1117 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2121,7 +2129,7 @@ msgid "" msgstr "" "์ถฉ๋! (%s/์ญ์ ): %s (์์น %s) ๋ฐ %s (%s์์) ์ญ์ . %s ๋ฒ์ ์ %s ํธ๋ฆฌ์ ๋จ์." -#: merge-recursive.c:1098 +#: merge-recursive.c:1122 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2130,7 +2138,7 @@ msgstr "" "์ถฉ๋! (%s/์ญ์ ): %s (์์น %s) ์ญ์ , %s์์ %s(์ผ)๋ก (์์น %s). %s ๋ฒ์ ์ %s " "ํธ๋ฆฌ์ ๋จ์." -#: merge-recursive.c:1105 +#: merge-recursive.c:1129 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2139,7 +2147,7 @@ msgstr "" "์ถฉ๋! (%s/์ญ์ ): %s (์์น %s) ๋ฐ %s (์์น %s) ์ญ์ . %s ๋ฒ์ ์ %s ํธ๋ฆฌ์ " "%s(์ผ)๋ก ๋จ์." -#: merge-recursive.c:1110 +#: merge-recursive.c:1134 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2148,20 +2156,20 @@ msgstr "" "์ถฉ๋! (%s/์ญ์ ): %s (์์น %s) ์ญ์ , %s์์ %s(์ผ)๋ก (์์น %s). %s ๋ฒ์ ์ %s " "ํธ๋ฆฌ์ ๋จ์ (์์น %s)." -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "rename" msgstr "์ด๋ฆ๋ฐ๊พธ๊ธฐ" -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "renamed" msgstr "์ด๋ฆ๋ฐ๊ฟ" -#: merge-recursive.c:1201 +#: merge-recursive.c:1225 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s์(๋) %s์ ์๋ ๋๋ ํฐ๋ฆฌ๋ก %s(์ผ)๋ก ์ด๋ฆ์ ๋ฐ๊ฟ๋๋ค" -#: merge-recursive.c:1226 +#: merge-recursive.c:1250 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2170,140 +2178,140 @@ msgstr "" "์ถฉ๋! (์ด๋ฆ๋ฐ๊พธ๊ธฐ/์ด๋ฆ๋ฐ๊พธ๊ธฐ): \"%3$s\" ๋ธ๋์น์์ ์ด๋ฆ๋ฐ๊พธ๊ธฐ \"%1$s\"->" "\"%2$s\" \"%6$s\" ๋ธ๋์น์์ ์ด๋ฆ ๋ฐ๊พธ๊ธฐ \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1231 +#: merge-recursive.c:1255 msgid " (left unresolved)" msgstr " (ํด๊ฒฐ๋์ง ์์)" -#: merge-recursive.c:1293 +#: merge-recursive.c:1317 #, 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:1326 +#: merge-recursive.c:1350 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "๋์ ์ด๋ฆ์ %s์์ %s(์ผ)๋ก ๋ฐ๊พธ๊ณ %s์์ %s(์ผ)๋ก ๋ฐ๊ฟ๋๋ค" -#: merge-recursive.c:1529 +#: merge-recursive.c:1553 #, 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:1544 +#: merge-recursive.c:1568 #, c-format msgid "Adding merged %s" msgstr "๋ณํฉ๋ %s์(๋ฅผ) ์ถ๊ฐํฉ๋๋ค" -#: merge-recursive.c:1551 merge-recursive.c:1781 +#: merge-recursive.c:1575 merge-recursive.c:1805 #, c-format msgid "Adding as %s instead" msgstr "๋์ %s(์ผ)๋ก ์ถ๊ฐํฉ๋๋ค" -#: merge-recursive.c:1608 +#: merge-recursive.c:1632 #, c-format msgid "cannot read object %s" msgstr "%s ์ค๋ธ์ ํธ๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: merge-recursive.c:1611 +#: merge-recursive.c:1635 #, c-format msgid "object %s is not a blob" msgstr "%s ์ค๋ธ์ ํธ๋ ๋ธ๋กญ์ด ์๋๋๋ค" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modify" msgstr "์์ " -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modified" msgstr "์์ ๋จ" -#: merge-recursive.c:1690 +#: merge-recursive.c:1714 msgid "content" msgstr "๋ด์ฉ" -#: merge-recursive.c:1697 +#: merge-recursive.c:1721 msgid "add/add" msgstr "์ถ๊ฐ/์ถ๊ฐ" -#: merge-recursive.c:1733 +#: merge-recursive.c:1757 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "๊ฑด๋๋ฐ๊ธฐ: %s (๊ธฐ์กด๊ณผ ๊ฐ๊ฒ ๋ณํฉ)" -#: merge-recursive.c:1747 +#: merge-recursive.c:1771 #, c-format msgid "Auto-merging %s" msgstr "์๋ ๋ณํฉ: %s" -#: merge-recursive.c:1751 git-submodule.sh:945 +#: merge-recursive.c:1775 git-submodule.sh:944 msgid "submodule" msgstr "ํ์ ๋ชจ๋" -#: merge-recursive.c:1752 +#: merge-recursive.c:1776 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "์ถฉ๋! (%s): %s์ ๋ณํฉ ์ถฉ๋" -#: merge-recursive.c:1846 +#: merge-recursive.c:1870 #, c-format msgid "Removing %s" msgstr "์ ๊ฑฐ: %s" -#: merge-recursive.c:1872 +#: merge-recursive.c:1896 msgid "file/directory" msgstr "ํ์ผ/๋๋ ํฐ๋ฆฌ" -#: merge-recursive.c:1878 +#: merge-recursive.c:1902 msgid "directory/file" msgstr "๋๋ ํฐ๋ฆฌ/ํ์ผ" -#: merge-recursive.c:1884 +#: merge-recursive.c:1908 #, 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:1893 +#: merge-recursive.c:1917 #, c-format msgid "Adding %s" msgstr "์ถ๊ฐ: %s" -#: merge-recursive.c:1930 -msgid "Already up-to-date!" +#: merge-recursive.c:1954 +msgid "Already up to date!" msgstr "์ด๋ฏธ ์
๋ฐ์ดํธ ์ํ์
๋๋ค!" -#: merge-recursive.c:1939 +#: merge-recursive.c:1963 #, c-format msgid "merging of trees %s and %s failed" msgstr "%s ๋ฐ %s ํธ๋ฆฌ์ ๋ณํฉ์ด ์คํจํ์ต๋๋ค" -#: merge-recursive.c:2022 +#: merge-recursive.c:2060 msgid "Merging:" msgstr "๋ณํฉ:" -#: merge-recursive.c:2035 +#: merge-recursive.c:2073 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "๊ณผ๊ฑฐ์ ๊ณตํต ์ปค๋ฐ %u๊ฐ ๋ฐ๊ฒฌ:" -#: merge-recursive.c:2074 +#: merge-recursive.c:2112 msgid "merge returned no commit" msgstr "๋ณํฉ ๊ฒฐ๊ณผ์ ์ปค๋ฐ์ด ์์ต๋๋ค" -#: merge-recursive.c:2137 +#: merge-recursive.c:2175 #, c-format msgid "Could not parse object '%s'" msgstr "'%s' ์ค๋ธ์ ํธ๋ฅผ ํ์ฑํ ์ ์์ต๋๋ค" -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 msgid "Unable to write index." msgstr "์ธ๋ฑ์ค๋ฅผ ์ธ ์ ์์ต๋๋ค." -#: notes-merge.c:273 +#: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2314,7 +2322,7 @@ msgstr "" "์๋ก ๋
ธํธ ๋ณํฉ์ ์์ํ๊ธฐ ์ ์ 'git notes merge --commit'\n" "๋๋ 'git notes merge --abort'๋ก ์ด์ ๋ณํฉ์ ์ปค๋ฐ/์ค์งํ์ญ์์ค." -#: notes-merge.c:280 +#: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "๋
ธํธ ๋ณํฉ ์์
์ ๋ค ๋ง์น์ง ์์์ต๋๋ค. (%s ์์)" @@ -2342,16 +2350,30 @@ msgstr "%s์์ ๋
ธํธ๋ฅผ ๋ค์ ์ฐ๊ธฐ๋ฅผ ๊ฑฐ๋ถํฉ๋๋ค (refs/notes/ ๋ฐ์) msgid "Bad %s value: '%s'" msgstr "์๋ชป๋ %s ๊ฐ: '%s'" -#: object.c:240 +#: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "์ค๋ธ์ ํธ๋ฅผ ํ์ฑํ ์ ์์ต๋๋ค: %s" +#: packfile.c:556 +msgid "offset before end of packfile (broken .idx?)" +msgstr "์คํ์
์ด ๋ฌถ์ ํ์ผ ์์
๋๋ค (๋ง๊ฐ์ง .idx?)" + +#: packfile.c:1683 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "์คํ์
์ด %s์ ๋ฌถ์ ์ธ๋ฑ์ค ์์๋ณด๋ค ์์
๋๋ค (๋ง๊ฐ์ง ์ธ๋ฑ์ค?)" + +#: packfile.c:1687 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "์คํ์
์ด %s์ ๋ฌถ์ ์ธ๋ฑ์ค ๋๋ณด๋ค ๋ค์
๋๋ค (๋ง๊ฐ์ง ์ธ๋ฑ์ค?)" + #: parse-options.c:573 msgid "..." msgstr "..." -#: parse-options.c:591 +#: parse-options.c:592 #, c-format msgid "usage: %s" msgstr "์ฌ์ฉ๋ฒ: %s" @@ -2359,17 +2381,17 @@ msgstr "์ฌ์ฉ๋ฒ: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:597 +#: parse-options.c:598 #, c-format msgid " or: %s" msgstr " ๋๋: %s" -#: parse-options.c:600 +#: parse-options.c:601 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:634 +#: parse-options.c:640 msgid "-NUM" msgstr "-NUM" @@ -2378,7 +2400,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "์๋ชป๋ ํ์์ ์ค๋ธ์ ํธ ์ด๋ฆ '%s'" -#: path.c:890 +#: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "%s์(๋ฅผ) ๊ทธ๋ฃน์์ ์ฐ๊ธฐ ๊ฐ๋ฅํ๋๋ก ๋ง๋ค ์ ์์ต๋๋ค" @@ -2450,7 +2472,7 @@ msgstr "'%s' (๋จ์ถํค: '%c')" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: ๊ฒฝ๋ก๋ช
์ธ ์ง์์ด๊ฐ ์ด ๋ช
๋ น์ด์์ ์ง์ํ์ง ์์ต๋๋ค: %s" -#: pathspec.c:575 +#: pathspec.c:571 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2458,12 +2480,12 @@ msgstr "" "๊ฒฝ๋ก๋ช
์ธ๋ก ๋น ๋ฌธ์์ด์ ๋ฃ๋ ์ผ์ ๋ค์ ๋ฆด๋ฆฌ์ค์์ ์ค๋ฅ๋ก ์ทจ๊ธํ ์์ ์
๋๋ค. ๋ชจ" "๋ ๊ฒฝ๋ก๋ฅผ ์ง์ ํ๋ ค๋ฉด ์ (.)์ ์ฌ์ฉํ์ญ์์ค." -#: pathspec.c:599 +#: pathspec.c:595 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "'%s' ๊ฒฝ๋ก๋ช
์ธ๋ ์ฌ๋ณผ๋ฆญ ๋งํฌ ์๋์ ์์ต๋๋ค" -#: pretty.c:963 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "--pretty ํ์์ ํ์ฑํ ์ ์์ต๋๋ค" @@ -2485,50 +2507,51 @@ msgstr "" "GIT_INDEX_VERSION์ด ์ค์ ๋์์ง๋ง, ์ด ๊ฐ์ด ์๋ชป๋์์ต๋๋ค.\n" "%i ๋ฒ์ ์ ์ฌ์ฉํฉ๋๋ค" -#: read-cache.c:2308 builtin/merge.c:1019 +#: read-cache.c:2316 builtin/merge.c:1046 #, c-format msgid "could not close '%s'" msgstr "'%s'์(๋ฅผ) ๋ซ์ ์ ์์ต๋๋ค" -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 #, c-format msgid "could not stat '%s'" msgstr "'%s'์(๋ฅผ) stat()ํ ์ ์์ต๋๋ค" -#: read-cache.c:2396 +#: read-cache.c:2407 #, c-format msgid "unable to open git dir: %s" msgstr "git ๋๋ ํฐ๋ฆฌ๋ฅผ ์ด ์ ์์ต๋๋ค: %s" -#: read-cache.c:2408 +#: read-cache.c:2419 #, c-format msgid "unable to unlink: %s" msgstr "๋งํฌ ํด์ ํ ์ ์์ต๋๋ค: %s" -#: refs.c:622 +#: refs.c:638 #, c-format msgid "Could not open '%s' for writing" msgstr "'%s'์(๋ฅผ) ์ฐ๊ธฐ์ฉ์ผ๋ก ์ด ์ ์์ต๋๋ค" -#: refs.c:1769 +#: refs.c:1792 msgid "ref updates forbidden inside quarantine environment" msgstr "๊ฒฉ๋ฆฌ๋ ํ๊ฒฝ์์ ๋ ํผ๋ฐ์ค ์
๋ฐ์ดํธ๊ฐ ๊ธ์ง๋ฉ๋๋ค" -#: refs/files-backend.c:1664 +#: refs/files-backend.c:1136 +#, c-format +msgid "could not remove reference %s" +msgstr "%s ๋ ํผ๋ฐ์ค๋ฅผ ์ ๊ฑฐํ ์ ์์ต๋๋ค" + +#: refs/files-backend.c:1150 refs/packed-backend.c:1430 +#: refs/packed-backend.c:1440 #, c-format msgid "could not delete reference %s: %s" msgstr "%s ๋ ํผ๋ฐ์ค๋ฅผ ์ญ์ ํ ์ ์์ต๋๋ค: %s" -#: refs/files-backend.c:1667 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443 #, c-format msgid "could not delete references: %s" msgstr "๋ ํผ๋ฐ์ค๋ฅผ ์ญ์ ํ ์ ์์ต๋๋ค: %s" -#: refs/files-backend.c:1676 -#, c-format -msgid "could not remove reference %s" -msgstr "%s ๋ ํผ๋ฐ์ค๋ฅผ ์ ๊ฑฐํ ์ ์์ต๋๋ค" - #: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "์์" @@ -2558,147 +2581,147 @@ msgstr "์์ํ ํ์: %%(color:<์>)" msgid "unrecognized color: %%(color:%s)" msgstr "์ธ์ํ ์ ์๋ ์: %%(color:%s)" -#: ref-filter.c:121 +#: ref-filter.c:127 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "์ ์ ๊ฐ์ด ์์ผ ํฉ๋๋ค refname:lstrip=%s" -#: ref-filter.c:125 +#: ref-filter.c:131 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "์ ์ ๊ฐ์ด ์์ผ ํฉ๋๋ค refname:rstrip=%s" -#: ref-filter.c:127 +#: ref-filter.c:133 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "์ธ์ํ ์ ์๋ %%(%s) ์ธ์: %s" -#: ref-filter.c:167 +#: ref-filter.c:173 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body)์ ์ธ์๋ฅผ ๋ฐ์ง ์์ต๋๋ค" -#: ref-filter.c:174 +#: ref-filter.c:180 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject)์ ์ธ์๋ฅผ ๋ฐ์ง ์์ต๋๋ค" -#: ref-filter.c:181 +#: ref-filter.c:198 #, c-format -msgid "%%(trailers) does not take arguments" -msgstr "%%(trailers)์ ์ธ์๋ฅผ ๋ฐ์ง ์์ต๋๋ค" +msgid "unknown %%(trailers) argument: %s" +msgstr "์ ์ ์๋ %%(trailers) ์ต์
์ธ์: %s" -#: ref-filter.c:200 +#: ref-filter.c:221 #, c-format msgid "positive value expected contents:lines=%s" msgstr "'contents:lines=%s'์์ 0๋ณด๋ค ํฐ ๊ฐ์ด ์์ผ ํฉ๋๋ค" -#: ref-filter.c:202 +#: ref-filter.c:223 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "์ ์ ์๋ %%(contents) ์ธ์: %s" -#: ref-filter.c:215 +#: ref-filter.c:236 #, c-format msgid "positive value expected objectname:short=%s" msgstr "'contents:short=%s'์์ 0๋ณด๋ค ํฐ ๊ฐ์ด ์์ผ ํฉ๋๋ค" -#: ref-filter.c:219 +#: ref-filter.c:240 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "์ ์ ์๋ %%(objectname) ์ธ์: %s" -#: ref-filter.c:246 +#: ref-filter.c:267 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "์์ํ ํ์: %%(align:<๋๋น>,<์์น>)" -#: ref-filter.c:258 +#: ref-filter.c:279 #, c-format msgid "unrecognized position:%s" msgstr "์ธ์ํ ์ ์๋ ์์น:%s" -#: ref-filter.c:262 +#: ref-filter.c:283 #, c-format msgid "unrecognized width:%s" msgstr "์ธ์ํ ์ ์๋ ๋๋น:%s" -#: ref-filter.c:268 +#: ref-filter.c:289 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "์ธ์ํ ์ ์๋ %%(align) ์ธ์:%s" -#: ref-filter.c:272 +#: ref-filter.c:293 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "%%(align) ์ํฐ์ ๋๋น๊ฐ 0๋ณด๋ค ์ปค์ผ ํฉ๋๋ค" -#: ref-filter.c:287 +#: ref-filter.c:308 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "์ธ์ํ ์ ์๋ %%(if) ์ธ์: %s" -#: ref-filter.c:378 +#: ref-filter.c:398 #, c-format msgid "malformed field name: %.*s" msgstr "์๋ชป๋ ํ์์ ํ๋ ์ด๋ฆ: %.*s" -#: ref-filter.c:404 +#: ref-filter.c:424 #, c-format msgid "unknown field name: %.*s" msgstr "์ ์ ์๋ ํ๋ ์ด๋ฆ: %.*s" -#: ref-filter.c:508 +#: ref-filter.c:536 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "ํ์: %%(if) ์ํฐ์ด %%(then) ์ํฐ ์์ด ์ฌ์ฉ๋์์ต๋๋ค" -#: ref-filter.c:568 +#: ref-filter.c:596 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "ํ์: %%(then) ์ํฐ์ด %%(if) ์ํฐ ์์ด ์ฌ์ฉ๋์์ต๋๋ค" -#: ref-filter.c:570 +#: ref-filter.c:598 #, c-format msgid "format: %%(then) atom used more than once" msgstr "ํ์: %%(then) ์ํฐ์ด ์ฌ๋ฌ๋ฒ ์ฌ์ฉ๋์์ต๋๋ค" -#: ref-filter.c:572 +#: ref-filter.c:600 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "ํ์: %%(then) ์ํฐ์ด %%(else) ๋ค์ ์ฌ์ฉ๋์์ต๋๋ค" -#: ref-filter.c:598 +#: ref-filter.c:626 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "ํ์: %%(else) ์ํฐ์ด %%(if) ์ํฐ ์์ด ์ฌ์ฉ๋์์ต๋๋ค" -#: ref-filter.c:600 +#: ref-filter.c:628 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "ํ์: %%(else) ์ํฐ์ด %%(then) ์ํฐ ์์ด ์ฌ์ฉ๋์์ต๋๋ค" -#: ref-filter.c:602 +#: ref-filter.c:630 #, c-format msgid "format: %%(else) atom used more than once" msgstr "ํ์: %%(else) ์ํฐ์ด ์ฌ๋ฌ๋ฒ ์ฌ์ฉ๋์์ต๋๋ค" -#: ref-filter.c:615 +#: ref-filter.c:643 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "ํ์: %%(end) ์ํฐ์ด ๋์๋๋ ์ํฐ ์์ด ์ฌ์ฉ๋์์ต๋๋ค" -#: ref-filter.c:670 +#: ref-filter.c:698 #, c-format msgid "malformed format string %s" msgstr "์๋ชป๋ ํ์์ ๋ฌธ์์ด %s" -#: ref-filter.c:1254 +#: ref-filter.c:1283 #, c-format msgid "(no branch, rebasing %s)" msgstr "(๋ธ๋์น ์์, %s ๋ฆฌ๋ฒ ์ด์ค)" -#: ref-filter.c:1257 +#: ref-filter.c:1286 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(๋ธ๋์น ์์, ์ด๋ฑ๋ถ %s์์ ์์)" @@ -2706,7 +2729,7 @@ msgstr "(๋ธ๋์น ์์, ์ด๋ฑ๋ถ %s์์ ์์)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1265 +#: ref-filter.c:1294 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD %s ์์น์์ ๋ถ๋ฆฌ๋จ)" @@ -2714,108 +2737,108 @@ msgstr "(HEAD %s ์์น์์ ๋ถ๋ฆฌ๋จ)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1272 +#: ref-filter.c:1301 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD %s(์ผ)๋ก๋ถํฐ ๋ถ๋ฆฌ๋จ)" -#: ref-filter.c:1276 +#: ref-filter.c:1305 msgid "(no branch)" msgstr "(๋ธ๋์น ์์)" -#: ref-filter.c:1426 ref-filter.c:1457 +#: ref-filter.c:1454 ref-filter.c:1485 #, c-format msgid "missing object %s for %s" msgstr "์๋ ์ค๋ธ์ ํธ %s, %s์ ๋ํด" -#: ref-filter.c:1429 ref-filter.c:1460 +#: ref-filter.c:1457 ref-filter.c:1488 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "%s์ parse_object_buffer ์คํจ (%s์ ๋ํด)" -#: ref-filter.c:1760 +#: ref-filter.c:1788 #, c-format msgid "malformed object at '%s'" msgstr "'%s'์ ์๋ชป๋ ํ์์ ์ค๋ธ์ ํธ" -#: ref-filter.c:1827 +#: ref-filter.c:1855 #, c-format msgid "ignoring ref with broken name %s" msgstr "๋ง๊ฐ์ง ์ด๋ฆ %s์ ๋ ํผ๋ฐ์ค๋ฅผ ๋ฌด์ํฉ๋๋ค" -#: ref-filter.c:1832 +#: ref-filter.c:1860 #, c-format msgid "ignoring broken ref %s" msgstr "๋ง๊ฐ์ง ๋ ํผ๋ฐ์ค %s ๋ฌด์" -#: ref-filter.c:2095 +#: ref-filter.c:2122 #, c-format msgid "format: %%(end) atom missing" msgstr "ํ์: %%(end) ์ํฐ์ด ์์ต๋๋ค" -#: ref-filter.c:2176 +#: ref-filter.c:2216 #, c-format msgid "malformed object name %s" msgstr "์๋ชป๋ ํ์์ ์ค๋ธ์ ํธ ์ด๋ฆ %s" -#: remote.c:747 +#: remote.c:750 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "%s ๋ฐ %s์(๋ฅผ) ๋ชจ๋ %s์ ๊ฐ์ ธ์ฌ ์ ์์ต๋๋ค" -#: remote.c:751 +#: remote.c:754 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s์(๋) ๋ณดํต %s์(๋ฅผ) ์ถ์ ํ๊ณ , %s์(๋ฅผ) ์ถ์ ํ์ง ์์ต๋๋ค" -#: remote.c:755 +#: remote.c:758 #, c-format msgid "%s tracks both %s and %s" msgstr "%s์(๋) %s ๋ฐ %s ๋ชจ๋ ์ถ์ ํฉ๋๋ค" -#: remote.c:763 +#: remote.c:766 msgid "Internal error" msgstr "๋ด๋ถ ์ค๋ฅ" -#: remote.c:1680 remote.c:1782 +#: remote.c:1681 remote.c:1783 msgid "HEAD does not point to a branch" msgstr "HEAD๊ฐ ๋ธ๋์น๋ฅผ ๊ฐ๋ฆฌํค์ง ์์ต๋๋ค" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no such branch: '%s'" msgstr "๊ทธ๋ฐ ๋ธ๋์น๊ฐ ์์ต๋๋ค: '%s'" -#: remote.c:1692 +#: remote.c:1693 #, c-format msgid "no upstream configured for branch '%s'" msgstr "'%s' ๋ธ๋์น์ ๋ํด ์
์คํธ๋ฆผ์ ์ค์ ํ์ง ์์์ต๋๋ค" -#: remote.c:1698 +#: remote.c:1699 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "์
์คํธ๋ฆผ '%s' ๋ธ๋์น๊ฐ ๋ฆฌ๋ชจํธ ์ถ์ ๋ธ๋์น๋ก ์ ์ฅ๋์ง ์์์ต๋๋ค" -#: remote.c:1713 +#: remote.c:1714 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "๋ฆฌ๋ชจํธ '%2$s'์ ํธ์ ๋์ '%1$s'์ ๋ก์ปฌ ์ถ์ ๋ธ๋์น๊ฐ ์์ต๋๋ค" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "'%s' ๋ธ๋์น์ ํธ์ ๋ฆฌ๋ชจํธ๊ฐ ์์ต๋๋ค" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "'%s'์ ๋ํ ํธ์ ๋ ํผ๋ฐ์ค๋ช
์ธ์ '%s'์ด(๊ฐ) ๋ค์ด ์์ง ์์ต๋๋ค" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "ํธ์์ ๋์์ด ์์ต๋๋ค (push.default๊ฐ 'nothing'์
๋๋ค)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "ํ๋์ ๋์์ ๋ํด 'simple' ํธ์๋ฅผ ์ฒ๋ฆฌํ ์ ์์ต๋๋ค" @@ -2830,7 +2853,7 @@ msgstr " (๋ฐ๋ก์ก์ผ๋ ค๋ฉด \"git branch --unset-upstream\"์ ์ฌ์ฉํ์ญ์ #: remote.c:2083 #, c-format -msgid "Your branch is up-to-date with '%s'.\n" +msgid "Your branch is up to date with '%s'.\n" msgstr "๋ธ๋์น๊ฐ '%s'์ ๋ง๊ฒ ์
๋ฐ์ดํธ๋ ์ํ์
๋๋ค.\n" #: remote.c:2087 @@ -2871,16 +2894,16 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (๋ฆฌ๋ชจํธ์ ๋ธ๋์น๋ฅผ ํ์ฌ ๋ธ๋์น๋ก ๋ณํฉํ๋ ค๋ฉด \"git pull\"์ ์ฌ์ฉํ์ญ์์ค)\n" -#: revision.c:2187 +#: revision.c:2256 msgid "your current branch appears to be broken" msgstr "ํ์ฌ ๋ธ๋์น๊ฐ ๋ง๊ฐ์ง ๊ฒ์ฒ๋ผ ๋ณด์
๋๋ค" -#: revision.c:2190 +#: revision.c:2259 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ํ์ฌ '%s' ๋ธ๋์น์ ์์ง ์๋ฌด ์ปค๋ฐ๋ ์์ต๋๋ค" -#: revision.c:2384 +#: revision.c:2453 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent ์ต์
์ --bisect ์ต์
๊ณผ ํธํ๋์ง ์์ต๋๋ค" @@ -2921,24 +2944,24 @@ msgstr "๋ฐ๋ ์ชฝ์์ --atomic ํธ์๋ฅผ ์ง์ํ์ง ์์ต๋๋ค" msgid "the receiving end does not support push options" msgstr "๋ฐ๋ ์ชฝ์์ ํธ์ ์ต์
์ ์ง์ํ์ง ์์ต๋๋ค" -#: sequencer.c:216 +#: sequencer.c:218 msgid "revert" msgstr "revert" -#: sequencer.c:218 +#: sequencer.c:220 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:220 +#: sequencer.c:222 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:222 +#: sequencer.c:224 #, c-format msgid "Unknown action: %d" msgstr "์ ์ ์๋ ๋์: %d" -#: sequencer.c:279 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2946,7 +2969,7 @@ msgstr "" "์ด ์ถฉ๋์ ํด๊ฒฐํ ๋ค์, ๋ฐ๋ก์ก์ ๊ฒฝ๋ก๋ฅผ\n" "'git add <๊ฒฝ๋ก>' ๋๋ 'git rm <๊ฒฝ๋ก>'๋ก ํ์ํ์ญ์์ค" -#: sequencer.c:282 +#: sequencer.c:284 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2956,42 +2979,43 @@ msgstr "" "'git add <๊ฒฝ๋ก>' ๋๋ 'git rm <๊ฒฝ๋ก>'๋ก ํ์ํ์ญ์์ค.\n" "๊ทธ๋ฆฌ๊ณ ๊ฒฐ๊ณผ๋ฌผ์ 'git commit'์ผ๋ก ์ปค๋ฐํ์ญ์์ค" -#: sequencer.c:295 sequencer.c:1685 +#: sequencer.c:297 sequencer.c:1704 #, c-format msgid "could not lock '%s'" msgstr "'%s'์(๋ฅผ) ์ ๊ธ ์ ์์ต๋๋ค" -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 +#: sequencer.c:2733 sequencer.c:2749 #, c-format msgid "could not write to '%s'" msgstr "'%s'์ ์ธ ์ ์์ต๋๋ค" -#: sequencer.c:302 +#: sequencer.c:304 #, c-format msgid "could not write eol to '%s'" msgstr "'%s'์ ์ค๋ฐ๊ฟ์ ์ธ ์ ์์ต๋๋ค" -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 #, c-format msgid "failed to finalize '%s'." msgstr "'%s' ๋ง์น๋๋ฐ ์คํจํ์ต๋๋ค." -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 -#: builtin/commit.c:750 builtin/merge.c:1017 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1044 #, c-format msgid "could not read '%s'" msgstr "'%s'์์ ์ฝ์ ์ ์์ต๋๋ค" -#: sequencer.c:356 +#: sequencer.c:358 #, c-format msgid "your local changes would be overwritten by %s." msgstr "๋ก์ปฌ ๋ณ๊ฒฝ ์ฌํญ์ %s ๋๋ฌธ์ ๋ฎ์ด ์ฐ๊ฒ ๋ฉ๋๋ค." -#: sequencer.c:360 +#: sequencer.c:362 msgid "commit your changes or stash them to proceed." msgstr "๋ณ๊ฒฝ ์ฌํญ์ ์ปค๋ฐํ๊ฑฐ๋ ์คํ์ํ ๋ค์ ๊ณ์ํ์ญ์์ค." -#: sequencer.c:389 +#: sequencer.c:391 #, c-format msgid "%s: fast-forward" msgstr "%s: ์ ๋ฐฉํฅ ์งํ" @@ -2999,20 +3023,20 @@ msgstr "%s: ์ ๋ฐฉํฅ ์งํ" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:472 +#: sequencer.c:474 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: ์ ์ธ๋ฑ์ค ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: sequencer.c:491 +#: sequencer.c:493 msgid "could not resolve HEAD commit\n" msgstr "HEAD ์ปค๋ฐ์ ์ฒ๋ฆฌํ ์ ์์ต๋๋ค\n" -#: sequencer.c:511 +#: sequencer.c:513 msgid "unable to update cache tree\n" msgstr "์บ์ ํธ๋ฆฌ๋ฅผ ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค\n" -#: sequencer.c:595 +#: sequencer.c:597 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3042,17 +3066,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:697 +#: sequencer.c:699 #, c-format msgid "could not parse commit %s\n" msgstr "%s ์ปค๋ฐ์ ํ์ฑํ ์ ์์ต๋๋ค\n" -#: sequencer.c:702 +#: sequencer.c:704 #, c-format msgid "could not parse parent commit %s\n" msgstr "%s ์ด์ ์ปค๋ฐ์ ํ์ฑํ ์ ์์ต๋๋ค\n" -#: sequencer.c:824 +#: sequencer.c:826 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3063,7 +3087,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:830 +#: sequencer.c:832 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3074,230 +3098,231 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:836 sequencer.c:861 +#: sequencer.c:838 sequencer.c:863 #, c-format msgid "This is a combination of %d commits." msgstr "์ปค๋ฐ %d๊ฐ๊ฐ ์์ธ ๊ฒฐ๊ณผ์
๋๋ค." -#: sequencer.c:845 +#: sequencer.c:847 sequencer.c:2681 msgid "need a HEAD to fixup" msgstr "๋ฐ๋ก์ก์ผ๋ ค๋ฉด HEAD๊ฐ ํ์ํฉ๋๋ค" -#: sequencer.c:847 +#: sequencer.c:849 msgid "could not read HEAD" msgstr "HEAD๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: sequencer.c:849 +#: sequencer.c:851 msgid "could not read HEAD's commit message" msgstr "HEAD์ ์ปค๋ฐ ๋ฉ์์ง๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: sequencer.c:855 +#: sequencer.c:857 #, c-format msgid "cannot write '%s'" msgstr "'%s'์(๋ฅผ) ์ธ ์ ์์ต๋๋ค" -#: sequencer.c:864 git-rebase--interactive.sh:445 +#: sequencer.c:866 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "1๋ฒ์งธ ์ปค๋ฐ ๋ฉ์์ง์
๋๋ค:" -#: sequencer.c:872 +#: sequencer.c:874 #, c-format msgid "could not read commit message of %s" msgstr "%s์ ์ปค๋ฐ ๋ฉ์์ง๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: sequencer.c:879 +#: sequencer.c:881 #, c-format msgid "This is the commit message #%d:" msgstr "์ปค๋ฐ ๋ฉ์์ง #%d๋ฒ์
๋๋ค:" -#: sequencer.c:884 +#: sequencer.c:886 #, c-format msgid "The commit message #%d will be skipped:" msgstr "์ปค๋ฐ ๋ฉ์์ง #%d๋ฒ์ ๊ฑด๋๋๋๋ค:" -#: sequencer.c:889 +#: sequencer.c:891 #, c-format msgid "unknown command: %d" msgstr "์ ์ ์๋ ๋ช
๋ น: %d" -#: sequencer.c:955 +#: sequencer.c:957 msgid "your index file is unmerged." msgstr "์ธ๋ฑ์ค ํ์ผ์ด ๋ณํฉ๋์ง ์์์ต๋๋ค." -#: sequencer.c:973 +#: sequencer.c:975 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "%s ์ปค๋ฐ์ ๋ณํฉ์ด์ง๋ง -m ์ต์
์ด ์ฃผ์ด์ง์ง ์์์ต๋๋ค." # FIXME: "parent %d" ๋ฒํธ๊ฐ ๋ฌด์จ ์๋ฏธ? -#: sequencer.c:981 +#: sequencer.c:983 #, c-format msgid "commit %s does not have parent %d" msgstr "%s ์ปค๋ฐ์ ์ด์ ์ปค๋ฐ %d์ด(๊ฐ) ์์ต๋๋ค" -#: sequencer.c:985 +#: sequencer.c:987 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "๋ฉ์ธ๋ผ์ธ์ ์ง์ ํ์ง๋ง %s ์ปค๋ฐ์ด ๋ณํฉ ์ปค๋ฐ์ด ์๋๋๋ค." -#: sequencer.c:991 +#: sequencer.c:993 #, c-format msgid "cannot get commit message for %s" msgstr "%s์ ๋ํ ์ปค๋ฐ ๋ฉ์์ง๋ฅผ ๊ฐ์ ธ์ฌ ์ ์์ต๋๋ค" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1012 +#: sequencer.c:1014 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: %s ์ด์ ์ปค๋ฐ์ ํ์ฑํ ์ ์์ต๋๋ค" -#: sequencer.c:1075 sequencer.c:1830 +#: sequencer.c:1077 sequencer.c:1853 #, c-format msgid "could not rename '%s' to '%s'" msgstr "'%s'์์ '%s'(์ผ)๋ก ์ด๋ฆ์ ๋ฐ๊ฟ ์ ์์ต๋๋ค" -#: sequencer.c:1126 +#: sequencer.c:1128 #, c-format msgid "could not revert %s... %s" msgstr "๋ค์์ ๋๋๋ฆด(revert) ์ ์์ต๋๋ค: %s... %s" -#: sequencer.c:1127 +#: sequencer.c:1129 #, c-format msgid "could not apply %s... %s" msgstr "๋ค์์ ์ ์ฉํ (apply) ์ ์์ต๋๋ค: %s... %s" -#: sequencer.c:1169 +#: sequencer.c:1171 msgid "empty commit set passed" msgstr "๋น ์ปค๋ฐ ๋ชจ์์ ๊ฑด๋ ๋๋๋ค" -#: sequencer.c:1179 +#: sequencer.c:1181 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: ์ธ๋ฑ์ค ์ฝ๊ธฐ์ ์คํจํ์ต๋๋ค" -#: sequencer.c:1186 +#: sequencer.c:1188 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: ์ธ๋ฑ์ค ์๋ก ๊ณ ์นจ์ ์คํจํ์ต๋๋ค" -#: sequencer.c:1306 +#: sequencer.c:1308 #, c-format msgid "invalid line %d: %.*s" msgstr "์๋ชป๋ ์ค %d: %.*s" -#: sequencer.c:1314 +#: sequencer.c:1316 #, c-format msgid "cannot '%s' without a previous commit" msgstr "์ด์ ์ปค๋ฐ ์์ด '%s' ์ํํ ์ ์์ต๋๋ค" -#: sequencer.c:1347 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 #, c-format msgid "could not read '%s'." msgstr "'%s'์์ ์ฝ์ ์ ์์ต๋๋ค." -#: sequencer.c:1359 +#: sequencer.c:1361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "'git rebase --edit-todo' ๋ช
๋ น์ผ๋ก ๋ฐ๋ก์ก์ผ์ญ์์ค." -#: sequencer.c:1361 +#: sequencer.c:1363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "์ฌ์ฉ ๋ถ๊ฐ๋ฅ ์ธ์คํธ๋ญ์
์ํธ: '%s'" -#: sequencer.c:1366 +#: sequencer.c:1368 msgid "no commits parsed." msgstr "ํ์ฑํ ์ปค๋ฐ์ด ์์ต๋๋ค." -#: sequencer.c:1377 +#: sequencer.c:1379 msgid "cannot cherry-pick during a revert." msgstr "๋๋๋ฆฌ๊ธฐ(revert) ์ค์ ๋นผ์ค๊ธฐ(cherry-pick)๋ฅผ ํ ์ ์์ต๋๋ค." -#: sequencer.c:1379 +#: sequencer.c:1381 msgid "cannot revert during a cherry-pick." msgstr "๋นผ์ค๊ธฐ(cherry-pick) ์ค์ ๋๋๋ฆฌ๊ธฐ(revert)๋ฅผ ํ ์ ์์ต๋๋ค." -#: sequencer.c:1442 +#: sequencer.c:1448 #, c-format msgid "invalid key: %s" msgstr "์๋ชป๋ ํค: %s" -#: sequencer.c:1445 +#: sequencer.c:1451 #, c-format msgid "invalid value for %s: %s" msgstr "%s์ ๊ฐ์ด ์๋ชป๋จ: %s" -#: sequencer.c:1502 +#: sequencer.c:1517 #, c-format msgid "malformed options sheet: '%s'" msgstr "ํ์์ด ์๋ชป๋ ์ต์
์ํธ: '%s'" -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "a cherry-pick or revert is already in progress" msgstr "์ด๋ฏธ ์ปค๋ฐ ๋นผ์ค๊ธฐ(cherry-pick) ๋๋ ๋๋๋ฆฌ๊ธฐ(revert)๊ฐ ์งํ ์ค์
๋๋ค" -#: sequencer.c:1541 +#: sequencer.c:1556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "\"git cherry-pick (--continue | --quit | --abort)\" ๋ช
๋ น์ ํด ๋ณด์ญ์์ค" -#: sequencer.c:1544 +#: sequencer.c:1559 #, c-format msgid "could not create sequencer directory '%s'" msgstr "'%s' ์ํ์ ๋๋ ํฐ๋ฆฌ๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: sequencer.c:1558 +#: sequencer.c:1574 msgid "could not lock HEAD" msgstr "HEAD๋ฅผ ์ ๊ธ ์ ์์ต๋๋ค" -#: sequencer.c:1614 sequencer.c:2188 +#: sequencer.c:1632 sequencer.c:2211 msgid "no cherry-pick or revert in progress" msgstr "๋นผ์ค๊ธฐ(cherry-pick) ๋๋ ๋๋๋ฆฌ๊ธฐ(revert)๊ฐ ์งํ ์ค์ด์ง ์์ต๋๋ค" -#: sequencer.c:1616 +#: sequencer.c:1634 msgid "cannot resolve HEAD" msgstr "HEAD๋ฅผ ๊ตฌํด ์ฌ ์ ์์ต๋๋ค" -#: sequencer.c:1618 sequencer.c:1652 +#: sequencer.c:1636 sequencer.c:1671 msgid "cannot abort from a branch yet to be born" msgstr "์๋ก ๋ง๋ค๊ณ ์๋ ๋ธ๋์น์์ ์ค์งํ ์ ์์ต๋๋ค" -#: sequencer.c:1638 builtin/grep.c:929 +#: sequencer.c:1657 builtin/grep.c:711 #, c-format msgid "cannot open '%s'" msgstr "'%s'์(๋ฅผ) ์ด ์ ์์ต๋๋ค" -#: sequencer.c:1640 +#: sequencer.c:1659 #, c-format msgid "cannot read '%s': %s" msgstr "'%s'์(๋ฅผ) ์ฝ์ ์ ์์ต๋๋ค: %s" -#: sequencer.c:1641 +#: sequencer.c:1660 msgid "unexpected end of file" msgstr "์์์น ๋ชปํ๊ฒ ํ์ผ์ด ๋๋ฌ์ต๋๋ค" -#: sequencer.c:1647 +#: sequencer.c:1666 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "๋นผ์ค๊ธฐ ์ ์ ์ ์ฅํ HEAD ํ์ผ์ด('%s') ์์๋์์ต๋๋ค" -#: sequencer.c:1658 +#: sequencer.c:1677 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "HEAD๋ฅผ ์ฎ๊ธด ๊ฒ ๊ฐ์ต๋๋ค. ๋๋๋ฆฌ์ง ์์ต๋๋ค. HEAD๋ฅผ ํ์ธํ์ญ์์ค!" -#: sequencer.c:1795 sequencer.c:2086 +#: sequencer.c:1818 sequencer.c:2109 msgid "cannot read HEAD" msgstr "HEAD๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: sequencer.c:1835 builtin/difftool.c:633 +#: sequencer.c:1858 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "'%s'์์ '%s'(์ผ)๋ก ๋ณต์ฌํ ์ ์์ต๋๋ค" -#: sequencer.c:1851 +#: sequencer.c:1874 msgid "could not read index" msgstr "์ธ๋ฑ์ค๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: sequencer.c:1856 +#: sequencer.c:1879 #, c-format msgid "" "execution failed: %s\n" @@ -3312,11 +3337,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1862 +#: sequencer.c:1885 msgid "and made changes to the index and/or the working tree\n" msgstr "๊ทธ๋ฆฌ๊ณ ์ธ๋ฑ์ค ๊ทธ๋ฆฌ๊ณ /๋๋ ์์
ํด๋์ ๋ณ๊ฒฝ ์ฌํญ์ด ์์ต๋๋ค\n" -#: sequencer.c:1868 +#: sequencer.c:1891 #, c-format msgid "" "execution succeeded: %s\n" @@ -3333,17 +3358,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1925 +#: sequencer.c:1948 #, c-format msgid "Applied autostash.\n" msgstr "์๋ ์คํ์ ์ ์ฉ.\n" -#: sequencer.c:1937 +#: sequencer.c:1960 #, c-format msgid "cannot store %s" msgstr "%s์(๋ฅผ) ์ ์ฅํ ์ ์์ต๋๋ค" -#: sequencer.c:1940 git-rebase.sh:173 +#: sequencer.c:1963 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3354,57 +3379,57 @@ msgstr "" "๋ณ๊ฒฝ ์ฌํญ์ ์คํ์ ์์ ์์ ํ๊ฒ ๋ค์ด ์์ต๋๋ค.\n" "์ธ์ ๋ ์ง \"git stash pop\" ๋๋ \"git stash drop\"์ ์คํํ ์ ์์ต๋๋ค.\n" -#: sequencer.c:2022 +#: sequencer.c:2045 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "%s... %.*s ์์น์์ ๋ฉ์ท์ต๋๋ค\n" -#: sequencer.c:2064 +#: sequencer.c:2087 #, c-format msgid "unknown command %d" msgstr "์ ์ ์๋ ๋ช
๋ น %d" -#: sequencer.c:2094 +#: sequencer.c:2117 msgid "could not read orig-head" msgstr "orig-head๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: sequencer.c:2099 +#: sequencer.c:2122 sequencer.c:2678 msgid "could not read 'onto'" msgstr "'onto'๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: sequencer.c:2106 +#: sequencer.c:2129 #, c-format msgid "could not update %s" msgstr "%s์(๋ฅผ) ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค" -#: sequencer.c:2113 +#: sequencer.c:2136 #, c-format msgid "could not update HEAD to %s" msgstr "HEAD๋ฅผ %s ์์น๋ก ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค" -#: sequencer.c:2197 +#: sequencer.c:2220 msgid "cannot rebase: You have unstaged changes." msgstr "๋ฆฌ๋ฒ ์ด์คํ ์ ์์ต๋๋ค: ์คํ
์ด์งํ์ง ์์ ๋ณ๊ฒฝ ์ฌํญ์ด ์์ต๋๋ค." -#: sequencer.c:2202 +#: sequencer.c:2225 msgid "could not remove CHERRY_PICK_HEAD" msgstr "CHERRY_PICK_HEAD๋ฅผ ์ ๊ฑฐํ ์ ์์ต๋๋ค" -#: sequencer.c:2211 +#: sequencer.c:2234 msgid "cannot amend non-existing commit" msgstr "์๋ ์ปค๋ฐ์ ์์ ํ ์ ์์ต๋๋ค" -#: sequencer.c:2213 +#: sequencer.c:2236 #, c-format msgid "invalid file: '%s'" msgstr "์๋ชป๋ ํค: '%s'" -#: sequencer.c:2215 +#: sequencer.c:2238 #, c-format msgid "invalid contents: '%s'" msgstr "์๋ชป๋ ๋ด์ฉ: '%s'" -#: sequencer.c:2218 +#: sequencer.c:2241 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3414,24 +3439,108 @@ msgstr "" "์์
ํด๋์ ์ปค๋ฐํ์ง ์์ ๋ณ๊ฒฝ ์ฌํญ์ด ์์ต๋๋ค. ์ด ์ฌํญ์ ๋จผ์ \n" "์ปค๋ฐํ๊ณ 'git rebase --continue' ๋ช
๋ น์ ๋ค์ ์คํํ์ญ์์ค." -#: sequencer.c:2228 +#: sequencer.c:2251 msgid "could not commit staged changes." msgstr "์คํ
์ด์งํ ๋ณ๊ฒฝ ์ฌํญ์ ์ปค๋ฐํ ์ ์์ต๋๋ค." -#: sequencer.c:2308 +#: sequencer.c:2331 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s ์ปค๋ฐ์ ๋นผ์ฌ ์ ์์ต๋๋ค" -#: sequencer.c:2312 +#: sequencer.c:2335 #, c-format msgid "%s: bad revision" msgstr "%s: ์๋ชป๋ ๋ฆฌ๋น์ " -#: sequencer.c:2345 +#: sequencer.c:2368 msgid "can't revert as initial commit" msgstr "์ต์ด์ ์ปค๋ฐ์ผ๋ก ๋๋๋ฆด ์ ์์ต๋๋ค" +#: sequencer.c:2471 +msgid "make_script: unhandled options" +msgstr "make_script: ์ฒ๋ฆฌํ์ง ์์ ์ต์
" + +#: sequencer.c:2474 +msgid "make_script: error preparing revisions" +msgstr "make_script: ๋ฆฌ๋น์ ์ค๋น ์ค ์ค๋ฅ" + +#: sequencer.c:2510 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "์ฌ์ฉํ ์ ์๋ ํ ์ผ ๋ชฉ๋ก: %s" + +#: sequencer.c:2516 +#, c-format +msgid "unable to open '%s' for writing" +msgstr "'%s'์(๋ฅผ) ์ฐ๊ธฐ ์ฉ์ผ๋ก ์ด ์ ์์ต๋๋ค" + +#: sequencer.c:2561 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "rebase.missingCommitsCheck ์ต์
์ ๋ํด ์ธ์ํ ์ ์๋ %s ์ค์ . ๋ฌด์ํฉ๋๋ค." + +#: sequencer.c:2641 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"๊ฒฝ๊ณ : ์ผ๋ถ ์ปค๋ฐ์ด ์๋์น ์๊ฒ ๋ฒ๋ ค์ก์ ์๋ ์์ต๋๋ค.\n" +"๋ฒ๋ ค์ง ์ปค๋ฐ (์ต๊ทผ์์ ๊ณผ๊ฑฐ ์์):\n" + +#: sequencer.c:2648 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"์ด ๋ฉ์์ง๋ฅผ ๋ณด์ง ์์ผ๋ ค๋ฉด, \"drop\"์ ์ฌ์ฉํด ๋ช
์์ ์ผ๋ก ์ปค๋ฐ์ ์ ๊ฑฐํ์ญ์์ค.\n" +"\n" +"'git config rebase.missingCommitsCheck' ๋ช
๋ น์ผ๋ก ๊ฒฝ๊ณ ๋จ๊ณ๋ฅผ ๋ฐ๊ฟ ์ ์์ต๋๋ค.\n" +"๊ฐ๋ฅํ ๋์์: ignore, warn, error\n" +"\n" + +#: sequencer.c:2660 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"'git rebase --edit-todo' ๋ช
๋ น์ผ๋ก ๋ฐ๋ก์ก์ ์ ์๊ณ 'git rebase --continue' ๋ช
๋ น์ ์คํํฉ๋๋ค.\n" +"๋๋ 'git rebase --abort' ๋ช
๋ น์ผ๋ก ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ์ค์งํ ์๋ ์์ต๋๋ค.\n" + +#: sequencer.c:2708 +#, c-format +msgid "could not parse commit '%s'" +msgstr "'%s' ์ปค๋ฐ์ ํ์ฑํ ์ ์์ต๋๋ค" + +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:775 +#, c-format +msgid "could not open '%s' for writing" +msgstr "'%s'์(๋ฅผ) ์ฐ๊ธฐ์ฉ์ผ๋ก ์ด ์ ์์ต๋๋ค" + +#: sequencer.c:2756 +#, c-format +msgid "could not truncate '%s'" +msgstr "'%s' ํ์ผ์ ์๋ฅผ ์ ์์ต๋๋ค" + +#: sequencer.c:2848 +msgid "the script was already rearranged." +msgstr "์คํฌ๋ฆฝํธ๋ฅผ ์ด๋ฏธ ์ฌ๊ตฌ์ฑํ์ต๋๋ค" + +#: sequencer.c:2953 +#, c-format +msgid "could not finish '%s'" +msgstr "'%s'์(๋ฅผ) ๋ง์น ์ ์์ต๋๋ค" + #: setup.c:171 #, c-format msgid "" @@ -3463,34 +3572,34 @@ msgstr "" "๊ฒฝ๋ก์ ๋ฆฌ๋น์ ์ ๊ตฌ๋ถํ๋ ค๋ฉด ๋ค์๊ณผ ๊ฐ์ด '--'๋ฅผ ์ฌ์ฉํ์ญ์์ค:\n" "'git <๋ช
๋ น> [<๋ฆฌ๋น์ >...] -- [<ํ์ผ>...]'" -#: setup.c:504 +#: setup.c:499 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "๊น ์ ์ฅ์ ๋ฒ์ <= %d ๋ฒ์ ์ ๊ธฐ๋ํ์ง๋ง, %d ๋ฒ์ ์ด ๋ฐ๊ฒฌ๋์์ต๋๋ค" -#: setup.c:512 +#: setup.c:507 msgid "unknown repository extensions found:" msgstr "์ ์ ์๋ ์ ์ฅ์ ํ์ฅ์ด ์์ต๋๋ค:" -#: setup.c:810 +#: setup.c:806 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "(ํ์ฌ ํด๋ ๋๋ ์์ ํด๋๊ฐ) ๊น ์ ์ฅ์๊ฐ ์๋๋๋ค: %s" -#: setup.c:812 builtin/index-pack.c:1652 +#: setup.c:808 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "ํ์ฌ ๋๋ ํฐ๋ฆฌ๋ก ๋์์ฌ ์ ์์ต๋๋ค" -#: setup.c:1050 +#: setup.c:1046 msgid "Unable to read current working directory" msgstr "ํ์ฌ ์์
๋๋ ํฐ๋ฆฌ๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: setup.c:1062 setup.c:1068 +#: setup.c:1058 setup.c:1064 #, c-format msgid "Cannot change to '%s'" msgstr "'%s' ์์น๋ก ์ด๋ํ ์ ์์ต๋๋ค" -#: setup.c:1081 +#: setup.c:1077 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3500,7 +3609,7 @@ msgstr "" "ํ์ผ ์์คํ
๊ฒฝ๊ณ์์ ์ค์งํฉ๋๋ค. (GIT_DISCOVERY_ACROSS_FILESYSTEM ์ค์ ๋์ง ์" "์)" -#: setup.c:1173 +#: setup.c:1159 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3509,56 +3618,42 @@ msgstr "" "core.sharedRepository ํ์ผ๋ชจ๋ ๊ฐ์ (0%.3o) ๋ฌธ์ ๊ฐ ์์ต๋๋ค.\n" "ํ์ผ์ ์์ ์์ ์ฝ๊ธฐ์ ์ฐ๊ธฐ ๊ถํ์ด ์์ด์ผ ํฉ๋๋ค." -#: sha1_file.c:560 +#: sha1_file.c:528 #, c-format msgid "path '%s' does not exist" msgstr "'%s' ๊ฒฝ๋ก๊ฐ ์์ต๋๋ค" -#: sha1_file.c:586 +#: sha1_file.c:554 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "๋ ํผ๋ฐ์ค '%s' ์ ์ฅ์๋ฅผ ์ฐ๊ฒฐ๋ ์ฒดํฌ์์์ผ๋ก ์ฐ๊ธฐ๋ ์์ง ์ง์ํ์ง ์์ต๋๋ค." -#: sha1_file.c:592 +#: sha1_file.c:560 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "๋ ํผ๋ฐ์ค '%s' ์ ์ฅ์๊ฐ ๋ก์ปฌ ์ ์ฅ์๊ฐ ์๋๋๋ค." -#: sha1_file.c:598 +#: sha1_file.c:566 #, c-format msgid "reference repository '%s' is shallow" msgstr "๋ ํผ๋ฐ์ค '%s' ์ ์ฅ์๊ฐ ์์ ์ ์ฅ์์
๋๋ค" -#: sha1_file.c:606 +#: sha1_file.c:574 #, c-format msgid "reference repository '%s' is grafted" msgstr "๋ ํผ๋ฐ์ค '%s' ์ ์ฅ์๊ฐ ๋ถ์ด ์๋ ์ ์ฅ์์
๋๋ค" -#: sha1_file.c:1245 -msgid "offset before end of packfile (broken .idx?)" -msgstr "์คํ์
์ด ๋ฌถ์ ํ์ผ ์์
๋๋ค (๋ง๊ฐ์ง .idx?)" - -#: sha1_file.c:2729 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "์คํ์
์ด %s์ ๋ฌถ์ ์ธ๋ฑ์ค ์์๋ณด๋ค ์์
๋๋ค (๋ง๊ฐ์ง ์ธ๋ฑ์ค?)" - -#: sha1_file.c:2733 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "์คํ์
์ด %s์ ๋ฌถ์ ์ธ๋ฑ์ค ๋๋ณด๋ค ๋ค์
๋๋ค (๋ง๊ฐ์ง ์ธ๋ฑ์ค?)" - -#: sha1_name.c:419 +#: sha1_name.c:420 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "์งง์ SHA1 %s์(๋) ์ฌ๋ฟ์ ๋์๋ฉ๋๋ค" -#: sha1_name.c:430 +#: sha1_name.c:431 msgid "The candidates are:" msgstr "ํ๋ณด๋ ๋ค์๊ณผ ๊ฐ์ต๋๋ค:" -#: sha1_name.c:589 +#: sha1_name.c:590 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" @@ -3580,65 +3675,70 @@ msgstr "" "ํ์ธํด ๋ณด์๊ณ ์๋ชป ๋ง๋ค์ด์ง ๊ฒ์ด๋ฉด ์ง์ฐ์ญ์์ค. ์ด ๋ฉ์์ง๋ฅผ ๋ณด๊ณ ์ถ์ง\n" "์์ผ๋ฉด \"git config advice.objectNameWarning false\" ๋ช
๋ น์ ์ฌ์ฉํ์ญ์์ค." -#: submodule.c:70 submodule.c:104 +#: submodule.c:93 submodule.c:127 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "๋ณํฉํ์ง ์์ .gitmodules๋ฅผ ๋ฐ๊ฟ ์ ์์ต๋๋ค. ๋ณํฉ ์ถฉ๋์ ๋จผ์ ํด๊ฒฐํ์ญ์์ค" -#: submodule.c:74 submodule.c:108 +#: submodule.c:97 submodule.c:131 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "๊ฒฝ๋ก๊ฐ %s์ผ ๋ .gitmodules์ ์น์
์ ์ฐพ์ ์ ์์ต๋๋ค" -#: submodule.c:82 +#: submodule.c:105 #, c-format msgid "Could not update .gitmodules entry %s" msgstr ".gitmodules ํญ๋ชฉ %s์(๋ฅผ) ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค" -#: submodule.c:115 +#: submodule.c:138 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "%s์ ๋ํ .gitmodules ํญ๋ชฉ์ ์ ๊ฑฐํ ์ ์์ต๋๋ค" -#: submodule.c:126 +#: submodule.c:149 msgid "staging updated .gitmodules failed" msgstr "์
๋ฐ์ดํธํ .gitmodules๋ฅผ ์ปค๋ฐํ ์ฌํญ์ผ๋ก ํ์ํ๋๋ฐ ์คํจ" -#: submodule.c:165 -msgid "negative values not allowed for submodule.fetchJobs" -msgstr "submodule.fetchJobs ๊ฐ์ ์์๋ฅผ ์ธ ์ ์์ต๋๋ค" - -#: submodule.c:376 +#: submodule.c:309 #, c-format msgid "in unpopulated submodule '%s'" msgstr "๋ด์ฉ์ด ์๋ ํ์ ๋ชจ๋ '%s'์์" -#: submodule.c:407 +#: submodule.c:340 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "๊ฒฝ๋ก๋ช
์ธ '%s'์(๋) ''%.*s' ํ์ ๋ชจ๋ ์์ ์์ต๋๋ค" -#: submodule.c:1337 +#: submodule.c:799 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "์๋ธ๋ชจ๋ ํญ๋ชฉ '%s'(%s)์(๋) %s์ด๊ณ , ์ปค๋ฐ์ด ์๋๋๋ค" + +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "HEAD๋ฅผ ์ฌ๋ฐ๋ฅธ ๋ ํผ๋ฐ์ค๋ก ๊ตฌํด๋ด๋๋ฐ ์คํจํ์ต๋๋ค." + +#: submodule.c:1304 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s'์(๋) ๊น ์ ์ฅ์๋ก ์ธ์๋์ง ์์ต๋๋ค" -#: submodule.c:1475 +#: submodule.c:1442 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "ํ์ ๋ชจ๋ '%s'์์ 'git status'๋ฅผ ์์ํ ์ ์์ต๋๋ค" -#: submodule.c:1488 +#: submodule.c:1455 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "ํ์ ๋ชจ๋ '%s'์์ 'git status'๋ฅผ ์คํํ ์ ์์ต๋๋ค" -#: submodule.c:1581 +#: submodule.c:1548 #, c-format msgid "submodule '%s' has dirty index" msgstr "'%s' ํ์ ๋ชจ๋์ ๋ณ๊ฒฝ๋ ์ธ๋ฑ์ค๊ฐ ์์ต๋๋ค" -#: submodule.c:1845 +#: submodule.c:1809 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3646,18 +3746,18 @@ msgstr "" "์ฌ๋ฌ ๊ฐ์ ์์
ํด๋๊ฐ ์๋ ํ์ ๋ชจ๋ '%s'์ ๋ํด relocate_gitdir์ ์ง์ํ์ง " "์์ต๋๋ค" -#: submodule.c:1857 submodule.c:1913 +#: submodule.c:1821 submodule.c:1877 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "ํ์ ๋ชจ๋ '%s'์ ์ด๋ฆ์ ์ฐพ์๋ณผ ์ ์์ต๋๋ค" -#: submodule.c:1861 builtin/submodule--helper.c:678 -#: builtin/submodule--helper.c:688 +#: submodule.c:1825 builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:681 #, c-format msgid "could not create directory '%s'" msgstr "'%s' ๋๋ ํฐ๋ฆฌ๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: submodule.c:1864 +#: submodule.c:1828 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3668,94 +3768,98 @@ msgstr "" "'%s'์์\n" "'%s'(์ผ)๋ก\n" -#: submodule.c:1948 +#: submodule.c:1912 #, c-format msgid "could not recurse into submodule '%s'" msgstr "์ฌ๊ท์ ์ผ๋ก '%s' ํ์ ๋ชจ๋์ ๋ค์ด๊ฐ ์ ์์ต๋๋ค" -#: submodule.c:1992 +#: submodule.c:1956 msgid "could not start ls-files in .." msgstr "'..' ์์์ ls-files๋ฅผ ์์ํ ์ ์์ต๋๋ค" -#: submodule.c:2012 +#: submodule.c:1976 msgid "BUG: returned path string doesn't match cwd?" msgstr "๋ฒ๊ทธ: ๋ฆฌํด๋ ๊ฒฝ๋ก ๋ฌธ์์ด์ด ํ์ฌ ๋๋ ํฐ๋ฆฌ์ ๋ง์ง ์์ต๋๋ค?" -#: submodule.c:2031 +#: submodule.c:1995 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree๊ฐ ์์์น ๋ชปํ ์ฝ๋ %d๋ฒ์ ๋ฆฌํดํ์ต๋๋ค" -#: submodule-config.c:420 +#: submodule-config.c:263 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "submodule.fetchjobs ๊ฐ์ ์์๋ฅผ ์ธ ์ ์์ต๋๋ค" + +#: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "%s์ ๊ฐ์ด ์ฌ๋ฐ๋ฅด์ง ์์ต๋๋ค" -#: trailer.c:241 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "ํธ๋ ์ผ๋ฌ ๋ช
๋ น '%s' ์คํ ์คํจ" -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 -#: trailer.c:544 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "์ ์ ์๋ ๊ฐ '%s', ํค '%s'" -#: trailer.c:526 trailer.c:531 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "%s์ด(๊ฐ) ์ฌ๋ฌ๊ฐ์
๋๋ค" -#: trailer.c:703 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "ํธ๋ ์ผ๋ฌ '%.*s'์์ ๋น ํธ๋ ์ผ๋ฌ ํ ํฐ" -#: trailer.c:723 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "'%s' ์
๋ ฅ ํ์ผ์ ์ฝ์ ์ ์์ต๋๋ค" -#: trailer.c:726 +#: trailer.c:753 msgid "could not read from stdin" msgstr "ํ์ค ์
๋ ฅ์์ ์ฝ์ ์ ์์ต๋๋ค" -#: trailer.c:950 builtin/am.c:45 +#: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "%s์ ๋ํด stat()ํ ์ ์์ต๋๋ค" -#: trailer.c:952 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "'%s' ํ์ผ์ด ์ผ๋ฐ ํ์ผ์ด ์๋๋๋ค" -#: trailer.c:954 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "์ฌ์ฉ์๊ฐ %s ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: trailer.c:966 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "์์ ํ์ผ์ ์ด ์ ์์ต๋๋ค: %s" -#: trailer.c:1002 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "์์ ํ์ผ ์ด๋ฆ์ '%s'(์ผ)๋ก ๋ฐ๊ฟ ์ ์์ต๋๋ค" -#: transport.c:63 +#: transport.c:62 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "'%1$s'์ ์
์คํธ๋ฆผ์ '%3$s'์ '%2$s'(์ผ)๋ก ์ค์ ํฉ๋๋ค\n" -#: transport.c:152 +#: transport.c:151 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ์๋ชป๋ ๊น์ด ์ต์
: %s" -#: transport.c:890 +#: transport.c:888 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3764,7 +3868,7 @@ msgstr "" "๋ค์ ํ์ ๋ชจ๋ ๊ฒฝ๋ก์ ๋ฆฌ๋ชจํธ ์ด๋์๋ ์๋\n" "๋ณ๊ฒฝ ์ฌํญ์ด ์์ต๋๋ค:\n" -#: transport.c:894 +#: transport.c:892 #, c-format msgid "" "\n" @@ -3791,7 +3895,7 @@ msgstr "" "๋ช
๋ น์ ์๋ํด ๋ณด์ญ์์ค\n" "\n" -#: transport.c:902 +#: transport.c:900 msgid "Aborting." msgstr "์ค์งํจ." @@ -3812,11 +3916,11 @@ msgstr "ํธ๋ฆฌ ์ํธ๋ฆฌ์ ์๋ชป๋ ํ์์ ๋ชจ๋" msgid "empty filename in tree entry" msgstr "ํธ๋ฆฌ ์ํธ๋ฆฌ์ ๋น ํ์ผ ์ด๋ฆ" -#: tree-walk.c:113 +#: tree-walk.c:114 msgid "too-short tree file" msgstr "๋๋ฌด ์งง์ ํธ๋ฆฌ ํ์ผ" -#: unpack-trees.c:105 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3825,7 +3929,7 @@ msgstr "" "๋ค์ ํ์ผ์ ๋ก์ปฌ ๋ณ๊ฒฝ ์ฌํญ์ ์ฒดํฌ์์ ๋๋ฌธ์ ๋ฎ์ด ์ฐ๊ฒ ๋ฉ๋๋ค:\n" "%%s๋ธ๋์น๋ฅผ ์ ํํ๊ธฐ ์ ์ ๋ณ๊ฒฝ ์ฌํญ์ ์ปค๋ฐํ๊ฑฐ๋ ์คํ์ํ์ญ์์ค." -#: unpack-trees.c:107 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3834,7 +3938,7 @@ msgstr "" "๋ค์ ํ์ผ์ ๋ก์ปฌ ๋ณ๊ฒฝ ์ฌํญ์ ์ฒดํฌ์์ ๋๋ฌธ์ ๋ฎ์ด ์ฐ๊ฒ ๋ฉ๋๋ค:\n" "%%s" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3843,14 +3947,14 @@ msgstr "" "๋ค์ ํ์ผ์ ๋ก์ปฌ ๋ณ๊ฒฝ ์ฌํญ์ ๋ณํฉ ๋๋ฌธ์ ๋ฎ์ด ์ฐ๊ฒ ๋ฉ๋๋ค:\n" "%%s๋ณํฉํ๊ธฐ ์ ์ ๋ณ๊ฒฝ ์ฌํญ์ ์ปค๋ฐํ๊ฑฐ๋ ์คํ์ํ์ญ์์ค." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "๋ค์ ํ์ผ์ ๋ก์ปฌ ๋ณ๊ฒฝ ์ฌํญ์ ๋ณํฉ ๋๋ฌธ์ ๋ฎ์ด ์ฐ๊ฒ ๋ฉ๋๋ค." -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3859,7 +3963,7 @@ msgstr "" "๋ค์ ํ์ผ์ ๋ก์ปฌ ๋ณ๊ฒฝ ์ฌํญ์ %s ๋๋ฌธ์ ๋ฎ์ด ์ฐ๊ฒ ๋ฉ๋๋ค:\n" "%%s%s ์ ์ ๋ณ๊ฒฝ ์ฌํญ์ ์ปค๋ฐํ๊ฑฐ๋ ์คํ์ํ์ญ์์ค." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3868,7 +3972,7 @@ msgstr "" "๋ค์ ํ์ผ์ ๋ก์ปฌ ๋ณ๊ฒฝ ์ฌํญ์ %s ๋๋ฌธ์ ๋ฎ์ด ์ฐ๊ฒ ๋ฉ๋๋ค:\n" "%%s" -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3877,7 +3981,7 @@ msgstr "" "๋ค์ ๋๋ ํฐ๋ฆฌ๋ฅผ ์
๋ฐ์ดํธํ๋ฉด ๊ทธ ์์ ์ถ์ ํ์ง ์๋ ํ์ผ์ ์์ด๋ฒ๋ฆฝ๋๋ค:\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3886,7 +3990,7 @@ msgstr "" "์ฒดํฌ์์ ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋์ ํ์ผ์ด ์ ๊ฑฐ๋ฉ๋๋ค:\n" "%%s๋ธ๋์น๋ฅผ ์ ํํ๊ธฐ ์ ์ ์ด ํ์ผ์ ์ฎ๊ธฐ๊ฑฐ๋ ์ ๊ฑฐํ์ญ์์ค." -#: unpack-trees.c:128 +#: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3895,7 +3999,7 @@ msgstr "" "์ฒดํฌ์์ ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋ ํ์ผ์ด ์ ๊ฑฐ๋ฉ๋๋ค:\n" "%%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3904,7 +4008,7 @@ msgstr "" "๋ณํฉ ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋์ ํ์ผ์ด ์ ๊ฑฐ๋ฉ๋๋ค:\n" "%%s๋ณํฉํ๊ธฐ ์ ์ ์ด ํ์ผ์ ์ฎ๊ธฐ๊ฑฐ๋ ์ ๊ฑฐํ์ญ์์ค." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3913,7 +4017,7 @@ msgstr "" "๋ณํฉ ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋ ํ์ผ์ด ์ ๊ฑฐ๋ฉ๋๋ค:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3922,7 +4026,7 @@ msgstr "" "%s ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋์ ํ์ผ์ด ์ ๊ฑฐ๋ฉ๋๋ค:\n" "%%s%s ํ๊ธฐ ์ ์ ์ด ํ์ผ์ ์ฎ๊ธฐ๊ฑฐ๋ ์ ๊ฑฐํ์ญ์์ค." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3931,7 +4035,7 @@ msgstr "" "%s ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋ ํ์ผ์ด ์ ๊ฑฐ๋ฉ๋๋ค:\n" "%%s" -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3941,7 +4045,7 @@ msgstr "" "์ฒดํฌ์์ ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋์ ํ์ผ์ ๋ฎ์ด์๋๋ค:\n" "%%s๋ธ๋์น๋ฅผ ์ ํํ๊ธฐ ์ ์ ์ด ํ์ผ์ ์ฎ๊ธฐ๊ฑฐ๋ ์ ๊ฑฐํ์ญ์์ค." -#: unpack-trees.c:145 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3951,7 +4055,7 @@ msgstr "" "์ฒดํฌ์์ ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋ ํ์ผ์ ๋ฎ์ด์๋๋ค:\n" "%%s" -#: unpack-trees.c:148 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3960,7 +4064,7 @@ msgstr "" "๋ณํฉ ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋์ ํ์ผ์ ๋ฎ์ด์๋๋ค:\n" "%%s๋ณํฉํ๊ธฐ ์ ์ ์ด ํ์ผ์ ์ฎ๊ธฐ๊ฑฐ๋ ์ ๊ฑฐํ์ญ์์ค." -#: unpack-trees.c:150 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3969,7 +4073,7 @@ msgstr "" "๋ณํฉ ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋ ํ์ผ์ ๋ฎ์ด์๋๋ค:\n" "%%s" -#: unpack-trees.c:153 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3978,7 +4082,7 @@ msgstr "" "%s ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋์ ํ์ผ์ ๋ฎ์ด์๋๋ค:\n" "%%s%s ํ๊ธฐ ์ ์ ์ด ํ์ผ์ ์ฎ๊ธฐ๊ฑฐ๋ ์ ๊ฑฐํ์ญ์์ค." -#: unpack-trees.c:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3987,22 +4091,21 @@ msgstr "" "%s ๋๋ฌธ์ ์ถ์ ํ์ง ์๋ ๋ค์ ์์
ํด๋ ํ์ผ์ ๋ฎ์ด์๋๋ค:\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:163 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "'%s' ํญ๋ชฉ์ด '%s'์(๊ณผ) ๊ฒน์นฉ๋๋ค. ๋ฌถ์ ์ ์์ต๋๋ค." -#: unpack-trees.c:165 +#: unpack-trees.c:166 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -"๋๋ฌธ ์ฒดํฌ์์์ ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค. ๋ค์ ํญ๋ชฉ์ด ์ต์ ์ผ๋ก ์
๋ฐ์ดํธ๋์ง ์" -"์์ต๋๋ค:\n" +"๋๋ฌธ ์ฒดํฌ์์์ ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค. ๋ค์ ํญ๋ชฉ์ด ์ต์ ์ผ๋ก ์
๋ฐ์ดํธ๋์ง ์์์ต๋๋ค:\n" "%s" -#: unpack-trees.c:167 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4013,7 +4116,7 @@ msgstr "" "๋ค:\n" "%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4024,7 +4127,7 @@ msgstr "" "๋ค:\n" "%s" -#: unpack-trees.c:171 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update submodule:\n" @@ -4033,17 +4136,12 @@ msgstr "" "ํ์ ๋ชจ๋์ ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค:\n" "%s" -#: unpack-trees.c:248 +#: unpack-trees.c:249 #, c-format msgid "Aborting\n" msgstr "์ค์งํจ\n" -#: unpack-trees.c:277 -#, c-format -msgid "submodule update strategy not supported for submodule '%s'" -msgstr "ํ์ ๋ชจ๋ ์
๋ฐ์ดํธ ์ ๋ต์ด '%s' ํ์ ๋ชจ๋์์ ์ง์ํ์ง ์์ต๋๋ค" - -#: unpack-trees.c:346 +#: unpack-trees.c:331 msgid "Checking out files" msgstr "ํ์ผ์ ๊ฐ์ ธ์ต๋๋ค" @@ -4086,13 +4184,8 @@ msgstr "'%s'์(๋ฅผ) ์ฝ๋๋ฐ ์คํจํ์ต๋๋ค" msgid "could not open '%s' for reading and writing" msgstr "์ฝ๊ธฐ์ ์ฐ๊ธฐ์ฉ์ผ๋ก '%s'์(๋ฅผ) ์ด ์ ์์ต๋๋ค" -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 -#, c-format -msgid "could not open '%s' for writing" -msgstr "'%s'์(๋ฅผ) ์ฐ๊ธฐ์ฉ์ผ๋ก ์ด ์ ์์ต๋๋ค" - -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 -#: builtin/am.c:849 builtin/merge.c:1014 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 +#: builtin/am.c:858 builtin/merge.c:1041 #, c-format msgid "could not open '%s' for reading" msgstr "'%s'์(๋ฅผ) ์ฝ๊ธฐ์ฉ์ผ๋ก ์ด ์ ์์ต๋๋ค" @@ -4116,196 +4209,196 @@ msgstr "%s์ ์ธ ์ ์์ต๋๋ค" msgid "could not close %s" msgstr "%s์(๋ฅผ) ๋ซ์ ์ ์์ต๋๋ค" -#: wt-status.c:152 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "๋ณํฉํ์ง ์์ ๊ฒฝ๋ก:" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (์คํ
์ด์ง ํด์ ํ๋ ค๋ฉด \"git reset %s <ํ์ผ>...\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (์คํ
์ด์ง ํด์ ํ๋ ค๋ฉด \"git rm --cached <ํ์ผ>...\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:185 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (ํด๊ฒฐํ๋ค๊ณ ํ์ํ๋ ค๋ฉด \"git add <ํ์ผ>...\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:187 wt-status.c:191 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (ํด๊ฒฐํ๋ค๊ณ ํ์ํ๋ ค๋ฉด ์๋ง๊ฒ \"git add/rm <ํ์ผ>...\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:189 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (ํด๊ฒฐํ๋ค๊ณ ํ์ํ๋ ค๋ฉด \"git rm <ํ์ผ>...\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:200 wt-status.c:981 +#: wt-status.c:198 wt-status.c:979 msgid "Changes to be committed:" msgstr "์ปค๋ฐํ ๋ณ๊ฒฝ ์ฌํญ:" -#: wt-status.c:218 wt-status.c:990 +#: wt-status.c:216 wt-status.c:988 msgid "Changes not staged for commit:" msgstr "์ปค๋ฐํ๋๋ก ์ ํ์ง ์์ ๋ณ๊ฒฝ ์ฌํญ:" -#: wt-status.c:222 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (๋ฌด์์ ์ปค๋ฐํ ์ง ๋ฐ๊พธ๋ ค๋ฉด \"git add <ํ์ผ>...\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:224 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (๋ฌด์์ ์ปค๋ฐํ ์ง ๋ฐ๊พธ๋ ค๋ฉด \"git add/rm <ํ์ผ>...\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:225 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (์์
ํด๋์ ๋ณ๊ฒฝ ์ฌํญ์ ๋ฒ๋ฆฌ๋ ค๋ฉด \"git checkout -- <ํ์ผ>...\"์ ์ฌ์ฉํ์ญ" "์์ค)" -#: wt-status.c:227 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (ํ์ ๋ชจ๋์ ์ถ์ ๋์ง ์๋ ํ์ผ์ด๋ ์์ ๋ ๋ด์ฉ์ ์ปค๋ฐํ๊ฑฐ๋ ๋ฒ๋ฆฌ์ญ์์ค)" -#: wt-status.c:239 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (์ปค๋ฐํ ์ฌํญ์ ํฌํจํ๋ ค๋ฉด \"git %s <ํ์ผ>...\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:254 +#: wt-status.c:252 msgid "both deleted:" msgstr "์์ชฝ์์ ์ญ์ :" -#: wt-status.c:256 +#: wt-status.c:254 msgid "added by us:" msgstr "์ด ์ชฝ์์ ์ถ๊ฐ:" -#: wt-status.c:258 +#: wt-status.c:256 msgid "deleted by them:" msgstr "์ ์ชฝ์์ ์ญ์ :" -#: wt-status.c:260 +#: wt-status.c:258 msgid "added by them:" msgstr "์ ์ชฝ์์ ์ถ๊ฐ:" -#: wt-status.c:262 +#: wt-status.c:260 msgid "deleted by us:" msgstr "์ด ์ชฝ์์ ์ญ์ :" -#: wt-status.c:264 +#: wt-status.c:262 msgid "both added:" msgstr "์์ชฝ์์ ์ถ๊ฐ:" -#: wt-status.c:266 +#: wt-status.c:264 msgid "both modified:" msgstr "์์ชฝ์์ ์์ :" -#: wt-status.c:276 +#: wt-status.c:274 msgid "new file:" msgstr "์ ํ์ผ:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "copied:" msgstr "๋ณต์ฌํจ:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "deleted:" msgstr "์ญ์ ํจ:" -#: wt-status.c:282 +#: wt-status.c:280 msgid "modified:" msgstr "์์ ํจ:" -#: wt-status.c:284 +#: wt-status.c:282 msgid "renamed:" msgstr "์ด๋ฆ ๋ฐ๊ฟ:" -#: wt-status.c:286 +#: wt-status.c:284 msgid "typechange:" msgstr "์ข
๋ฅ ๋ฐ๋:" -#: wt-status.c:288 +#: wt-status.c:286 msgid "unknown:" msgstr "์ ์ ์์:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "unmerged:" msgstr "๋ณํฉํ์ง ์์:" -#: wt-status.c:372 +#: wt-status.c:370 msgid "new commits, " msgstr "์ ์ปค๋ฐ, " -#: wt-status.c:374 +#: wt-status.c:372 msgid "modified content, " msgstr "์์ ํ ๋ด์ฉ, " -#: wt-status.c:376 +#: wt-status.c:374 msgid "untracked content, " msgstr "์ถ์ ํ์ง ์์ ๋ด์ฉ, " -#: wt-status.c:821 +#: wt-status.c:819 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "ํ์ฌ ์คํ์์ %d๊ฐ ํญ๋ชฉ์ด ์์ต๋๋ค" -#: wt-status.c:853 +#: wt-status.c:851 msgid "Submodules changed but not updated:" msgstr "๋ณ๊ฒฝ๋์์ง๋ง ์
๋ฐ์ดํธํ์ง ์์ ํ์ ๋ชจ๋:" -#: wt-status.c:855 +#: wt-status.c:853 msgid "Submodule changes to be committed:" msgstr "์ปค๋ฐํ ํ์ ๋ชจ๋์ ๋ณ๊ฒฝ ์ฌํญ:" -#: wt-status.c:937 +#: wt-status.c:935 msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." msgstr "" -"์์ ์ค์ ๋ฐ๊พธ์ง ๋ง์ญ์์ค.\n" -"์๋ ์๋ ๋ด์ฉ์ ๋ชจ๋ ์ ๊ฑฐ๋ฉ๋๋ค." +"์์ ์ค์ ๋ฐ๊พธ๊ฑฐ๋ ์ง์ฐ์ง ๋ง์ญ์์ค.\n" +"์๋ ์๋ ๋ด์ฉ์ ๋ชจ๋ ๋ฌด์๋ฉ๋๋ค." -#: wt-status.c:1049 +#: wt-status.c:1048 msgid "You have unmerged paths." msgstr "๋ณํฉํ์ง ์์ ๊ฒฝ๋ก๊ฐ ์์ต๋๋ค." -#: wt-status.c:1052 +#: wt-status.c:1051 msgid " (fix conflicts and run \"git commit\")" msgstr " (์ถฉ๋์ ๋ฐ๋ก์ก๊ณ \"git commit\"์ ์คํํ์ญ์์ค)" -#: wt-status.c:1054 +#: wt-status.c:1053 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (๋ณํฉ์ ์ค๋จํ๋ ค๋ฉด \"git merge --abort\"๋ฅผ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:1059 +#: wt-status.c:1058 msgid "All conflicts fixed but you are still merging." msgstr "๋ชจ๋ ์ถฉ๋์ ๋ฐ๋ก์ก์์ง๋ง ์์ง ๋ณํฉํ๋ ์ค์
๋๋ค." -#: wt-status.c:1062 +#: wt-status.c:1061 msgid " (use \"git commit\" to conclude merge)" msgstr " (๋ณํฉ์ ๋ง๋ฌด๋ฆฌํ๋ ค๋ฉด \"git commit\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:1072 +#: wt-status.c:1071 msgid "You are in the middle of an am session." msgstr "am ์ธ์
์ค๊ฐ์ ์์ต๋๋ค." -#: wt-status.c:1075 +#: wt-status.c:1074 msgid "The current patch is empty." msgstr "ํ์ฌ ํจ์น๊ฐ ๋น์ด ์์ต๋๋ค." -#: wt-status.c:1079 +#: wt-status.c:1078 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (์ถฉ๋์ ๋ฐ๋ก์ก์ ๋ค์ \"git am --continue\"๋ฅผ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:1081 +#: wt-status.c:1080 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (์ด ํจ์น๋ฅผ ๊ฑด๋ ๋ฐ๋ ค๋ฉด \"git am --skip\"์ ์ฌ์ฉํ์ญ์์ค)" -#: wt-status.c:1083 +#: wt-status.c:1082 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (์๋ณธ ๋ธ๋์น๋ฅผ ๋ณต๊ตฌํ๋ ค๋ฉด \"git am --abort\"๋ฅผ ์ฌ์ฉํ์ญ์์ค)" @@ -4595,7 +4688,7 @@ msgstr "์ถ๊ฐ๋ก, ์ธ๋ฑ์ค์ ์ปค๋ฐํ์ง ์์ ๋ณ๊ฒฝ ์ฌํญ์ด ์์ต๋๋ msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s ํ ์ ์์ต๋๋ค: ์ธ๋ฑ์ค์ ์ปค๋ฐํ์ง ์์ ๋ณ๊ฒฝ ์ฌํญ์ด ์์ต๋๋ค." -#: compat/precompose_utf8.c:58 builtin/clone.c:436 +#: compat/precompose_utf8.c:58 builtin/clone.c:437 #, c-format msgid "failed to unlink '%s'" msgstr "'%s' ํ์ผ ์ญ์ ์ ์คํจํ์ต๋๋ค" @@ -4609,7 +4702,7 @@ msgstr "git add [<์ต์
>] [--] <๊ฒฝ๋ก๋ช
์ธ>..." msgid "unexpected diff status %c" msgstr "์์์น ๋ชปํ diff ์ํ %c" -#: builtin/add.c:87 builtin/commit.c:292 +#: builtin/add.c:87 builtin/commit.c:291 msgid "updating files failed" msgstr "ํ์ผ ์
๋ฐ์ดํธ๊ฐ ์คํจํ์ต๋๋ค" @@ -4618,108 +4711,108 @@ msgstr "ํ์ผ ์
๋ฐ์ดํธ๊ฐ ์คํจํ์ต๋๋ค" msgid "remove '%s'\n" msgstr "'%s' ์ ๊ฑฐ\n" -#: builtin/add.c:151 +#: builtin/add.c:153 msgid "Unstaged changes after refreshing the index:" msgstr "์ธ๋ฑ์ค๋ฅผ ์๋ก ๊ณ ์น ๋ค์ ์ปค๋ฐ ํ์ํ์ง ์์ ๋ณ๊ฒฝ ์ฌํญ:" -#: builtin/add.c:211 builtin/rev-parse.c:873 +#: builtin/add.c:213 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "์ธ๋ฑ์ค๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/add.c:222 +#: builtin/add.c:224 #, c-format msgid "Could not open '%s' for writing." msgstr "'%s' ํ์ผ์ ์ฐ๊ธฐ์ฉ์ผ๋ก ์ด ์ ์์ต๋๋ค." -#: builtin/add.c:226 +#: builtin/add.c:228 msgid "Could not write patch" msgstr "ํจ์น๋ฅผ ์ธ ์ ์์ต๋๋ค" -#: builtin/add.c:229 +#: builtin/add.c:231 msgid "editing patch failed" msgstr "ํจ์น ํธ์ง์ ์คํจํ์ต๋๋ค" -#: builtin/add.c:232 +#: builtin/add.c:234 #, c-format msgid "Could not stat '%s'" msgstr "'%s'์(๋ฅผ) stat()ํ ์ ์์ต๋๋ค" -#: builtin/add.c:234 +#: builtin/add.c:236 msgid "Empty patch. Aborted." msgstr "๋น ํจ์น. ์ค์ง." -#: builtin/add.c:239 +#: builtin/add.c:241 #, c-format msgid "Could not apply '%s'" msgstr "'%s'์(๋ฅผ) ์ ์ฉํ ์ ์์ต๋๋ค" -#: builtin/add.c:249 +#: builtin/add.c:251 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "๋ค์ ๊ฒฝ๋ก๋ .gitignore ํ์ผ ์ค ํ๋ ๋๋ฌธ์ ๋ฌด์ํฉ๋๋ค:\n" -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "๊ฐ์ง๋ก ์คํ" -#: builtin/add.c:272 +#: builtin/add.c:274 msgid "interactive picking" msgstr "๋ํ์์ผ๋ก ๊ณ ๋ฆ
๋๋ค" -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 msgid "select hunks interactively" msgstr "๋ํ์์ผ๋ก ๋ณ๊ฒฝ๋ ๋ถ๋ถ์ ์ ํํฉ๋๋ค" -#: builtin/add.c:274 +#: builtin/add.c:276 msgid "edit current diff and apply" msgstr "ํ์ฌ diff๋ฅผ ํธ์งํ๊ณ ์ ์ฉํฉ๋๋ค" -#: builtin/add.c:275 +#: builtin/add.c:277 msgid "allow adding otherwise ignored files" msgstr "๋ฌด์ํ๋ ํ์ผ์ ์ถ๊ฐ๋ฅผ ํ์ฉํฉ๋๋ค" -#: builtin/add.c:276 +#: builtin/add.c:278 msgid "update tracked files" msgstr "์ถ์ ๋๋ ํ์ผ์ ์
๋ฐ์ดํธํฉ๋๋ค" -#: builtin/add.c:277 +#: builtin/add.c:279 msgid "record only the fact that the path will be added later" msgstr "๋์ค์ ์ถ๊ฐํ ๊ฒ์ด๋ผ๋ ์ฌ์ค๋ง ๊ธฐ๋กํฉ๋๋ค" -#: builtin/add.c:278 +#: builtin/add.c:280 msgid "add changes from all tracked and untracked files" msgstr "์ถ์ ๋๊ณ ์ถ์ ๋์ง ์๋ ๋ชจ๋ ํ์ผ์ ๋ณ๊ฒฝ ์ฌํญ์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/add.c:281 +#: builtin/add.c:283 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "์์
ํด๋์์ ์ ๊ฑฐํ ๊ฒฝ๋ก๋ฅผ ๋ฌด์ํฉ๋๋ค (--no-all๊ณผ ๋์ผ)" -#: builtin/add.c:283 +#: builtin/add.c:285 msgid "don't add, only refresh the index" msgstr "์ถ๊ฐํ์ง ์๊ณ ์ธ๋ฑ์ค๋ง ์๋ก ๊ณ ์นฉ๋๋ค" -#: builtin/add.c:284 +#: builtin/add.c:286 msgid "just skip files which cannot be added because of errors" msgstr "์ค๋ฅ ๋๋ฌธ์ ์ถ๊ฐํ ์ ์๋ ํ์ผ์ ๊ฑด๋๋๋๋ค" -#: builtin/add.c:285 +#: builtin/add.c:287 msgid "check if - even missing - files are ignored in dry run" msgstr "๊ฐ์ง๋ก ์คํํ์ ๋ ํ์ผ์ ๋ฌด์ํ๋์ง ํ์ธํฉ๋๋ค" -#: builtin/add.c:286 builtin/update-index.c:952 +#: builtin/add.c:288 builtin/update-index.c:954 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:286 builtin/update-index.c:953 +#: builtin/add.c:288 builtin/update-index.c:955 msgid "override the executable bit of the listed files" msgstr "๋ชฉ๋ก์ ํ์ผ์์ ์คํ ๊ฐ๋ฅ ๋นํธ๋ฅผ ๋ฐ๊ฟ๋๋ค" -#: builtin/add.c:288 +#: builtin/add.c:290 msgid "warn when adding an embedded repository" msgstr "๋ด์ฅ ์ ์ฅ์๋ฅผ ์ถ๊ฐํ ๋ ๊ฒฝ๊ณ ๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/add.c:303 +#: builtin/add.c:305 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4749,151 +4842,151 @@ msgstr "" "\n" "๋ ์์ธํ ์ ๋ณด๋ \"git help submodule\"์ ์ฐธ๊ณ ํ์ญ์์ค." -#: builtin/add.c:331 +#: builtin/add.c:333 #, c-format msgid "adding embedded git repository: %s" msgstr "๋ด์ฅ ๊น ์ ์ฅ์ ์ถ๊ฐ: %s" -#: builtin/add.c:349 +#: builtin/add.c:351 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "์ ๋ง๋ก ์ถ๊ฐํ๋ ค๋ฉด -f ์ต์
์ ์ฌ์ฉํ์ญ์์ค.\n" -#: builtin/add.c:357 +#: builtin/add.c:359 msgid "adding files failed" msgstr "ํ์ผ ์ถ๊ฐ๊ฐ ์คํจํ์ต๋๋ค" -#: builtin/add.c:394 +#: builtin/add.c:396 msgid "-A and -u are mutually incompatible" msgstr "-A ๋ฐ -u ์ต์
์ ์๋ก ํธํ๋์ง ์์ต๋๋ค" -#: builtin/add.c:401 +#: builtin/add.c:403 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "--ignore-missing ์ต์
์ --dry-run ์ต์
๊ณผ ๊ฐ์ด ์ฌ์ฉํ ๊ฒฝ์ฐ์๋ง ์ธ ์ ์์ต๋๋ค." -#: builtin/add.c:405 +#: builtin/add.c:407 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod ํ๋ผ๋ฏธํฐ '%s'์(๋) -x ๋๋ +x ํ์์ด์ด์ผ ํฉ๋๋ค" -#: builtin/add.c:420 +#: builtin/add.c:422 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "์๋ฌด ๊ฒ๋ ์ง์ ํ์ง ์์์ผ๋ฏ๋ก ์๋ฌด ๊ฒ๋ ์ถ๊ฐํ์ง ์์ต๋๋ค.\n" -#: builtin/add.c:421 +#: builtin/add.c:423 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "'git add .' ๋ช
๋ น์ ์คํํ๋ ค๊ณ ํ ๊ฒ ์๋์์ต๋๊น?\n" -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 -#: builtin/submodule--helper.c:244 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 +#: builtin/submodule--helper.c:243 msgid "index file corrupt" msgstr "์ธ๋ฑ์ค ํ์ผ์ด ์์๋์์ต๋๋ค" -#: builtin/am.c:413 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "์์ฑ์ ์คํฌ๋ฆฝํธ๋ฅผ ํ์ฑํ ์ ์์ต๋๋ค" -#: builtin/am.c:489 +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "applypatch-msg ํ
๋๋ฌธ์ '%s'์ด(๊ฐ) ์ญ์ ๋์์ต๋๋ค." -#: builtin/am.c:530 +#: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "์๋ชป๋ ํ์์ ์
๋ ฅ ์ค: '%s'." -#: builtin/am.c:567 +#: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "'%s'์์ '%s'(์ผ)๋ก ๋
ธํธ๋ฅผ ๋ณต์ฌํ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/am.c:593 +#: builtin/am.c:602 msgid "fseek failed" msgstr "fseek ์คํจ" -#: builtin/am.c:777 +#: builtin/am.c:786 #, c-format msgid "could not parse patch '%s'" msgstr "'%s' ํจ์น๋ฅผ ํ์ฑํ ์ ์์ต๋๋ค" -#: builtin/am.c:842 +#: builtin/am.c:851 msgid "Only one StGIT patch series can be applied at once" msgstr "ํ๋ฒ์ ํ๋์ StGIT ํจ์น ์๋ฆฌ์ฆ๋ง ์ ์ฉํ ์ ์์ต๋๋ค" -#: builtin/am.c:889 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "์๊ฐ์ด ์๋ชป๋์์ต๋๋ค" -#: builtin/am.c:892 builtin/am.c:900 +#: builtin/am.c:904 builtin/am.c:916 msgid "invalid Date line" msgstr "Date ์ค์ด ์๋ชป๋์์ต๋๋ค" -#: builtin/am.c:897 +#: builtin/am.c:911 msgid "invalid timezone offset" msgstr "์๊ฐ๋ ์คํ์
์ด ์๋ชป๋์์ต๋๋ค" -#: builtin/am.c:986 +#: builtin/am.c:1004 msgid "Patch format detection failed." msgstr "ํจ์น ํ์ ๊ฒ์์ด ์คํจํ์ต๋๋ค." -#: builtin/am.c:991 builtin/clone.c:401 +#: builtin/am.c:1009 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "'%s' ๋๋ ํฐ๋ฆฌ ๋ง๋ค๊ธฐ๊ฐ ์คํจํ์ต๋๋ค" -#: builtin/am.c:995 +#: builtin/am.c:1013 msgid "Failed to split patches." msgstr "ํจ์น๋ฅผ ์ชผ๊ฐ๋๋ฐ ์คํจํ์ต๋๋ค." -#: builtin/am.c:1120 builtin/commit.c:377 +#: builtin/am.c:1142 builtin/commit.c:376 msgid "unable to write index file" msgstr "์ธ๋ฑ์ค ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: builtin/am.c:1171 +#: builtin/am.c:1193 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "์ด ๋ฌธ์ ๋ฅผ ํด๊ฒฐํ์ ๋ \"%s --continue\"๋ฅผ ์คํํ์ญ์์ค." -#: builtin/am.c:1172 +#: builtin/am.c:1194 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "์ด ํจ์น๋ฅผ ๊ฑด๋๋ฐ๋ ค๋ฉด, ๊ทธ ๋์ \"%s --skip\"์ ์คํํ์ญ์์ค." -#: builtin/am.c:1173 +#: builtin/am.c:1195 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "์๋ ๋ธ๋์น๋ฅผ ๋ณต๊ตฌํ๊ณ ํจ์น ์ ์ฉ์ ์ค์งํ๋ ค๋ฉด \"%s --abort\"๋ฅผ ์คํํ์ญ์์ค." -#: builtin/am.c:1304 +#: builtin/am.c:1302 msgid "Patch is empty." msgstr "ํจ์น๊ฐ ๋น์ด ์์ต๋๋ค." -#: builtin/am.c:1370 +#: builtin/am.c:1368 #, c-format msgid "invalid ident line: %.*s" msgstr "์๋ชป๋ ์ ์ ์ค: %.*s" -#: builtin/am.c:1392 +#: builtin/am.c:1390 #, c-format msgid "unable to parse commit %s" msgstr "%s ์ปค๋ฐ์ ํ์ฑํ ์ ์์ต๋๋ค" -#: builtin/am.c:1586 +#: builtin/am.c:1584 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "์ ์ฅ์์ 3-๋ฐฉํฅ ๋ณํฉ์ผ๋ก ๋์ ํ ๋ ํ์ํ ๋ธ๋กญ์ด ์์ต๋๋ค." -#: builtin/am.c:1588 +#: builtin/am.c:1586 msgid "Using index info to reconstruct a base tree..." msgstr "์ธ๋ฑ์ค ์ ๋ณด๋ฅผ ์ฌ์ฉํด ๊ธฐ๋ณธ ํธ๋ฆฌ๋ฅผ ๋ค์ ๋ง๋ญ๋๋ค..." -#: builtin/am.c:1607 +#: builtin/am.c:1605 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4901,38 +4994,38 @@ msgstr "" "ํจ์น๋ฅผ ์ง์ ํธ์งํ์
จ์ต๋๊น?\n" "์ด ํจ์น๋ ์ธ๋ฑ์ค์ ๊ธฐ๋ก๋ ๋ธ๋กญ์๋ ์ ์ฉ๋์ง ์์ต๋๋ค." -#: builtin/am.c:1613 +#: builtin/am.c:1611 msgid "Falling back to patching base and 3-way merge..." msgstr "๋ฒ ์ด์ค ํจ์น ์ ์ฉ ๋ฐ 3-๋ฐฉํฅ ๋ณํฉ์ผ๋ก ๋์ ํฉ๋๋ค..." -#: builtin/am.c:1638 +#: builtin/am.c:1636 msgid "Failed to merge in the changes." msgstr "๋ณ๊ฒฝ ์ฌํญ์์ ๋ณํฉํ๋๋ฐ ์คํจํ์ต๋๋ค." -#: builtin/am.c:1662 builtin/merge.c:632 +#: builtin/am.c:1660 builtin/merge.c:641 msgid "git write-tree failed to write a tree" msgstr "git write-tree๊ฐ ํธ๋ฆฌ๋ฅผ ์ฐ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/am.c:1669 +#: builtin/am.c:1667 msgid "applying to an empty history" msgstr "๋น ์ปค๋ฐ ๋ด์ญ์ ๋ํด ์ ์ฉํฉ๋๋ค" -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 -#: builtin/merge.c:828 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "์ปค๋ฐ ์ค๋ธ์ ํธ๋ฅผ ์ฐ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/am.c:1715 builtin/am.c:1719 +#: builtin/am.c:1713 builtin/am.c:1717 #, c-format msgid "cannot resume: %s does not exist." msgstr "๋ค์ ์์ํ ์ ์์ต๋๋ค: %s์ด(๊ฐ) ์์ต๋๋ค." -#: builtin/am.c:1735 +#: builtin/am.c:1733 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "ํฐ๋ฏธ๋์ ํ์ค ์
๋ ฅ์ด ์ฐ๊ฒฐ๋์ง ์์ ์ํ์์ ๋ํํ์ผ๋ก ์คํํ ์ ์์ต๋๋ค." -#: builtin/am.c:1740 +#: builtin/am.c:1738 msgid "Commit Body is:" msgstr "์ปค๋ฐ ๋ณธ๋ฌธ์:" @@ -4940,35 +5033,35 @@ msgstr "์ปค๋ฐ ๋ณธ๋ฌธ์:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1750 +#: builtin/am.c:1748 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "์ ์ฉ? ์[y]/์๋์ค[n]/ํธ์ง[e]/ํจ์น ๋ณด๊ธฐ[v]/๋ชจ๋ ์ ์ฉ[a]: " -#: builtin/am.c:1800 +#: builtin/am.c:1798 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "๋ณ๊ฒฝ๋ ์ธ๋ฑ์ค: ํจ์น๋ฅผ ์ ์ฉํ ์ ์์ต๋๋ค (dirty: %s)" -#: builtin/am.c:1840 builtin/am.c:1912 +#: builtin/am.c:1838 builtin/am.c:1910 #, c-format msgid "Applying: %.*s" msgstr "์ ์ฉํ๋ ์ค: %.*s" -#: builtin/am.c:1856 +#: builtin/am.c:1854 msgid "No changes -- Patch already applied." msgstr "๋ณ๊ฒฝ ์ฌํญ ์์ -- ํจ์น๊ฐ ์ด๋ฏธ ์ ์ฉ๋์์ต๋๋ค." -#: builtin/am.c:1864 +#: builtin/am.c:1862 #, c-format msgid "Patch failed at %s %.*s" msgstr "ํจ์น๊ฐ %s %.*s ์์น์์ ์คํจํ์ต๋๋ค" -#: builtin/am.c:1870 +#: builtin/am.c:1868 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "์คํจํ ํจ์น์ ๋ณต์ฌ๋ณธ์ด ๋ค์ ์์น์ ์์ต๋๋ค: %s" -#: builtin/am.c:1915 +#: builtin/am.c:1913 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4978,7 +5071,7 @@ msgstr "" "์ปค๋ฐ์ผ๋ก ํ์ํ ์ฌํญ์ด ๋จ์ ์์ง ์์ผ๋ฉด, ์ด๋ฏธ ๊ฐ์ ํจ์น์์ ์ ์ฉ๋\n" "๊ฒฝ์ฐ์ผ ์๋ ์์ต๋๋ค. ๊ทธ๋ฐ ๊ฒฝ์ฐ์๋ ์ด ํจ์น๋ฅผ ๊ฑด๋๋ฐ๋ฉด ๋ฉ๋๋ค." -#: builtin/am.c:1922 +#: builtin/am.c:1920 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -4989,17 +5082,17 @@ msgstr "" "์ถฉ๋์ ํด๊ฒฐํ ํ์ผ์ 'git add'ํด์ ํด๊ฒฐํ๋ค๊ณ ํ์ํด์ผ ํฉ๋๋ค.\n" "ํ์ผ์ \"์ ์ชฝ์์ ์ญ์ \"๋ฅผ ๋ฐ์๋ค์ด๋ ค๋ฉด `git rm`์ ์คํํ์ญ์์ค." -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 -#: builtin/reset.c:331 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "'%s' ์ค๋ธ์ ํธ๋ฅผ ํ์ฑํ ์ ์์ต๋๋ค." -#: builtin/am.c:2083 +#: builtin/am.c:2081 msgid "failed to clean index" msgstr "์ธ๋ฑ์ค ์ง์ฐ๊ธฐ์ ์คํจํ์ต๋๋ค" -#: builtin/am.c:2117 +#: builtin/am.c:2116 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5007,137 +5100,136 @@ msgstr "" "๋ง์ง๋ง 'am' ์คํจ ์ดํ HEAD๋ฅผ ์ฎ๊ธด ๊ฒ ๊ฐ์ต๋๋ค.\n" "ORIG_HEAD๋ก ๋๋๋ฆฌ์ง ์์ต๋๋ค." -#: builtin/am.c:2180 +#: builtin/am.c:2179 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "--patch-format ์ต์
์ ๋ํด ์๋ชป๋ ๊ฐ: %s" -#: builtin/am.c:2213 +#: builtin/am.c:2212 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<์ต์
>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<์ต์
>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2219 msgid "run interactively" msgstr "๋ํํ์ผ๋ก ์คํํฉ๋๋ค" -#: builtin/am.c:2222 +#: builtin/am.c:2221 msgid "historical option -- no-op" msgstr "์๋ฌด ๋์๋ ํ์ง ์์ต๋๋ค (๊ณผ๊ฑฐ๋ถํฐ ์์๋ ์ต์
)" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "allow fall back on 3way merging if needed" msgstr "ํ์ํ๋ฉด 3-๋ฐฉํฅ ๋ณํฉ์ผ๋ก ๋์ ํ๋๋ก ํ์ฉํฉ๋๋ค" -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "๊ฐ๋ตํ ํ์ํฉ๋๋ค" -#: builtin/am.c:2227 +#: builtin/am.c:2226 msgid "add a Signed-off-by line to the commit message" msgstr "์ปค๋ฐ ๋ฉ์์ง์ Signed-off-by ์ค์ ๋จ๊น๋๋ค" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "recode into utf8 (default)" msgstr "UTF-8 ์ธ์ฝ๋ฉ์ผ๋ก ๋ณํํฉ๋๋ค (๊ธฐ๋ณธ๊ฐ)" -#: builtin/am.c:2232 +#: builtin/am.c:2231 msgid "pass -k flag to git-mailinfo" msgstr "git-mailinfo์ -k ์ต์
์ ์๋๋ค" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "pass -b flag to git-mailinfo" msgstr "git-mailinfo์ -b ์ต์
์ ์๋๋ค" -#: builtin/am.c:2236 +#: builtin/am.c:2235 msgid "pass -m flag to git-mailinfo" msgstr "git-mailinfo์ -m ์ต์
์ ์๋๋ค" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "mbox ํ์์ ๋ํด git-mailsplit์ --keep-cr ์ต์
์ ์ฌ์ฉํฉ๋๋ค" -#: builtin/am.c:2241 +#: builtin/am.c:2240 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "am.keepcr์ ๋ฌด๊ดํ๊ฒ git-mailsplit์ --keep-cr ์ต์
์ ์ฌ์ฉํ์ง ์์ต๋๋ค." -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "strip everything before a scissors line" msgstr "์ ์ทจ์ ์์ ๋ชจ๋ ์ฌํญ์ ๋ฌด์ํฉ๋๋ค" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 +#: builtin/am.c:2272 msgid "pass it through git-apply" msgstr "git-apply์ ๋๊น๋๋ค" -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 -#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193 -#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 -#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134 -#: parse-options.h:245 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "ํ์" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "format the patch(es) are in" msgstr "ํจ์น์ ํ์" -#: builtin/am.c:2276 +#: builtin/am.c:2275 msgid "override error message when patch failure occurs" msgstr "ํจ์น ์คํจ๊ฐ ๋ฐ์ํ์ ๋ ์ค๋ฅ ๋ฉ์์ง ๋์ ์ฌ์ฉํฉ๋๋ค" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "continue applying patches after resolving a conflict" msgstr "์ถฉ๋์ ํด๊ฒฐํ ๋ค์ ํจ์น ์ ์ฉ์ ๊ณ์ํฉ๋๋ค" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "synonyms for --continue" msgstr "--continue ์ต์
๊ณผ ๋์ผ" -#: builtin/am.c:2284 +#: builtin/am.c:2283 msgid "skip the current patch" msgstr "ํ์ฌ ํจ์น ๊ฑด๋๋ฐ๊ธฐ" -#: builtin/am.c:2287 +#: builtin/am.c:2286 msgid "restore the original branch and abort the patching operation." msgstr "์๋ ๋ธ๋์น๋ฅผ ๋ณต๊ตฌํ๊ณ ํจ์น ์ ์ฉ ์์
์ ์ค์งํฉ๋๋ค." # NOTE: ์ต์
์ ์๋ฏธ๋ ์ด๊ฒ ๋ง๋ค. ์๋ฌธ์์๋ ์ฌ์ฉ์๊ฐ # --committer-date-is-author-date๋ผ๋ ์ต์
์ ๋ณด๊ณ ์๋ฏธ๋ฅผ ์ ์ ์๋ค๊ณ ๊ฐ์ ํ๊ณ ์๋ค. -#: builtin/am.c:2291 +#: builtin/am.c:2290 msgid "lie about committer date" msgstr "์ปค๋ฏธํฐ ์๊ฐ์ ์์ฑ์ ์๊ฐ์ผ๋ก ๋ฃ์ต๋๋ค" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "use current timestamp for author date" msgstr "ํ์ฌ ์๊ฐ์ ์์ฑ์ ์๊ฐ์ผ๋ก ์ฌ์ฉํฉ๋๋ค" -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "ํค-ID" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "GPG-sign commits" msgstr "GPG ์๋ช
์ปค๋ฐ" -#: builtin/am.c:2299 +#: builtin/am.c:2298 msgid "(internal use for git-rebase)" msgstr "(git-rebase๋ฅผ ์ํ ๋ด๋ถ ์ฉ๋)" -#: builtin/am.c:2317 +#: builtin/am.c:2316 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." @@ -5145,16 +5237,16 @@ msgstr "" "-b/--binary ์ต์
์ ์ค๋ ์๊ฐ ๋์ ์๋ฌด ๋์๋ ํ์ง ์์์ผ๋ฏ๋ก, ์ด\n" "์ต์
์ ์ ๊ฑฐ๋ ์์ ์
๋๋ค. ์ด์ ์ฌ์ฉํ์ง ๋ง์ญ์์ค." -#: builtin/am.c:2324 +#: builtin/am.c:2323 msgid "failed to read the index" msgstr "์ธ๋ฑ์ค ์ฝ๊ธฐ์ ์คํจํ์ต๋๋ค" -#: builtin/am.c:2339 +#: builtin/am.c:2338 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "์ด์ ๋ฆฌ๋ฒ ์ด์ค ๋๋ ํฐ๋ฆฌ %s์ด(๊ฐ) ์์ง ์๊ณ mbox๋ฅผ ์ง์ ํ์ต๋๋ค." -#: builtin/am.c:2363 +#: builtin/am.c:2362 #, c-format msgid "" "Stray %s directory found.\n" @@ -5163,7 +5255,7 @@ msgstr "" "๋ฒ์ด๋ %s ๋๋ ํฐ๋ฆฌ๊ฐ ๋ฐ๊ฒฌ๋์์ต๋๋ค.\n" "์ ๊ฑฐํ๋ ค๋ฉด \"git am --abort\"๋ฅผ ์ฌ์ฉํ์ญ์์ค." -#: builtin/am.c:2369 +#: builtin/am.c:2368 msgid "Resolve operation not in progress, we are not resuming." msgstr "ํด์ ์์
์ด ์งํ ์ค์
๋๋ค. ๋ค์ ์์ํ์ง ์์ต๋๋ค." @@ -5365,14 +5457,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<์ต์
>] (-m | -M) [<๊ณผ๊ฑฐ-๋ธ๋์น>] <์-๋ธ๋์น>" #: builtin/branch.c:31 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "git branch [<์ต์
>] (-c | -C) [<๊ณผ๊ฑฐ-๋ธ๋์น>] <์-๋ธ๋์น>" + +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<์ต์
>] [-r | -a] [--points-at]" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<์ต์
>] [-r | -a] [--format]" -#: builtin/branch.c:145 +#: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5381,7 +5477,7 @@ msgstr "" "'%s' ๋ธ๋์น๋ฅผ ์ญ์ ํฉ๋๋ค. ์ด ๋ธ๋์น๋ '%s'์\n" " ๋ณํฉ๋์์ง๋ง, HEAD์๋ ๋ณํฉ๋์ง ์์์ต๋๋ค." -#: builtin/branch.c:149 +#: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5390,12 +5486,12 @@ msgstr "" "'%s' ๋ธ๋์น๋ฅผ ์ญ์ ํ์ง ์์ต๋๋ค. ์ด ๋ธ๋์น๋ '%s'์\n" " ๋ณํฉ๋์ง ์์์ง๋ง, HEAD์๋ ๋ณํฉ๋์์ต๋๋ค." -#: builtin/branch.c:163 +#: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "'%s'์ ๋ํ ์ปค๋ฐ ์ค๋ธ์ ํธ๋ฅผ ์ฐพ์๋ณผ ์ ์์ต๋๋ค" -#: builtin/branch.c:167 +#: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5404,91 +5500,112 @@ msgstr "" "'%s' ๋ธ๋์น๊ฐ ์์ ํ ๋ณํฉ๋์ง ์์์ต๋๋ค.\n" "์ ๋ง๋ก ์ญ์ ํ๋ ค๋ฉด 'git branch -D %s' ๋ช
๋ น์ ์คํํ์ญ์์ค." -#: builtin/branch.c:180 +#: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "config-file ์
๋ฐ์ดํธ๊ฐ ์คํจํ์ต๋๋ค" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "-a ์ต์
์ -d ์ต์
๊ณผ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค" -#: builtin/branch.c:217 +#: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "HEAD์ ๋ํ ์ปค๋ฐ ์ค๋ธ์ ํธ๋ฅผ ์ฐพ์๋ณผ ์ ์์ต๋๋ค" -#: builtin/branch.c:231 +#: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "'%2$s' ์์น์ ์ฒดํฌ์์ํ '%1$s' ๋ธ๋์น๋ฅผ ์ญ์ ํ ์ ์์ต๋๋ค" -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "๋ฆฌ๋ชจํธ ์ถ์ '%s' ๋ธ๋์น๊ฐ ์์ต๋๋ค." -#: builtin/branch.c:247 +#: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "'%s' ๋ธ๋์น๊ฐ ์์ต๋๋ค." -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "๋ฆฌ๋ชจํธ ์ถ์ '%s' ๋ธ๋์น๋ฅผ ์ญ์ ํ๋๋ฐ ์ค๋ฅ" -#: builtin/branch.c:263 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "'%s' ๋ธ๋์น๋ฅผ ์ญ์ ํ๋๋ฐ ์ค๋ฅ" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "๋ฆฌ๋ชจํธ ์ถ์ '%s' ๋ธ๋์น๋ฅผ ์ญ์ ํฉ๋๋ค. (๊ณผ๊ฑฐ %s)\n" -#: builtin/branch.c:271 +#: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "%s ๋ธ๋์น ์ญ์ (๊ณผ๊ฑฐ %s).\n" -#: builtin/branch.c:445 +#: builtin/branch.c:417 builtin/tag.c:58 +msgid "unable to parse format string" +msgstr "ํฌ๋งท ๋ฌธ์์ด์ ํ์ฑํ ์ ์์ต๋๋ค" + +#: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "%s ๋ธ๋์น๋ฅผ %s ์์น์ ๋ฆฌ๋ฒ ์ด์คํฉ๋๋ค" -#: builtin/branch.c:449 +#: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "%s ๋ธ๋์น๋ฅผ %s ์์น์์ bisectํฉ๋๋ค" -#: builtin/branch.c:464 +#: builtin/branch.c:470 +msgid "cannot copy the current branch while not on any." +msgstr "๋ธ๋์น ์์ ์์ผ๋ฉด์ ํ์ฌ ๋ธ๋์น๋ฅผ ๋ณต์ฌํ ์ ์์ต๋๋ค." + +#: builtin/branch.c:472 msgid "cannot rename the current branch while not on any." msgstr "๋ธ๋์น ์์ ์์ผ๋ฉด์ ํ์ฌ ๋ธ๋์น ์ด๋ฆ์ ๋ฐ๊ฟ ์ ์์ต๋๋ค." -#: builtin/branch.c:474 +#: builtin/branch.c:483 #, c-format msgid "Invalid branch name: '%s'" msgstr "์๋ชป๋ ๋ธ๋์น ์ด๋ฆ: '%s'" -#: builtin/branch.c:491 +#: builtin/branch.c:504 msgid "Branch rename failed" msgstr "๋ธ๋์น ์ด๋ฆ ๋ฐ๊พธ๊ธฐ ์คํจ" -#: builtin/branch.c:494 +#: builtin/branch.c:506 +msgid "Branch copy failed" +msgstr "๋ธ๋์น ๋ณต์ฌ ์คํจ" + +#: builtin/branch.c:510 +#, c-format +msgid "Copied a misnamed branch '%s' away" +msgstr "์ด๋ฆ์ด ์๋ชป๋ '%s' ๋ธ๋์น๋ฅผ ๋ณต์ฌํฉ๋๋ค" + +#: builtin/branch.c:513 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "์ด๋ฆ์ด ์๋ชป๋ '%s' ๋ธ๋์น์ ์ด๋ฆ์ ๋ค๋ฅด๊ฒ ๋ฐ๊ฟ๋๋ค" -#: builtin/branch.c:497 +#: builtin/branch.c:519 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "๋ธ๋์น ์ด๋ฆ์ %s(์ผ)๋ก ๋ฐ๊พธ์ง๋ง, HEAD๋ฅผ ์
๋ฐ์ดํธํ์ง ์์ต๋๋ค!" -#: builtin/branch.c:506 +#: builtin/branch.c:528 msgid "Branch is renamed, but update of config-file failed" msgstr "๋ธ๋์น์ ์ด๋ฆ์ ๋ฐ๊พธ์ง๋ง, config-file ์
๋ฐ์ดํธ๊ฐ ์คํจํ์ต๋๋ค" -#: builtin/branch.c:522 +#: builtin/branch.c:530 +msgid "Branch is copied, but update of config-file failed" +msgstr "๋ธ๋์น๋ฅผ ๋ณต์ฌํ์ง๋ง, config-file ์
๋ฐ์ดํธ๊ฐ ์คํจํ์ต๋๋ค" + +#: builtin/branch.c:546 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5499,177 +5616,185 @@ msgstr "" " %s\n" "'%c' ๋ฌธ์๋ก ์์ํ๋ ์ค์ ๋ฌด์๋ฉ๋๋ค.\n" -#: builtin/branch.c:555 +#: builtin/branch.c:579 msgid "Generic options" msgstr "์ผ๋ฐ ์ต์
" # FIXME: give twice? -#: builtin/branch.c:557 +#: builtin/branch.c:581 msgid "show hash and subject, give twice for upstream branch" msgstr "ํด์์ ์ ๋ชฉ์ ํ์ํ๊ณ , ์
์คํธ๋ฆผ ๋ธ๋์น์ ๋ํ ์์น๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/branch.c:558 +#: builtin/branch.c:582 msgid "suppress informational messages" msgstr "์ฌ๋ฌ๊ฐ์ง ์๋ด ๋ฉ์์ง๋ฅผ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/branch.c:559 +#: builtin/branch.c:583 msgid "set up tracking mode (see git-pull(1))" msgstr "์ถ์ ๋ชจ๋๋ฅผ ์ค์ ํฉ๋๋ค (git-pull(1) ์ฐธ๊ณ )" -#: builtin/branch.c:561 -msgid "change upstream info" -msgstr "์
์คํธ๋ฆผ ์ ๋ณด๋ฅผ ๋ฐ๊ฟ๋๋ค" +#: builtin/branch.c:585 +msgid "do not use" +msgstr "์ฌ์ฉํ์ง ์์ต๋๋ค" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "upstream" msgstr "์
์คํธ๋ฆผ" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "change the upstream info" msgstr "์
์คํธ๋ฆผ ์ ๋ณด๋ฅผ ๋ฐ๊ฟ๋๋ค" -#: builtin/branch.c:564 +#: builtin/branch.c:588 msgid "Unset the upstream info" msgstr "์
์คํธ๋ฆผ ์ ๋ณด๋ฅผ ํด์ ํฉ๋๋ค" -#: builtin/branch.c:565 +#: builtin/branch.c:589 msgid "use colored output" msgstr "์ฌ๋ฌ ์์ผ๋ก ์ถ๋ ฅํฉ๋๋ค" -#: builtin/branch.c:566 +#: builtin/branch.c:590 msgid "act on remote-tracking branches" msgstr "๋ฆฌ๋ชจํธ ์ถ์ ๋ธ๋์น์ ๋ํด ๋์ํฉ๋๋ค" -#: builtin/branch.c:568 builtin/branch.c:570 +#: builtin/branch.c:592 builtin/branch.c:594 msgid "print only branches that contain the commit" msgstr "์ปค๋ฐ์ด ์๋ ๋ธ๋์น๋ง ํ์ํฉ๋๋ค" -#: builtin/branch.c:569 builtin/branch.c:571 +#: builtin/branch.c:593 builtin/branch.c:595 msgid "print only branches that don't contain the commit" msgstr "์ปค๋ฐ์ด ๋ค์ด์์ง ์์ ๋ธ๋์น๋ง ํ์ํฉ๋๋ค" -#: builtin/branch.c:574 +#: builtin/branch.c:598 msgid "Specific git-branch actions:" msgstr "ํน์ git-branch ๋์:" -#: builtin/branch.c:575 +#: builtin/branch.c:599 msgid "list both remote-tracking and local branches" msgstr "๋ฆฌ๋ชจํธ์ ๋ก์ปฌ์ ๋ธ๋์น ๋ชฉ๋ก์ ๋ชจ๋ ํ์ํฉ๋๋ค" -#: builtin/branch.c:577 +#: builtin/branch.c:601 msgid "delete fully merged branch" msgstr "์์ ํ ๋ณํฉ๋ ๋ธ๋์น๋ฅผ ์ญ์ ํฉ๋๋ค" -#: builtin/branch.c:578 +#: builtin/branch.c:602 msgid "delete branch (even if not merged)" msgstr "๋ธ๋์น๋ฅผ ์ญ์ ํฉ๋๋ค (๋ณํฉ๋์ง ์์๋๋ผ๋)" -#: builtin/branch.c:579 +#: builtin/branch.c:603 msgid "move/rename a branch and its reflog" msgstr "๋ธ๋์น์ ๊ทธ reflog๋ฅผ ์ฎ๊ธฐ๊ฑฐ๋ ์ด๋ฆ์ ๋ฐ๊ฟ๋๋ค" -#: builtin/branch.c:580 +#: builtin/branch.c:604 msgid "move/rename a branch, even if target exists" msgstr "๋์์ด ์ด๋ฏธ ์๋๋ผ๋ ๋ธ๋์น๋ฅผ ์ฎ๊ธฐ๊ฑฐ๋ ์ด๋ฆ์ ๋ฐ๊ฟ๋๋ค" -#: builtin/branch.c:581 +#: builtin/branch.c:605 +msgid "copy a branch and its reflog" +msgstr "๋ธ๋์น์ ๊ทธ reflog๋ฅผ ๋ณต์ฌํฉ๋๋ค" + +#: builtin/branch.c:606 +msgid "copy a branch, even if target exists" +msgstr "๋์์ด ์ด๋ฏธ ์๋๋ผ๋ ๋ธ๋์น๋ฅผ ๋ณต์ฌํฉ๋๋ค" + +#: builtin/branch.c:607 msgid "list branch names" msgstr "๋ธ๋์น ์ด๋ฆ ๋ชฉ๋ก์ ํ์ํฉ๋๋ค" -#: builtin/branch.c:582 +#: builtin/branch.c:608 msgid "create the branch's reflog" msgstr "๋ธ๋์น์ reflog๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/branch.c:584 +#: builtin/branch.c:610 msgid "edit the description for the branch" msgstr "๋ธ๋์น์ ์ค๋ช
์ ํธ์งํฉ๋๋ค" -#: builtin/branch.c:585 +#: builtin/branch.c:611 msgid "force creation, move/rename, deletion" msgstr "๊ฐ์ ๋ก ๋ง๋ค๊ณ , ์ฎ๊ธฐ๊ฑฐ๋ ์ด๋ฆ์ ๋ฐ๊พธ๊ณ , ์ญ์ ํฉ๋๋ค" -#: builtin/branch.c:586 +#: builtin/branch.c:612 msgid "print only branches that are merged" msgstr "๋ณํฉ๋๋ ๋ธ๋์น๋ง ํ์ํฉ๋๋ค" -#: builtin/branch.c:587 +#: builtin/branch.c:613 msgid "print only branches that are not merged" msgstr "๋ณํฉ๋์ง ์๋ ๋ธ๋์น๋ง ํ์ํฉ๋๋ค" -#: builtin/branch.c:588 +#: builtin/branch.c:614 msgid "list branches in columns" msgstr "๋ชฉ๋ก์ ์ฌ๋ฌ ์ด๋ก ํ์ํฉ๋๋ค" -#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "ํค" -#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 +#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "์ ๋ ฌํ ๊ธฐ์ค์ด ๋๋ ํ๋ ์ด๋ฆ" -#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 -#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 -#: builtin/tag.c:430 +#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:408 msgid "object" msgstr "์ค๋ธ์ ํธ" -#: builtin/branch.c:593 +#: builtin/branch.c:619 msgid "print only branches of the object" msgstr "ํด๋น ์ค๋ธ์ ํธ์ ๋ธ๋์น๋ง ํ์ํฉ๋๋ค" -#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 +#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "์ ๋ ฌ๊ณผ ํํฐ๋ง์ ๋์๋ฌธ์๋ฅผ ๊ตฌ๋ถํ์ง ์์ต๋๋ค" -#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "์ถ๋ ฅ์ ์ฌ์ฉํ ํ์" -#: builtin/branch.c:615 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "HEAD๋ฅผ ์ฌ๋ฐ๋ฅธ ๋ ํผ๋ฐ์ค๋ก ๊ตฌํด๋ด๋๋ฐ ์คํจํ์ต๋๋ค." - -#: builtin/branch.c:619 builtin/clone.c:728 +#: builtin/branch.c:645 builtin/clone.c:729 msgid "HEAD not found below refs/heads!" msgstr "๋ ํผ๋ฐ์ค/ํค๋ ์๋์ HEAD๊ฐ ์์ต๋๋ค!" -#: builtin/branch.c:642 +#: builtin/branch.c:668 msgid "--column and --verbose are incompatible" msgstr "--column ๋ฐ --verbose ์ต์
์ ํธํ๋์ง ์์ต๋๋ค" -#: builtin/branch.c:653 builtin/branch.c:705 +#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 msgid "branch name required" msgstr "๋ธ๋์น ์ด๋ฆ์ด ํ์ํฉ๋๋ค" -#: builtin/branch.c:681 +#: builtin/branch.c:708 msgid "Cannot give description to detached HEAD" msgstr "๋ถ๋ฆฌ๋ HEAD์ ๋ํ ์ค๋ช
์ ๋ถ์ฌํ ์ ์์ต๋๋ค" -#: builtin/branch.c:686 +#: builtin/branch.c:713 msgid "cannot edit description of more than one branch" msgstr "์ฌ๋ฌ ๋ธ๋์น์ ๋ํ ์ค๋ช
์ ํธ์งํ ์ ์์ต๋๋ค" -#: builtin/branch.c:693 +#: builtin/branch.c:720 #, c-format msgid "No commit on branch '%s' yet." msgstr "์์ง '%s' ๋ธ๋์น์ ์ปค๋ฐ์ด ์์ต๋๋ค." -#: builtin/branch.c:696 +#: builtin/branch.c:723 #, c-format msgid "No branch named '%s'." msgstr "์ด๋ฆ์ด '%s'์ธ ๋ธ๋์น๊ฐ ์์ต๋๋ค." -#: builtin/branch.c:711 -msgid "too many branches for a rename operation" -msgstr "์ด๋ฆ ๋ฐ๊พธ๊ธฐ ์์
์ ๋ํด ๋ธ๋์น๊ฐ ๋๋ฌด ๋ง์ต๋๋ค" +#: builtin/branch.c:738 +msgid "too many branches for a copy operation" +msgstr "๋ณต์ฌ ์์
์ ๋ํด ๋ธ๋์น๊ฐ ๋๋ฌด ๋ง์ต๋๋ค" -#: builtin/branch.c:716 -msgid "too many branches to set new upstream" -msgstr "์ ์
์คํธ๋ฆผ์ ์ค์ ํ๋๋ฐ ๋ธ๋์น๊ฐ ๋๋ฌด ๋ง์ต๋๋ค" +#: builtin/branch.c:747 +msgid "too many arguments for a rename operation" +msgstr "์ด๋ฆ ๋ฐ๊พธ๊ธฐ ์์
์ ๋ํด ์ธ์๊ฐ ๋๋ฌด ๋ง์ต๋๋ค" -#: builtin/branch.c:720 +#: builtin/branch.c:752 +msgid "too many arguments to set new upstream" +msgstr "์ ์
์คํธ๋ฆผ์ ์ค์ ํ๋๋ฐ ์ธ์๊ฐ ๋๋ฌด ๋ง์ต๋๋ค" + +#: builtin/branch.c:756 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5677,58 +5802,45 @@ msgstr "" "HEAD์ ์
์คํธ๋ฆผ์ %s(์ผ)๋ก ์ค์ ํ ์ ์์ต๋๋ค. ์ด๋ค ๋ธ๋์น๋ ๊ฐ๋ฆฌํค์ง ์์ต๋" "๋ค." -#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 +#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 #, c-format msgid "no such branch '%s'" msgstr "๊ทธ๋ฐ ๋ธ๋์น๊ฐ ('%s') ์์ต๋๋ค" -#: builtin/branch.c:727 +#: builtin/branch.c:763 #, c-format msgid "branch '%s' does not exist" msgstr "'%s' ๋ธ๋์น๊ฐ ์์ต๋๋ค" -#: builtin/branch.c:739 -msgid "too many branches to unset upstream" -msgstr "์
์คํธ๋ฆผ ์ค์ ์ ํด์ ํ๋๋ฐ ๋ธ๋์น๊ฐ ๋๋ฌด ๋ง์ต๋๋ค" +#: builtin/branch.c:775 +msgid "too many arguments to unset upstream" +msgstr "์
์คํธ๋ฆผ ์ค์ ์ ํด์ ํ๋๋ฐ ์ธ์๊ฐ ๋๋ฌด ๋ง์ต๋๋ค" -#: builtin/branch.c:743 +#: builtin/branch.c:779 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "HEAD์ ์
์คํธ๋ฆผ ์ค์ ์ ํด์ ํ ์ ์์ต๋๋ค. ์ด๋ค ๋ธ๋์น๋ ๊ฐ๋ฆฌํค์ง ์์ต๋๋ค." -#: builtin/branch.c:749 +#: builtin/branch.c:785 #, c-format msgid "Branch '%s' has no upstream information" msgstr "'%s' ๋ธ๋์น์ ์
์คํธ๋ฆผ ์ ๋ณด๊ฐ ์์ต๋๋ค" -#: builtin/branch.c:763 +#: builtin/branch.c:797 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD'๋ฅผ ์๋์ผ๋ก ๋ง๋๋ ๊ฑด ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" -#: builtin/branch.c:769 +#: builtin/branch.c:803 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "'git branch'์ ๋ํด -a ๋ฐ -r ์ต์
์ ๋ธ๋์น ์ด๋ฆ๊ณผ ๊ฐ์ด ์ฐ๋ฉด ์๋ค๊ฐ ๋ง์ง ์์ต" "๋๋ค" -#: builtin/branch.c:772 -#, c-format +#: builtin/branch.c:806 msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --" -"track or --set-upstream-to\n" -msgstr "" -"--set-upstream ์ต์
์ ๋ ์ด์ ์ฌ์ฉ๋์ง ์๊ณ ์ ๊ฑฐ๋ ์์ ์
๋๋ค. --track ๋๋ " -"--set-upstream-to ์ต์
์ ์ฌ์ฉํด ๋ณด์ญ์์ค\n" - -#: builtin/branch.c:789 -#, c-format -msgid "" -"\n" -"If you wanted to make '%s' track '%s', do this:\n" -"\n" -msgstr "" -"\n" -"'%s'์(๋ฅผ) ๋ง๋ค๊ณ '%s'์(๋ฅผ) ์ถ์ ํ๊ฒ ํ๋ ค๋ฉด, ๋ค์์ ํ์ญ์์ค:\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." +msgstr "'--set-upstream' ์ต์
์ ๋ ์ด์ ์ฌ์ฉ๋์ง ์๊ณ ์ ๊ฑฐ๋ ์์ ์
๋๋ค. '--track' ๋๋ '--set-upstream-to' ์ต์
์ ์ฌ์ฉํด ๋ณด์ญ์์ค." #: builtin/bundle.c:45 #, c-format @@ -5743,7 +5855,7 @@ msgstr "๋ฒ๋ค์ ๋ง๋๋ ค๋ฉด ์ ์ฅ์๊ฐ ํ์ํฉ๋๋ค." msgid "Need a repository to unbundle." msgstr "๋ฒ๋ค์ ํด์ ํ๋ ค๋ฉด ์ ์ฅ์๊ฐ ํ์ํฉ๋๋ค." -#: builtin/cat-file.c:519 +#: builtin/cat-file.c:521 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5751,7 +5863,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <์ข
๋ฅ> | --textconv | --filters) [--path=<๊ฒฝ๋ก>] <์ค๋ธ์ ํธ>" -#: builtin/cat-file.c:520 +#: builtin/cat-file.c:522 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -5759,64 +5871,64 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:557 +#: builtin/cat-file.c:559 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<์ข
๋ฅ>๋ ๋ค์ ์ค ํ๋๊ฐ ๋ ์ ์์ต๋๋ค: blob, tree, commit, tag" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:560 msgid "show object type" msgstr "์ค๋ธ์ ํธ ์ข
๋ฅ๋ฅผ ๋ด
๋๋ค" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:561 msgid "show object size" msgstr "์ค๋ธ์ ํธ ํฌ๊ธฐ๋ฅผ ๋ด
๋๋ค" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "exit with zero when there's no error" msgstr "์ค๋ฅ๊ฐ ์์ ๋ 0์ ๋ฆฌํดํ๊ณ ๋๋
๋๋ค" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "pretty-print object's content" msgstr "์ค๋ธ์ ํธ์ ๋ด์ฉ์ ์์๊ฒ ํ์ํฉ๋๋ค" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:566 msgid "for blob objects, run textconv on object's content" msgstr "๋ธ๋กญ ์ค๋ธ์ ํธ์ ๋ํด์๋, ์ค๋ธ์ ํธ์ ๋ด์ฉ์ ๋ํด textconv๋ฅผ ์คํํฉ๋๋ค" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "for blob objects, run filters on object's content" msgstr "๋ธ๋กญ ์ค๋ธ์ ํธ์ ๋ํด์๋, ์ค๋ธ์ ํธ์ ๋ด์ฉ์ ๋ํด ํํฐ๋ฅผ ์คํํฉ๋๋ค" -#: builtin/cat-file.c:567 git-submodule.sh:944 +#: builtin/cat-file.c:569 git-submodule.sh:943 msgid "blob" msgstr "๋ธ๋กญ" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "use a specific path for --textconv/--filters" msgstr "--textconv/--filters ์ต์
์ ๊ฒฝ๋ก๋ฅผ ์ง์ ํฉ๋๋ค" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s ๋ฐ -t ์ต์
์ด ์์๋ ์ค๋ธ์ ํธ์ ๋ํด ๋์ํ๋๋ก ํ์ฉํฉ๋๋ค" -#: builtin/cat-file.c:571 +#: builtin/cat-file.c:573 msgid "buffer --batch output" msgstr "--batch ์ถ๋ ฅ์ ๋ํด ๋ฒํผ๋งํฉ๋๋ค" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:575 msgid "show info and content of objects fed from the standard input" msgstr "ํ์ค ์
๋ ฅ์์ ์
๋ ฅ๋ ์ค๋ธ์ ํธ์ ์ ๋ณด์ ๋ด์ฉ์ ํ์ํฉ๋๋ค" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:578 msgid "show info about objects fed from the standard input" msgstr "ํ์ค ์
๋ ฅ์์ ์
๋ ฅ๋ ์ค๋ธ์ ํธ์ ์ ๋ณด๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:581 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "ํธ๋ฆฌ ๋ด๋ถ์ ์ฌ๋ณผ๋ฆญ ๋งํฌ๋ฅผ ๋ฐ๋ผ๊ฐ๋๋ค (--batch ๋๋ --batch-check์ ๊ฐ์ด ์ฌ์ฉ)" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:583 msgid "show all objects with --batch or --batch-check" msgstr "--batch ๋๋ --batch-check์์ ๋ชจ๋ ์ค๋ธ์ ํธ๋ฅผ ํ์ํฉ๋๋ค" @@ -5844,7 +5956,7 @@ msgstr "ํ์ค ์
๋ ฅ์์ ํ์ผ ์ด๋ฆ์ ์ฝ์ต๋๋ค" msgid "terminate input and output records by a NUL character" msgstr "NUL ๋ฌธ์๋ฅผ ๊ธฐ์ค์ผ๋ก ์๋ฃ ์
๋ ฅ ๋ฐ ์ถ๋ ฅ์ ๋ฉ์ถฅ๋๋ค" -#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 +#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "์งํ ์ํฉ ํ์๋ฅผ ํ์ง ์์ต๋๋ค" @@ -5934,9 +6046,9 @@ msgid "write the content to temporary files" msgstr "๋ด์ฉ์ ์์ ํ์ผ์ ์๋๋ค" #: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 -#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:478 +#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 +#: builtin/worktree.c:498 msgid "string" msgstr "๋ฌธ์์ด" @@ -6007,54 +6119,54 @@ msgstr "๊ฒฝ๋ก๋ฅผ ์
๋ฐ์ดํธํ๊ณ '%s' ๋ธ๋์น๋ก ์ ํํ๋ ์ผ์ ๋์ msgid "path '%s' is unmerged" msgstr "'%s' ๊ฒฝ๋ก๋ฅผ ๋ณํฉํ์ง ์์์ต๋๋ค" -#: builtin/checkout.c:497 +#: builtin/checkout.c:501 msgid "you need to resolve your current index first" msgstr "ํ์ฌ ์ธ๋ฑ์ค๋ฅผ ๋จผ์ ํด๊ฒฐํด์ผ ํฉ๋๋ค" -#: builtin/checkout.c:628 +#: builtin/checkout.c:632 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "'%s'์ ๋ํด reflogํ ์ ์์ต๋๋ค: %s\n" -#: builtin/checkout.c:669 +#: builtin/checkout.c:673 msgid "HEAD is now at" msgstr "HEAD์ ํ์ฌ ์์น๋" -#: builtin/checkout.c:673 builtin/clone.c:682 +#: builtin/checkout.c:677 builtin/clone.c:683 msgid "unable to update HEAD" msgstr "HEAD๋ฅผ ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค" -#: builtin/checkout.c:677 +#: builtin/checkout.c:681 #, c-format msgid "Reset branch '%s'\n" msgstr "'%s' ๋ธ๋์น ๋ฆฌ์
\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:684 #, c-format msgid "Already on '%s'\n" msgstr "์ด๋ฏธ '%s'์ ์์ต๋๋ค\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:688 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "'%s' ๋ธ๋์น๋ก ์ ํํ๊ณ ๋ฆฌ์
ํฉ๋๋ค\n" -#: builtin/checkout.c:686 builtin/checkout.c:1075 +#: builtin/checkout.c:690 builtin/checkout.c:1086 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "์๋ก ๋ง๋ '%s' ๋ธ๋์น๋ก ์ ํํฉ๋๋ค\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:692 #, c-format msgid "Switched to branch '%s'\n" msgstr "'%s' ๋ธ๋์น๋ก ์ ํํฉ๋๋ค\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:743 #, c-format msgid " ... and %d more.\n" msgstr " ... ๊ทธ๋ฆฌ๊ณ %d๊ฐ ๋.\n" -#: builtin/checkout.c:745 +#: builtin/checkout.c:749 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6072,7 +6184,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:764 +#: builtin/checkout.c:768 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6093,161 +6205,161 @@ msgstr[0] "" " git branch <์-๋ธ๋์น-์ด๋ฆ> %s\n" "\n" -#: builtin/checkout.c:800 +#: builtin/checkout.c:809 msgid "internal error in revision walk" msgstr "๋ฆฌ๋น์ walk์ ๋ด๋ถ ์ค๋ฅ" -#: builtin/checkout.c:804 +#: builtin/checkout.c:813 msgid "Previous HEAD position was" msgstr "์ด์ HEAD ์์น๋" -#: builtin/checkout.c:832 builtin/checkout.c:1070 +#: builtin/checkout.c:843 builtin/checkout.c:1081 msgid "You are on a branch yet to be born" msgstr "ํ์ฌ ์์น๊ฐ ๋ง๋ค ์์ ์ธ ๋ธ๋์น์ ์์ต๋๋ค" -#: builtin/checkout.c:976 +#: builtin/checkout.c:987 #, c-format msgid "only one reference expected, %d given." msgstr "ํ๋์ ๋ ํผ๋ฐ์ค๋ง ์ง์ ํด์ผ ํ์ง๋ง %d๊ฐ๋ฅผ ์ง์ ํ์ต๋๋ค." -#: builtin/checkout.c:1016 builtin/worktree.c:215 +#: builtin/checkout.c:1027 builtin/worktree.c:233 #, c-format msgid "invalid reference: %s" msgstr "์๋ชป๋ ๋ ํผ๋ฐ์ค: %s" -#: builtin/checkout.c:1045 +#: builtin/checkout.c:1056 #, c-format msgid "reference is not a tree: %s" msgstr "๋ ํผ๋ฐ์ค๊ฐ ํธ๋ฆฌ๊ฐ ์๋๋๋ค: %s" -#: builtin/checkout.c:1084 +#: builtin/checkout.c:1095 msgid "paths cannot be used with switching branches" msgstr "๋ธ๋์น๋ฅผ ์ ํํ๋๋ฐ ๊ฒฝ๋ก๋ฅผ ์ฌ์ฉํ ์ ์์ต๋๋ค" -#: builtin/checkout.c:1087 builtin/checkout.c:1091 +#: builtin/checkout.c:1098 builtin/checkout.c:1102 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ์ต์
์ ๋ธ๋์น๋ฅผ ์ ํํ ๋ ์ธ ์ ์์ต๋๋ค" -#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 +#: builtin/checkout.c:1117 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ์ต์
์ '%s' ์ต์
๊ณผ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1122 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "๋ธ๋์น๋ฅผ ์ปค๋ฐ์ด ์๋ '%s'(์ผ)๋ก ์ ํํ ์ ์์ต๋๋ค" -#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 -#: builtin/worktree.c:330 +#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 +#: builtin/worktree.c:348 msgid "branch" msgstr "๋ธ๋์น" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1155 msgid "create and checkout a new branch" msgstr "์ ๋ธ๋์น๋ฅผ ๋ง๋ค๊ณ ๊ฐ์ ธ์ต๋๋ค" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1157 msgid "create/reset and checkout a branch" msgstr "๋ธ๋์น๋ฅผ ๋ง๋ค๊ฑฐ๋ ๋ฆฌ์
ํ๊ณ ๊ฐ์ ธ์ต๋๋ค" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1158 msgid "create reflog for new branch" msgstr "์ ๋ธ๋์น์ ๋ํ reflog๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/checkout.c:1149 builtin/worktree.c:332 +#: builtin/checkout.c:1159 builtin/worktree.c:350 msgid "detach HEAD at named commit" msgstr "HEAD๋ฅผ ํด๋น ์ปค๋ฐ์์ ๋ถ๋ฆฌํฉ๋๋ค" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "set upstream info for new branch" msgstr "์ ๋ธ๋์น์ ๋ํ ์
์คํธ๋ฆผ ์ ๋ณด๋ฅผ ์ค์ ํฉ๋๋ค" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new-branch" msgstr "์-๋ธ๋์น" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new unparented branch" msgstr "์์ ๋ธ๋์น๊ฐ ์๋ ์ ๋ธ๋์น" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1163 msgid "checkout our version for unmerged files" msgstr "๋ณํฉ๋์ง ์์ ํ์ผ์ ๋ํด ์ฐ๋ฆฌ์ชฝ ๋ฒ์ ์ ๊ฐ์ ธ์ต๋๋ค" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1165 msgid "checkout their version for unmerged files" msgstr "๋ณํฉ๋์ง ์์ ํ์ผ์ ๋ํด ์๋ํธ ๋ฒ์ ์ ๊ฐ์ ธ์ต๋๋ค" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 msgid "force checkout (throw away local modifications)" msgstr "๊ฐ์ ๋ก ์ฒดํฌ์์ํฉ๋๋ค (๋ก์ปฌ์์ ์์ ํ ์ฌํญ์ ๋ฒ๋ฆฝ๋๋ค)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1168 msgid "perform a 3-way merge with the new branch" msgstr "์ ๋ธ๋์น์ ๋ํด 3-๋ฐฉํฅ ๋ณํฉ์ ์ํํฉ๋๋ค" -#: builtin/checkout.c:1159 builtin/merge.c:235 +#: builtin/checkout.c:1169 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "๋ฌด์ํ๋ ํ์ผ์ ์
๋ฐ์ดํธํฉ๋๋ค (๊ธฐ๋ณธ๊ฐ)" -#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 +#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 msgid "style" msgstr "์คํ์ผ" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1171 msgid "conflict style (merge or diff3)" msgstr "์ถฉ๋ ์คํ์ผ (merge ๋๋ diff3)" # FIXME: ์๋ฏธ ๋ถ๋ช
-#: builtin/checkout.c:1164 +#: builtin/checkout.c:1174 msgid "do not limit pathspecs to sparse entries only" msgstr "๊ฒฝ๋ก๋ช
์ธ๋ฅผ ๋๋ฌธ ํญ๋ชฉ์๋ง ์ ํํ์ง ์์ต๋๋ค" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "second guess 'git checkout <no-such-branch>'" msgstr "'git checkout <์๋-๋ธ๋์น>'์ ๋ํด ์ถ์ธกํฉ๋๋ค" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1178 msgid "do not check if another worktree is holding the given ref" msgstr "๋ค๋ฅธ ์์
ํด๋์ ์ฃผ์ด์ง ๋ ํผ๋ฐ์ค๊ฐ ์๋์ง ํ์ธํ์ง ์์ต๋๋ค" -#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 -#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 +#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "๊ฐ์ ๋ก ์งํ ์ํฉ์ ํ์ํฉ๋๋ค" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1212 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B ๋ฐ --orphan ์ต์
์ ์๋ก ํธํ๋์ง ์์ต๋๋ค" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1229 msgid "--track needs a branch name" msgstr "--track ์ต์
์ ๋ธ๋์น ์ด๋ฆ์ด ํ์ํฉ๋๋ค" -#: builtin/checkout.c:1225 +#: builtin/checkout.c:1234 msgid "Missing branch name; try -b" msgstr "๋ธ๋์น ์ด๋ฆ์ด ์์ต๋๋ค. -b ์ต์
์ ์ฌ์ฉํด ๋ณด์ญ์์ค" -#: builtin/checkout.c:1261 +#: builtin/checkout.c:1270 msgid "invalid path specification" msgstr "๊ฒฝ๋ก ๋ช
์ธ๊ฐ ์๋ชป๋์์ต๋๋ค" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1277 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s'์(๋) ์ปค๋ฐ์ด ์๋๊ณ ์ฌ๊ธฐ์์ '%s' ๋ธ๋์น๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: builtin/checkout.c:1272 +#: builtin/checkout.c:1281 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach ์ต์
์ ๊ฒฝ๋ก ์ธ์๋ฅผ ๋ฐ์ง ์์ต๋๋ค '%s'" -#: builtin/checkout.c:1276 +#: builtin/checkout.c:1285 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6286,7 +6398,7 @@ msgstr "%s ์ ์ฅ์ ๊ฑด๋๋ธ ์์ \n" msgid "failed to remove %s" msgstr "%s ์ ๊ฑฐ์ ์คํจํ์ต๋๋ค" -#: builtin/clean.c:298 git-add--interactive.perl:572 +#: builtin/clean.c:301 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6299,7 +6411,7 @@ msgstr "" "foo - ์ ์ผํ ์ ๋์ด์ ํด๋นํ๋ ํญ๋ชฉ ์ ํ\n" " - (๋น ์
๋ ฅ) ์ ํํ์ง ์์\n" -#: builtin/clean.c:302 git-add--interactive.perl:581 +#: builtin/clean.c:305 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6320,38 +6432,38 @@ msgstr "" "* - ๋ชจ๋ ํญ๋ชฉ ์ ํ\n" " - (๋น ์
๋ ฅ) ์ ํ ๋ง์นจ\n" -#: builtin/clean.c:518 git-add--interactive.perl:547 +#: builtin/clean.c:521 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "์ด๋ผ๋ผ (%s)?\n" -#: builtin/clean.c:660 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "๋ฌด์ํ ํจํด์ ์
๋ ฅํ์ญ์์ค>> " -#: builtin/clean.c:697 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "๊ฒฝ๊ณ : ๋ค์์ ํด๋นํ๋ ํญ๋ชฉ์ ์ฐพ์ ์ ์์ต๋๋ค: %s" -#: builtin/clean.c:718 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "์ญ์ ํ ํญ๋ชฉ์ ์ ํํ์ญ์์ค" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:759 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "%s ์ ๊ฑฐํฉ๋๊น [y/N]? " -#: builtin/clean.c:784 git-add--interactive.perl:1616 +#: builtin/clean.c:787 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "๋.\n" -#: builtin/clean.c:792 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6369,62 +6481,62 @@ msgstr "" "help - ์ด ํ๋ฉด ํ์\n" "? - ํ๋กฌํํธ ์ ํ ๋์๋ง" -#: builtin/clean.c:819 git-add--interactive.perl:1692 +#: builtin/clean.c:822 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** ๋ช
๋ น ***" -#: builtin/clean.c:820 git-add--interactive.perl:1689 +#: builtin/clean.c:823 git-add--interactive.perl:1689 msgid "What now" msgstr "๋ฌด์์ ํ ๊น์" -#: builtin/clean.c:828 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "๋ค์ ํญ๋ชฉ์ ์ ๊ฑฐํ ์์ ์
๋๋ค:" -#: builtin/clean.c:844 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "์ง์ธ ํ์ผ์ด ์ด์ ์์ผ๋ฏ๋ก ๋๋
๋๋ค." -#: builtin/clean.c:906 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "์ ๊ฑฐํ ํ์ผ ์ด๋ฆ์ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/clean.c:908 +#: builtin/clean.c:911 msgid "force" msgstr "๊ฐ์ " -#: builtin/clean.c:909 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "๋ํํ ์ง์ฐ๊ธฐ" -#: builtin/clean.c:911 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "์ ์ฒด ๋๋ ํฐ๋ฆฌ ์ ๊ฑฐ" -#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 -#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 +#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 #: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "ํจํด" -#: builtin/clean.c:913 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "๊ท์น์ ๋ฌด์ํ๋ ค๋ฉด <ํจํด>์ ์ถ๊ฐํ์ญ์์ค" -#: builtin/clean.c:914 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "๋ฌด์ํ ํ์ผ๋ ์ ๊ฑฐ" -#: builtin/clean.c:916 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "๋ฌด์ํ ํ์ผ๋ง ์ ๊ฑฐ" -#: builtin/clean.c:934 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x ๋ฐ -X ์ต์
์ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค" -#: builtin/clean.c:938 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6432,7 +6544,7 @@ msgstr "" "clean.requireForce๊ฐ true๋ก ์ค์ ๋์๊ณ -i, -n, -f ์ต์
์ค ํ๋๋ ์ฐ์ง ์์์ต" "๋๋ค. ์ง์ฐ์ง ์์ต๋๋ค" -#: builtin/clean.c:941 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6440,142 +6552,142 @@ msgstr "" "clean.requireForce ๊ธฐ๋ณธ๊ฐ์ด true์ด๊ณ -i, -n, -f ์ต์
์ค ํ๋๋ ์ฐ์ง ์์์ต๋" "๋ค. ์ง์ฐ์ง ์์ต๋๋ค" -#: builtin/clone.c:38 +#: builtin/clone.c:39 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<์ต์
>] [--] <์ ์ฅ์> [<๋๋ ํฐ๋ฆฌ>]" -#: builtin/clone.c:82 +#: builtin/clone.c:83 msgid "don't create a checkout" msgstr "์ฒดํฌ์์์ ๋ง๋ค์ง ์์ต๋๋ค" -#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 +#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 msgid "create a bare repository" msgstr "๊ฐ๋ตํ ์ ์ฅ์๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "create a mirror repository (implies bare)" msgstr "๋ฏธ๋ฌ ์ ์ฅ์๋ฅผ ๋ง๋ญ๋๋ค (๊ฐ๋ตํ ์ ์ฅ์๋ก ์ทจ๊ธ)" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "to clone from a local repository" msgstr "๋ก์ปฌ ์ ์ฅ์์์ ๋ณต์ ํฉ๋๋ค" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "don't use local hardlinks, always copy" msgstr "๋ก์ปฌ ํ๋๋งํฌ๋ฅผ ์ฌ์ฉํ์ง ์๊ณ , ํญ์ ๋ณต์ฌํฉ๋๋ค" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "setup as shared repository" msgstr "๊ณต์ ์ ์ฅ์๋ก ์ค์ ํฉ๋๋ค" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "pathspec" msgstr "๊ฒฝ๋ก๋ช
์ธ" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "initialize submodules in the clone" msgstr "๋ณต์ ํ ๊ฒฐ๊ณผ๋ฌผ์์ ํ์ ๋ชจ๋์ ์ด๊ธฐํํฉ๋๋ค" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "number of submodules cloned in parallel" msgstr "๋ณ๋ ฌ์ ์ผ๋ก ๋ณต์ ํ๋ ํ์๋ชจ๋ ๊ฐ์" -#: builtin/clone.c:103 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:476 msgid "template-directory" msgstr "์์-๋๋ ํฐ๋ฆฌ" -#: builtin/clone.c:104 builtin/init-db.c:477 +#: builtin/clone.c:105 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "์์์ ์ฌ์ฉํ ๋๋ ํฐ๋ฆฌ ์์น" -#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 -#: builtin/submodule--helper.c:983 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 +#: builtin/submodule--helper.c:1002 msgid "reference repository" msgstr "๋ ํผ๋ฐ์ค ์ ์ฅ์" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "use --reference only while cloning" msgstr "๋ณต์ ํ ๊ฒฝ์ฐ์๋ง --reference๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "์ด๋ฆ" -#: builtin/clone.c:112 +#: builtin/clone.c:113 msgid "use <name> instead of 'origin' to track upstream" msgstr "์
์คํธ๋ฆผ ์ถ์ ์ 'origin' ๋์ <์ด๋ฆ>์ ์ฌ์ฉํฉ๋๋ค" -#: builtin/clone.c:114 +#: builtin/clone.c:115 msgid "checkout <branch> instead of the remote's HEAD" msgstr "๋ฆฌ๋ชจํธ์ HEAD ๋์ <๋ธ๋์น>๋ฅผ ๊ฐ์ ธ์ต๋๋ค" -#: builtin/clone.c:116 +#: builtin/clone.c:117 msgid "path to git-upload-pack on the remote" msgstr "๋ฆฌ๋ชจํธ์ git-upload-pack ๊ฒฝ๋ก" -#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 #: builtin/pull.c:205 msgid "depth" msgstr "๊น์ด" -#: builtin/clone.c:118 +#: builtin/clone.c:119 msgid "create a shallow clone of that depth" msgstr "์ง์ ํ ๊น์ด์ ์์ ๋ณต์ ๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 +#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 #: parse-options.h:142 msgid "time" msgstr "์๊ฐ" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "create a shallow clone since a specific time" msgstr "์ง์ ํ ์๊ฐ ์ดํ์ ์์ ๋ณต์ ๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/clone.c:121 builtin/fetch.c:119 +#: builtin/clone.c:122 builtin/fetch.c:141 msgid "revision" msgstr "๋ฆฌ๋น์ " -#: builtin/clone.c:122 builtin/fetch.c:120 +#: builtin/clone.c:123 builtin/fetch.c:142 msgid "deepen history of shallow clone, excluding rev" msgstr "๋ฆฌ๋น์ ์ ์ ์ธํด ์์ ๋ณต์ ์ ์ปค๋ฐ ๋ด์ญ์ ๊น๊ฒ ๋ง๋ญ๋๋ค" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "clone only one branch, HEAD or --branch" msgstr "ํ๋์ ๋ธ๋์น๋ง ๋ณต์ ํฉ๋๋ค (HEAD ๋๋ --branch๋ก ์ง์ )" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "ํ๊ทธ๋ฅผ ๋ณต์ ํ์ง ์์ต๋๋ค. ๋์ค์ ๊ฐ์ ธ์ฌ ๋๋ ํ๊ทธ๋ฅผ ๋ฐ๋ฅด์ง ์์ต๋๋ค." -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "any cloned submodules will be shallow" msgstr "๋ชจ๋ ๋ณต์ ํ ํ์ ๋ชจ๋์ ์์ ๋ชจ๋์
๋๋ค" -#: builtin/clone.c:129 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:485 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:130 builtin/init-db.c:486 +#: builtin/clone.c:131 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "๊น ๋๋ ํฐ๋ฆฌ๋ฅผ ์์
ํด๋์ ๋ณ๊ฐ์ ์์น์ ๋์ต๋๋ค" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "key=value" msgstr "ํค=๊ฐ" -#: builtin/clone.c:132 +#: builtin/clone.c:133 msgid "set config inside the new repository" msgstr "์ ์ ์ฅ์ ์์์ ์ค์ ํฉ๋๋ค" -#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "IPv4 ์ฃผ์๋ง ์ฌ์ฉํฉ๋๋ค" -#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "IPv6 ์ฃผ์๋ง ์ฌ์ฉํฉ๋๋ค" -#: builtin/clone.c:272 +#: builtin/clone.c:273 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6583,42 +6695,42 @@ msgstr "" "๋๋ ํฐ๋ฆฌ ์ด๋ฆ์ ์์๋ผ ์ ์์ต๋๋ค.\n" "๋ช
๋ นํ์์ ๋๋ ํฐ๋ฆฌ๋ฅผ ์ง์ ํ์ญ์์ค" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "์ ๋ณด: '%s'์ ๋ํ ๋ณด์กฐ ํ์ผ์ ์ถ๊ฐํ ์ ์์ต๋๋ค: %s\n" -#: builtin/clone.c:397 +#: builtin/clone.c:398 #, c-format msgid "failed to open '%s'" msgstr "'%s'์(๋ฅผ) ์ฌ๋๋ฐ ์คํจ" -#: builtin/clone.c:405 +#: builtin/clone.c:406 #, c-format msgid "%s exists and is not a directory" msgstr "'%s'์ด(๊ฐ) ์์ง๋ง ๋๋ ํฐ๋ฆฌ๊ฐ ์๋๋๋ค" -#: builtin/clone.c:419 +#: builtin/clone.c:420 #, c-format msgid "failed to stat %s\n" msgstr "'%s'์ ๋ํด stat()์ด ์คํจํ์ต๋๋ค\n" -#: builtin/clone.c:441 +#: builtin/clone.c:442 #, c-format msgid "failed to create link '%s'" msgstr "'%s' ๋งํฌ๋ฅผ ๋ง๋๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/clone.c:445 +#: builtin/clone.c:446 #, c-format msgid "failed to copy file to '%s'" msgstr "ํ์ผ์ '%s'(์ผ)๋ก ๋ณต์ฌํ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/clone.c:470 +#: builtin/clone.c:471 #, c-format msgid "done.\n" msgstr "์๋ฃ.\n" -#: builtin/clone.c:482 +#: builtin/clone.c:483 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6628,99 +6740,99 @@ msgstr "" "'git status' ๋ช
๋ น์ผ๋ก ๋ฌด์์ ์ฒดํฌ์์ํ๋์ง ์ดํด๋ณผ ์ ์๊ณ \n" "'git checkout -f HEAD'๋ก ์ฒดํฌ์์์ ๋ค์ ํ ์ ์์ต๋๋ค\n" -#: builtin/clone.c:559 +#: builtin/clone.c:560 #, c-format msgid "Could not find remote branch %s to clone." msgstr "๋ณต์ ํ ๋ฆฌ๋ชจํธ์ %s ๋ธ๋์น๋ฅผ ์ฐพ์ ์ ์์ต๋๋ค." -#: builtin/clone.c:654 +#: builtin/clone.c:655 msgid "remote did not send all necessary objects" msgstr "๋ฆฌ๋ชจํธ์์ ํ์ํ ์ค๋ธ์ ํธ๋ฅผ ๋ชจ๋ ๋ณด๋ด์ง ์์์ต๋๋ค" -#: builtin/clone.c:670 +#: builtin/clone.c:671 #, c-format msgid "unable to update %s" msgstr "%s์(๋ฅผ) ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค" -#: builtin/clone.c:719 +#: builtin/clone.c:720 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "๋ฆฌ๋ชจํธ HEAD๊ฐ ์๋ ๋ ํผ๋ฐ์ค๋ฅผ ์ฐธ๊ณ ํ๋ฏ๋ก, ์ฒดํฌ์์ํ ์ ์์ต๋๋ค.\n" -#: builtin/clone.c:750 +#: builtin/clone.c:751 msgid "unable to checkout working tree" msgstr "์์
ํด๋๋ฅผ ์ฒดํฌ์์ํ ์ ์์ต๋๋ค" -#: builtin/clone.c:792 +#: builtin/clone.c:796 msgid "unable to write parameters to config file" msgstr "ํ๋ผ๋ฏธํฐ๋ฅผ ์ค์ ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: builtin/clone.c:855 +#: builtin/clone.c:859 msgid "cannot repack to clean up" msgstr "์ ๋ฆฌ์ฉ์ผ๋ก repackํ ์ ์์ต๋๋ค" -#: builtin/clone.c:857 +#: builtin/clone.c:861 msgid "cannot unlink temporary alternates file" msgstr "๋ณด์กฐ ์์ ํ์ผ์ ์ญ์ ํ ์ ์์ต๋๋ค" -#: builtin/clone.c:890 builtin/receive-pack.c:1945 +#: builtin/clone.c:894 builtin/receive-pack.c:1944 msgid "Too many arguments." msgstr "๋๋ฌด ์ธ์๊ฐ ๋ง์ต๋๋ค." -#: builtin/clone.c:894 +#: builtin/clone.c:898 msgid "You must specify a repository to clone." msgstr "๋ณต์ ํ ์ ์ฅ์๋ฅผ ์ง์ ํด์ผ ํฉ๋๋ค." -#: builtin/clone.c:907 +#: builtin/clone.c:911 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare ๋ฐ --origin %s ์ต์
์ ํธํ๋์ง ์์ต๋๋ค." -#: builtin/clone.c:910 +#: builtin/clone.c:914 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare ๋ฐ --separate-git-dir ์ต์
์ ํธํ๋์ง ์์ต๋๋ค." -#: builtin/clone.c:923 +#: builtin/clone.c:927 #, c-format msgid "repository '%s' does not exist" msgstr "'%s' ์ ์ฅ์๊ฐ ์์ต๋๋ค" -#: builtin/clone.c:929 builtin/fetch.c:1337 +#: builtin/clone.c:933 builtin/fetch.c:1360 #, c-format msgid "depth %s is not a positive number" msgstr "๊น์ด๊ฐ(%s) 0๋ณด๋ค ํฐ ์๊ฐ ์๋๋๋ค" -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "๋์ ๊ฒฝ๋ก๊ฐ('%s') ์ด๋ฏธ ์๊ณ ๋น ๋๋ ํฐ๋ฆฌ๊ฐ ์๋๋๋ค." -#: builtin/clone.c:949 +#: builtin/clone.c:953 #, c-format msgid "working tree '%s' already exists." msgstr "์์
ํด๋๊ฐ('%s') ์ด๋ฏธ ์์ต๋๋ค." -#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 -#: builtin/worktree.c:222 builtin/worktree.c:252 +#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 +#: builtin/worktree.c:240 builtin/worktree.c:270 #, c-format msgid "could not create leading directories of '%s'" msgstr "'%s'์ ์ ๋๋ ํฐ๋ฆฌ๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: builtin/clone.c:967 +#: builtin/clone.c:971 #, c-format msgid "could not create work tree dir '%s'" msgstr "์์
๋๋ ํฐ๋ฆฌ๋ฅผ('%s') ๋ง๋ค ์ ์์ต๋๋ค" -#: builtin/clone.c:979 +#: builtin/clone.c:983 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "๊ฐ๋ตํ ์ ์ฅ์๋ก('%s') ๋ณต์ ํฉ๋๋ค...\n" -#: builtin/clone.c:981 +#: builtin/clone.c:985 #, c-format msgid "Cloning into '%s'...\n" msgstr "'%s'์ ๋ณต์ ํฉ๋๋ค...\n" -#: builtin/clone.c:1005 +#: builtin/clone.c:1009 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -6728,42 +6840,42 @@ msgstr "" "clone --recursive ์ต์
์ --reference ๋ฐ --reference-if-able ์ต์
์ ๊ฐ์ด ์ฐ๋ " "๊ฒ๊ณผ ํธํ๋์ง ์์ต๋๋ค" -#: builtin/clone.c:1067 +#: builtin/clone.c:1071 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth ์ต์
์ ๋ก์ปฌ ๋ณต์ ์์ ๋ฌด์๋ฉ๋๋ค. ๋์ ์ 'file://'์ ์ฌ์ฉํ์ญ์์ค." -#: builtin/clone.c:1069 +#: builtin/clone.c:1073 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since ์ต์
์ ๋ก์ปฌ ๋ณต์ ์์ ๋ฌด์๋ฉ๋๋ค. ๋์ ์ 'file://'์ ์ฌ์ฉํ์ญ" "์์ค." -#: builtin/clone.c:1071 +#: builtin/clone.c:1075 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude ์ต์
์ ๋ก์ปฌ ๋ณต์ ์์ ๋ฌด์๋ฉ๋๋ค. ๋์ ์ 'file://'์ ์ฌ์ฉํ" "์ญ์์ค." -#: builtin/clone.c:1074 +#: builtin/clone.c:1078 msgid "source repository is shallow, ignoring --local" msgstr "์๋ณธ ์ ์ฅ์๊ฐ ์์ ์ ์ฅ์์ด๋ฏ๋ก, --local ์ต์
์ ๋ฌด์ํฉ๋๋ค" -#: builtin/clone.c:1079 +#: builtin/clone.c:1083 msgid "--local is ignored" msgstr "--local ์ต์
์ ๋ฌด์๋ฉ๋๋ค" -#: builtin/clone.c:1083 +#: builtin/clone.c:1087 #, c-format msgid "Don't know how to clone %s" msgstr "%s์ ๋ณต์ ๋ฐฉ๋ฒ์ ์์ง ๋ชปํฉ๋๋ค" -#: builtin/clone.c:1138 builtin/clone.c:1146 +#: builtin/clone.c:1142 builtin/clone.c:1150 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "๋ฆฌ๋ชจํธ์ %s ๋ธ๋์น๊ฐ ์
์คํธ๋ฆผ %s์ ์์ต๋๋ค" -#: builtin/clone.c:1149 +#: builtin/clone.c:1153 msgid "You appear to have cloned an empty repository." msgstr "๋น ์ ์ฅ์๋ฅผ ๋ณต์ ํ ๊ฒ์ฒ๋ผ ๋ณด์
๋๋ค." @@ -6903,61 +7015,61 @@ msgstr "" "๊ทธ ๋ค์์ \"git cherry-pick --continue\"๋ฅผ ํ๋ฉด ๋๋จธ์ง ์ปค๋ฐ์\n" "๋ํด ์ปค๋ฐ ๋นผ์ค๊ธฐ๋ฅผ ๋ค์ ์์ํฉ๋๋ค.\n" -#: builtin/commit.c:319 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "HEAD ํธ๋ฆฌ ์ค๋ธ์ ํธ์ ๋ฌถ์์ ํธ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/commit.c:360 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "์์ ์ธ๋ฑ์ค๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: builtin/commit.c:366 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "๋ํํ ์ถ๊ฐ๊ฐ ์คํจํ์ต๋๋ค" -#: builtin/commit.c:379 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "์์ ์ธ๋ฑ์ค๋ฅผ ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค" -#: builtin/commit.c:381 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "์ฃผ์ ์บ์ ํธ๋ฆฌ๋ฅผ ์
๋ฐ์ดํธํ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 +#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 msgid "unable to write new_index file" msgstr "new_index ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: builtin/commit.c:459 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a merge." msgstr "๋ณํฉํ๋ ์ค ๋ถ๋ถ ์ปค๋ฐ์ ํ ์ ์์ต๋๋ค." -#: builtin/commit.c:461 +#: builtin/commit.c:463 msgid "cannot do a partial commit during a cherry-pick." msgstr "์ปค๋ฐ ๋นผ์ค๊ธฐ๋ฅผ ํ๋ ์ค ๋ถ๋ถ ์ปค๋ฐ์ ํ ์ ์์ต๋๋ค." -#: builtin/commit.c:470 +#: builtin/commit.c:471 msgid "cannot read the index" msgstr "์ธ๋ฑ์ค๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/commit.c:489 +#: builtin/commit.c:490 msgid "unable to write temporary index file" msgstr "์์ ์ธ๋ฑ์ค ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: builtin/commit.c:583 +#: builtin/commit.c:587 #, c-format msgid "commit '%s' lacks author header" msgstr "'%s' ์ปค๋ฐ์ ์์ฑ์ ํค๋๊ฐ ์์ต๋๋ค" -#: builtin/commit.c:585 +#: builtin/commit.c:589 #, c-format msgid "commit '%s' has malformed author line" msgstr "'%s' ์ปค๋ฐ์ ์์ฑ์ ํค๋ ํ์์ด ์๋ชป๋์์ต๋๋ค" -#: builtin/commit.c:604 +#: builtin/commit.c:608 msgid "malformed --author parameter" msgstr "--author ํ๋ผ๋ฏธํฐ ํ์์ด ์๋ชป๋์์ต๋๋ค" -#: builtin/commit.c:656 +#: builtin/commit.c:660 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -6965,38 +7077,38 @@ msgstr "" "ํ์ฌ ์ปค๋ฐ ๋ฉ์์ง์์ ์ฌ์ฉ๋์ง ์๋ ์ฃผ์ ๋ฌธ์๋ฅผ\n" "์ ํํ ์ ์์ต๋๋ค" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 #, c-format msgid "could not lookup commit %s" msgstr "%s ์ปค๋ฐ์ ์ฐพ์๋ณผ ์ ์์ต๋๋ค" -#: builtin/commit.c:705 builtin/shortlog.c:295 +#: builtin/commit.c:709 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "(ํ์ค ์
๋ ฅ์์ ๋ก๊ทธ ๋ฉ์์ง๋ฅผ ์ฝ์)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:711 msgid "could not read log from standard input" msgstr "ํ์ค ์
๋ ฅ์์ ๋ก๊ทธ ๋ฉ์์ง๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/commit.c:711 +#: builtin/commit.c:715 #, c-format msgid "could not read log file '%s'" msgstr "'%s' ๋ก๊ทธ ํ์ผ์ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:742 builtin/commit.c:750 msgid "could not read SQUASH_MSG" msgstr "SQUASH_MSG๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/commit.c:743 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "MERGE_MSG๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/commit.c:797 +#: builtin/commit.c:801 msgid "could not write commit template" msgstr "์ปค๋ฐ ์์์ ์ธ ์ ์์ต๋๋ค" -#: builtin/commit.c:815 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -7011,7 +7123,7 @@ msgstr "" "\t%s\n" "๋ค์ ์๋ํ์ญ์์ค.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:824 #, c-format msgid "" "\n" @@ -7026,7 +7138,7 @@ msgstr "" "\t%s\n" "๋ค์ ์๋ํ์ญ์์ค.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:837 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7035,7 +7147,7 @@ msgstr "" "๋ณ๊ฒฝ ์ฌํญ์ ๋ํ ์ปค๋ฐ ๋ฉ์์ง๋ฅผ ์
๋ ฅํ์ญ์์ค. '%c' ๋ฌธ์๋ก ์์ํ๋\n" "์ค์ ๋ฌด์๋๊ณ , ๋ฉ์์ง๋ฅผ ์
๋ ฅํ์ง ์์ผ๋ฉด ์ปค๋ฐ์ด ์ค์ง๋ฉ๋๋ค.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7046,148 +7158,148 @@ msgstr "" "์ค์ ๋ณด์กด๋๋, ํ์ํ๋ฉด ์ง์ ์ ๊ฑฐํ์ญ์์ค. ๋ฉ์์ง๋ฅผ ์
๋ ฅํ์ง\n" "์์ผ๋ฉด ์ปค๋ฐ์ด ์ค์ง๋ฉ๋๋ค.\n" -#: builtin/commit.c:857 +#: builtin/commit.c:861 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s์์ฑ์: %.*s <%.*s>" -#: builtin/commit.c:865 +#: builtin/commit.c:869 #, c-format msgid "%sDate: %s" msgstr "%s์๊ฐ: %s" -#: builtin/commit.c:872 +#: builtin/commit.c:876 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s์ปค๋ฏธํฐ: %.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "์ธ๋ฑ์ค๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/commit.c:951 +#: builtin/commit.c:958 msgid "Error building trees" msgstr "ํธ๋ฆฌ๋ฅผ ๋ง๋๋๋ฐ ์ค๋ฅ" -#: builtin/commit.c:965 builtin/tag.c:274 +#: builtin/commit.c:972 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "๋ฉ์์ง๋ฅผ -m ๋๋ -F ์ต์
์ผ๋ก ์
๋ ฅํ์ญ์์ค.\n" -#: builtin/commit.c:1068 +#: builtin/commit.c:1075 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' ์ต์
์ด '์ด๋ฆ <์ ์๋ฉ์ผ>' ํ์์ด ์๋๊ณ ๊ธฐ์กด ์์ฑ์์๋ ์์ต๋๋ค" -#: builtin/commit.c:1083 builtin/commit.c:1328 +#: builtin/commit.c:1090 builtin/commit.c:1335 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "์ถ์ ๋์ง ์๋ ํ์ผ ๋ชจ๋๊ฐ ('%s') ์๋ชป๋์์ต๋๋ค" -#: builtin/commit.c:1121 +#: builtin/commit.c:1128 msgid "--long and -z are incompatible" msgstr "--long ๋ฐ -z ์ต์
์ ํธํ๋์ง ์์ต๋๋ค" -#: builtin/commit.c:1151 +#: builtin/commit.c:1158 msgid "Using both --reset-author and --author does not make sense" msgstr "--reset-author ๋ฐ --author ์ต์
์ ๋ชจ๋ ์ฌ์ฉํ๋ฉด ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" -#: builtin/commit.c:1160 +#: builtin/commit.c:1167 msgid "You have nothing to amend." msgstr "๋ฐ๊ฟ ์ฌํญ์ด ์์ต๋๋ค." -#: builtin/commit.c:1163 +#: builtin/commit.c:1170 msgid "You are in the middle of a merge -- cannot amend." msgstr "๋ณํฉ ์ค์ ์์ต๋๋ค -- ์ปค๋ฐ์ ๋ฐ๊ฟ ์ ์์ต๋๋ค." -#: builtin/commit.c:1165 +#: builtin/commit.c:1172 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "์ปค๋ฐ ๋นผ์ค๊ธฐ ์ค์ ์์ต๋๋ค -- ์ปค๋ฐ์ ๋ฐ๊ฟ ์ ์์ต๋๋ค." -#: builtin/commit.c:1168 +#: builtin/commit.c:1175 msgid "Options --squash and --fixup cannot be used together" msgstr "--squash ๋ฐ --fixup ์ต์
์ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค" -#: builtin/commit.c:1178 +#: builtin/commit.c:1185 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "-c/-C/-F/--fixup ์ต์
์ค์ ํ๋๋ง ์ฌ์ฉํ ์ ์์ต๋๋ค." -#: builtin/commit.c:1180 +#: builtin/commit.c:1187 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "-m ์ต์
์ -c/-C/-F/--fixup ์ต์
๊ณผ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค." -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ์ต์
์ -C, -c ๋๋ --amend ์ต์
๊ณผ ๊ฐ์ด ์จ์ผ ํฉ๋๋ค." -#: builtin/commit.c:1205 +#: builtin/commit.c:1212 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "--include/--only/--all/--interactive/--patch ์ต์
์ค ํ๋๋ง ์ฌ์ฉํ ์ ์์ต๋" "๋ค." -#: builtin/commit.c:1207 +#: builtin/commit.c:1214 msgid "No paths with --include/--only does not make sense." msgstr "๊ฒฝ๋ก๊ฐ ์์ด --include/--only ์ต์
์ ์ฐ๋ฉด ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค." -#: builtin/commit.c:1219 builtin/tag.c:552 +#: builtin/commit.c:1226 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "์๋ชป๋ ์ ๋ฆฌ ๋ชจ๋ %s" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "-a ์ต์
๊ณผ ๊ฒฝ๋ก๋ฅผ ๊ฐ์ด ์ฌ์ฉํ๋ฉด ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค." -#: builtin/commit.c:1342 builtin/commit.c:1617 +#: builtin/commit.c:1349 builtin/commit.c:1626 msgid "show status concisely" msgstr "์ํ๋ฅผ ๊ฐ๋ตํ๊ฒ ํ์ํฉ๋๋ค" -#: builtin/commit.c:1344 builtin/commit.c:1619 +#: builtin/commit.c:1351 builtin/commit.c:1628 msgid "show branch information" msgstr "๋ธ๋์น ์ ๋ณด๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/commit.c:1346 +#: builtin/commit.c:1353 msgid "show stash information" msgstr "์คํ์ ์ ๋ณด๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/commit.c:1348 +#: builtin/commit.c:1355 msgid "version" msgstr "๋ฒ์ " -#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 -#: builtin/worktree.c:449 +#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 +#: builtin/worktree.c:469 msgid "machine-readable output" msgstr "์ปดํจํฐ๊ฐ ์ฝ์ ์ ์๋ ํ์" -#: builtin/commit.c:1351 builtin/commit.c:1623 +#: builtin/commit.c:1358 builtin/commit.c:1632 msgid "show status in long format (default)" msgstr "๊ธด ํ์์ผ๋ก ์ํ๋ฅผ ํ์ํฉ๋๋ค (๊ธฐ๋ณธ๊ฐ)" -#: builtin/commit.c:1354 builtin/commit.c:1626 +#: builtin/commit.c:1361 builtin/commit.c:1635 msgid "terminate entries with NUL" msgstr "NUL ๋ฌธ์๋ก ํญ๋ชฉ์ ๋๋
๋๋ค" -#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 -#: builtin/fast-export.c:986 builtin/tag.c:412 +#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 +#: builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "๋ชจ๋" -#: builtin/commit.c:1357 builtin/commit.c:1629 +#: builtin/commit.c:1364 builtin/commit.c:1638 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "์ถ์ ๋์ง ์๋ ํ์ผ์ ํ์ํฉ๋๋ค. ์ถ๊ฐ ์ต์
: all, normal, no (๊ธฐ๋ณธ๊ฐ: all)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1367 msgid "show ignored files" msgstr "๋ฌด์๋๋ ํ์ผ์ ํ์ํฉ๋๋ค" -#: builtin/commit.c:1361 parse-options.h:155 +#: builtin/commit.c:1368 parse-options.h:155 msgid "when" msgstr "์ธ์ " -#: builtin/commit.c:1362 +#: builtin/commit.c:1369 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7195,198 +7307,199 @@ msgstr "" "ํ์ ๋ชจ๋์ ๋ณ๊ฒฝ์ ๋ฌด์ํฉ๋๋ค. ์ถ๊ฐ ์ต์
: all, dirty, untracked. (๊ธฐ๋ณธ๊ฐ: " "all)" -#: builtin/commit.c:1364 +#: builtin/commit.c:1371 msgid "list untracked files in columns" msgstr "์ถ์ ๋์ง ์๋ ํ์ผ์ ๋ชฉ๋ก์ ์ฌ๋ฌ ์ด๋ก ํ์ํฉ๋๋ค" -#: builtin/commit.c:1440 +#: builtin/commit.c:1449 msgid "couldn't look up newly created commit" msgstr "์๋ก ๋ง๋ ์ปค๋ฐ์ ์ฐพ์๋ณผ ์ ์์ต๋๋ค" -#: builtin/commit.c:1442 +#: builtin/commit.c:1451 msgid "could not parse newly created commit" msgstr "์๋ก ๋ง๋ ์ปค๋ฐ์ ํ์ฑํ ์ ์์ต๋๋ค" -#: builtin/commit.c:1487 +#: builtin/commit.c:1496 msgid "detached HEAD" msgstr "HEAD ๋ถ๋ฆฌ๋จ" -#: builtin/commit.c:1490 +#: builtin/commit.c:1499 msgid " (root-commit)" msgstr " (์ต์์-์ปค๋ฐ)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1596 msgid "suppress summary after successful commit" msgstr "์ฑ๊ณต์ ์ธ ์ปค๋ฐ ํ์ ์์ฝ์ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/commit.c:1588 +#: builtin/commit.c:1597 msgid "show diff in commit message template" msgstr "์ปค๋ฐ ๋ฉ์์ง ์์์ diff๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/commit.c:1590 +#: builtin/commit.c:1599 msgid "Commit message options" msgstr "์ปค๋ฐ ๋ฉ์์ง ์ต์
" -#: builtin/commit.c:1591 builtin/tag.c:410 +#: builtin/commit.c:1600 builtin/tag.c:388 msgid "read message from file" msgstr "ํ์ผ์์ ๋ฉ์์ง๋ฅผ ์ฝ์ต๋๋ค" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "author" msgstr "์์ฑ์" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "override author for commit" msgstr "์ปค๋ฐ์ ์์ฑ์๋ฅผ ์ง์ ํฉ๋๋ค" -#: builtin/commit.c:1593 builtin/gc.c:358 +#: builtin/commit.c:1602 builtin/gc.c:359 msgid "date" msgstr "์๊ฐ" -#: builtin/commit.c:1593 +#: builtin/commit.c:1602 msgid "override date for commit" msgstr "์ปค๋ฐ์ ์๊ฐ์ ์ง์ ํฉ๋๋ค" -#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/tag.c:408 +#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "๋ฉ์์ง" -#: builtin/commit.c:1594 +#: builtin/commit.c:1603 msgid "commit message" msgstr "์ปค๋ฐ ๋ฉ์์ง" -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 +#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "์ปค๋ฐ" -#: builtin/commit.c:1595 +#: builtin/commit.c:1604 msgid "reuse and edit message from specified commit" msgstr "์ง์ ํ ์ปค๋ฐ์ ๋ฉ์์ง๋ฅผ ์ฌ์ฌ์ฉํ๊ณ ํธ์งํฉ๋๋ค" -#: builtin/commit.c:1596 +#: builtin/commit.c:1605 msgid "reuse message from specified commit" msgstr "์ง์ ํ ์ปค๋ฐ์์ ๋ฉ์์ง๋ฅผ ์ฌ์ฌ์ฉํฉ๋๋ค" -#: builtin/commit.c:1597 +#: builtin/commit.c:1606 msgid "use autosquash formatted message to fixup specified commit" msgstr "์ง์ ํ ์ปค๋ฐ์ ์์ ํ๋๋ฐ autosquash ํ์ ๋ฉ์์ง๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/commit.c:1598 +#: builtin/commit.c:1607 msgid "use autosquash formatted message to squash specified commit" msgstr "์ง์ ํ ์ปค๋ฐ์ ํฉ์น๋๋ฐ autosquash ํ์ ๋ฉ์์ง๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/commit.c:1599 +#: builtin/commit.c:1608 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "์ปค๋ฐ์ ๋ด๊ฐ ์์ฑํ ๊ฒ์ผ๋ก ๋ง๋ญ๋๋ค (-C/-c/--amend์ ๊ฐ์ด ์ฌ์ฉ)" -#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 +#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 +#: builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "Signed-off-by: ์ค์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/commit.c:1601 +#: builtin/commit.c:1610 msgid "use specified template file" msgstr "์ง์ ํ ์์ ํ์ผ์ ์ฌ์ฉํฉ๋๋ค" -#: builtin/commit.c:1602 +#: builtin/commit.c:1611 msgid "force edit of commit" msgstr "์ปค๋ฐ ํธ์ง์ ๊ฐ์ ํฉ๋๋ค" -#: builtin/commit.c:1603 +#: builtin/commit.c:1612 msgid "default" msgstr "๊ธฐ๋ณธ๊ฐ" -#: builtin/commit.c:1603 builtin/tag.c:413 +#: builtin/commit.c:1612 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "๋ฉ์์ง์์ ๊ณต๋ฐฑ๊ณผ #์ฃผ์์ ์ง์๋๋ค" -#: builtin/commit.c:1604 +#: builtin/commit.c:1613 msgid "include status in commit message template" msgstr "์ปค๋ฐ ๋ฉ์์ง ์์์ ์ํ๋ฅผ ํฌํจํฉ๋๋ค" -#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "GPG ์๋ช
์ปค๋ฐ" -#: builtin/commit.c:1609 +#: builtin/commit.c:1618 msgid "Commit contents options" msgstr "์ปค๋ฐ ๋ด์ฉ ์ต์
" -#: builtin/commit.c:1610 +#: builtin/commit.c:1619 msgid "commit all changed files" msgstr "๋ณ๊ฒฝ๋ ํ์ผ์ ๋ชจ๋ ์ปค๋ฐํฉ๋๋ค" -#: builtin/commit.c:1611 +#: builtin/commit.c:1620 msgid "add specified files to index for commit" msgstr "์ง์ ํ ํ์ผ์ ์ปค๋ฐํ ์ธ๋ฑ์ค์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/commit.c:1612 +#: builtin/commit.c:1621 msgid "interactively add files" msgstr "๋ํํ์ผ๋ก ํ์ผ์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/commit.c:1613 +#: builtin/commit.c:1622 msgid "interactively add changes" msgstr "๋ํํ์ผ๋ก ๋ณ๊ฒฝ ์ฌํญ์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/commit.c:1614 +#: builtin/commit.c:1623 msgid "commit only specified files" msgstr "์ง์ ํ ํ์ผ๋ง ์ปค๋ฐํฉ๋๋ค" -#: builtin/commit.c:1615 +#: builtin/commit.c:1624 msgid "bypass pre-commit and commit-msg hooks" msgstr "์ปค๋ฐ ์ ํํฌ์ ์ปค๋ฐ ๋ฉ์์ง ํํฌ๋ฅผ ๊ฑด๋๋๋๋ค" -#: builtin/commit.c:1616 +#: builtin/commit.c:1625 msgid "show what would be committed" msgstr "๋ฌด์์ ์ปค๋ฐํ ์ง ํ์ํฉ๋๋ค" -#: builtin/commit.c:1627 +#: builtin/commit.c:1636 msgid "amend previous commit" msgstr "๋ฐ๋ก ์ ์ปค๋ฐ์ ๋ฐ๊ฟ๋๋ค" -#: builtin/commit.c:1628 +#: builtin/commit.c:1637 msgid "bypass post-rewrite hook" msgstr "๋ค์์ฐ๊ธฐ ํ ํํฌ๋ฅผ ๊ฑด๋๋๋๋ค" -#: builtin/commit.c:1633 +#: builtin/commit.c:1642 msgid "ok to record an empty change" msgstr "๋น ๋ณ๊ฒฝ ์ฌํญ์ ๊ธฐ๋กํ๋๋ก ํ์ฉํฉ๋๋ค" -#: builtin/commit.c:1635 +#: builtin/commit.c:1644 msgid "ok to record a change with an empty message" msgstr "๋น ๋ฉ์์ง์ ๊ฐ์ด ๋ณ๊ฒฝ ์ฌํญ์ ๊ธฐ๋กํ๋๋ก ํ์ฉํฉ๋๋ค" -#: builtin/commit.c:1665 +#: builtin/commit.c:1674 msgid "could not parse HEAD commit" msgstr "HEAD ์ปค๋ฐ์ ํ์ฑํ ์ ์์ต๋๋ค" -#: builtin/commit.c:1710 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "์์๋ MERGE_HEAD ํ์ผ (%s)" -#: builtin/commit.c:1717 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "MERGE_MODE๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/commit.c:1736 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "์ปค๋ฐ ๋ฉ์์ง๋ฅผ ์ฝ์ ์ ์์ต๋๋ค: %s" -#: builtin/commit.c:1747 -#, c-format -msgid "Aborting commit; you did not edit the message.\n" -msgstr "์ปค๋ฐ์ ์ค์งํฉ๋๋ค. ๋ฉ์์ง๋ฅผ ํธ์งํ์ง ์์์ต๋๋ค.\n" - -#: builtin/commit.c:1752 +#: builtin/commit.c:1756 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "์ปค๋ฐ์ ์ค์งํฉ๋๋ค. ์ปค๋ฐ ๋ฉ์์ง๊ฐ ๋น์ด ์์ต๋๋ค.\n" -#: builtin/commit.c:1800 +#: builtin/commit.c:1761 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "์ปค๋ฐ์ ์ค์งํฉ๋๋ค. ๋ฉ์์ง๋ฅผ ํธ์งํ์ง ์์์ต๋๋ค.\n" + +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7551,12 +7664,12 @@ msgstr "" msgid "--local can only be used inside a git repository" msgstr "--local ์ต์
์ ๊น ์ ์ฅ์ ์์์๋ง ์ธ ์ ์์ต๋๋ค" -#: builtin/config.c:621 +#: builtin/config.c:624 #, c-format msgid "cannot create configuration file %s" msgstr "%s ์ค์ ํ์ผ์ ๋ง๋ค ์ ์์ต๋๋ค" -#: builtin/config.c:633 +#: builtin/config.c:637 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7566,11 +7679,11 @@ msgstr "" "%s์(๋ฅผ) ๋ณ๊ฒฝํ๋ ค๋ฉด ์ ๊ท์์ ์ฐ๊ฑฐ๋, --add ๋๋ --replace-all ์ต์
์\n" "์ฌ์ฉํ์ญ์์ค." -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "์ฌ๋์ด ์ฝ๊ธฐ ์ข์ ํ์์ผ๋ก ํฌ๊ธฐ๋ฅผ ํ์ํฉ๋๋ค" @@ -7594,47 +7707,47 @@ msgstr "lightweight" msgid "annotated" msgstr "annotated" -#: builtin/describe.c:253 +#: builtin/describe.c:264 #, c-format msgid "annotated tag %s not available" msgstr "์ฃผ์ ๋ฌ๋ฆฐ %s ํ๊ทธ๋ฅผ ์ฌ์ฉํ ์ ์์ต๋๋ค" -#: builtin/describe.c:257 +#: builtin/describe.c:268 #, c-format msgid "annotated tag %s has no embedded name" msgstr "์ฃผ์ ๋ฌ๋ฆฐ %s ํ๊ทธ์ ๋ด์ฅ๋ ์ด๋ฆ์ด ์์ต๋๋ค" -#: builtin/describe.c:259 +#: builtin/describe.c:270 #, c-format msgid "tag '%s' is really '%s' here" msgstr "'%s' ํ๊ทธ๊ฐ ์ค์ ์ฌ๊ธฐ '%s'์
๋๋ค" -#: builtin/describe.c:286 builtin/log.c:489 +#: builtin/describe.c:297 builtin/log.c:493 #, c-format msgid "Not a valid object name %s" msgstr "์ฌ๋ฐ๋ฅธ ์ค๋ธ์ ํธ ์ด๋ฆ์ด ์๋๋๋ค (%s)" -#: builtin/describe.c:289 +#: builtin/describe.c:300 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s์(๋) ์ฌ๋ฐ๋ฅธ '%s' ์ค๋ธ์ ํธ๊ฐ ์๋๋๋ค" -#: builtin/describe.c:306 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "์ด๋ค ํ๊ทธ๋ '%s'์(๊ณผ) ์ ํํ ์ผ์นํ์ง ์์ต๋๋ค" -#: builtin/describe.c:308 +#: builtin/describe.c:319 #, c-format msgid "searching to describe %s\n" msgstr "%s ์ค๋ช
์ ์ํด ๊ฒ์ํ๋ ์ค\n" -#: builtin/describe.c:355 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "%s์์ ๊ฒ์ ๋ง์นจ\n" -#: builtin/describe.c:382 +#: builtin/describe.c:393 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7643,7 +7756,7 @@ msgstr "" "์ด๋ค ์ฃผ์ ๋ฌ๋ฆฐ ํ๊ทธ๋ '%s'์(๋ฅผ) ์ค๋ช
ํ์ง ์์ต๋๋ค.\n" "ํ์ง๋ง ์ฃผ์ ๋ฌ๋ฆฌ์ง ์์ ํ๊ทธ๊ฐ ์์ต๋๋ค: --tags ์ต์
์ ํด ๋ณด์ญ์์ค." -#: builtin/describe.c:386 +#: builtin/describe.c:397 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7652,12 +7765,12 @@ msgstr "" "์ด๋ค ํ๊ทธ๋ '%s'์(๋ฅผ) ์ค๋ช
ํ ์ ์์ต๋๋ค.\n" "--always ์ต์
์ ์จ ๋ณด๊ฑฐ๋, ํ๊ทธ๋ฅผ ๋ง๋ค์ด ๋ณด์ญ์์ค." -#: builtin/describe.c:416 +#: builtin/describe.c:427 #, c-format msgid "traversed %lu commits\n" msgstr "์ปค๋ฐ %lu๊ฐ๋ฅผ ๊ฐ๋ก์ง๋ ์ต๋๋ค\n" -#: builtin/describe.c:419 +#: builtin/describe.c:430 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7666,75 +7779,75 @@ msgstr "" "ํ๊ทธ๋ฅผ %i๊ฐ ๋๊ฒ ์ฐพ์์ต๋๋ค. ๊ฐ์ฅ ์ต๊ทผ์ %i๊ฐ ๋ชฉ๋ก์\n" "ํ์ํฉ๋๋ค. %s ์์น์์ ๊ฒ์์ ์ค์งํฉ๋๋ค.\n" -#: builtin/describe.c:441 +#: builtin/describe.c:452 msgid "find the tag that comes after the commit" msgstr "์ปค๋ฐ ๋ค์์ ์ค๋ ํ๊ทธ๋ฅผ ์ฐพ์ต๋๋ค" -#: builtin/describe.c:442 +#: builtin/describe.c:453 msgid "debug search strategy on stderr" msgstr "ํ์ค ์ค๋ฅ์์ ๊ฒ์ ์ ๋ต์ ๋๋ฒ๊น
ํฉ๋๋ค" -#: builtin/describe.c:443 +#: builtin/describe.c:454 msgid "use any ref" msgstr "๋ชจ๋ ๋ ํผ๋ฐ์ค๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/describe.c:444 +#: builtin/describe.c:455 msgid "use any tag, even unannotated" msgstr "๋ชจ๋ ํ๊ทธ๋ฅผ, ์ฃผ์ ๋ฌ๋ฆฌ์ง ์์ ํ๊ทธ๊น์ง ์ฌ์ฉํฉ๋๋ค" -#: builtin/describe.c:445 +#: builtin/describe.c:456 msgid "always use long format" msgstr "ํญ์ ๊ธด ํ์์ ์ฌ์ฉํฉ๋๋ค" -#: builtin/describe.c:446 +#: builtin/describe.c:457 msgid "only follow first parent" msgstr "์ฒซ ๋ฒ์งธ ์ด์ ์ปค๋ฐ๋ง ๋ฐ๋ผ๊ฐ๋๋ค" -#: builtin/describe.c:449 +#: builtin/describe.c:460 msgid "only output exact matches" msgstr "์ ํํ ์ผ์นํ๋ ํญ๋ชฉ๋ง ์ถ๋ ฅํฉ๋๋ค" -#: builtin/describe.c:451 +#: builtin/describe.c:462 msgid "consider <n> most recent tags (default: 10)" msgstr "<n>๊ฐ์ ๊ฐ์ฅ ์ต๊ทผ์ ํ๊ทธ๋ง ๊ณ ๋ คํฉ๋๋ค (๊ธฐ๋ณธ๊ฐ: 10)" -#: builtin/describe.c:453 +#: builtin/describe.c:464 msgid "only consider tags matching <pattern>" msgstr "<ํจํด>๊ณผ ์ผ์นํ๋ ํ๊ทธ๋ง ๊ณ ๋ คํฉ๋๋ค" -#: builtin/describe.c:455 +#: builtin/describe.c:466 msgid "do not consider tags matching <pattern>" msgstr "<ํจํด>๊ณผ ์ผ์นํ๋ ํ๊ทธ๋ฅผ ๊ณ ๋ คํ์ง ์์ต๋๋ค" -#: builtin/describe.c:457 builtin/name-rev.c:406 +#: builtin/describe.c:468 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "๋์์ผ๋ก ์์ฝํ ์ปค๋ฐ ์ค๋ธ์ ํธ๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/describe.c:458 builtin/describe.c:461 +#: builtin/describe.c:469 builtin/describe.c:472 msgid "mark" msgstr "ํ์" -#: builtin/describe.c:459 +#: builtin/describe.c:470 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "๋ณ๊ฒฝ๋ ์์
ํด๋์ <ํ์>๋ฅผ ๋ค์ ๋ถ์
๋๋ค (๊ธฐ๋ณธ๊ฐ: \"-dirty\")" -#: builtin/describe.c:462 +#: builtin/describe.c:473 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "๋ง๊ฐ์ง ์์
ํด๋์ <ํ์>๋ฅผ ๋ค์ ๋ถ์
๋๋ค (๊ธฐ๋ณธ๊ฐ: \"-broken\")" -#: builtin/describe.c:480 +#: builtin/describe.c:491 msgid "--long is incompatible with --abbrev=0" msgstr "--long ์ต์
์ --abbrev=0 ์ต์
๊ณผ ํธํ๋์ง ์์ต๋๋ค" -#: builtin/describe.c:509 +#: builtin/describe.c:520 msgid "No names found, cannot describe anything." msgstr "์ด๋ฆ์ด ์์ต๋๋ค. ์๋ฌด๊ฒ๋ ์ค๋ช
ํ ์ ์์ต๋๋ค." -#: builtin/describe.c:552 +#: builtin/describe.c:563 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty ์ต์
์ ์ปค๋ฐ๊ฐ์ ํญ๋ชฉ๊ณผ ํธํ๋์ง ์์ต๋๋ค" -#: builtin/describe.c:554 +#: builtin/describe.c:565 msgid "--broken is incompatible with commit-ishes" msgstr "--broken ์ต์
์ ์ปค๋ฐ๊ฐ์ ํญ๋ชฉ๊ณผ ํธํ๋์ง ์์ต๋๋ค" @@ -7748,21 +7861,21 @@ msgstr "'%s': ์ผ๋ฐ ํ์ผ์ด๋ ์ฌ๋ณผ๋ฆญ ๋งํฌ๊ฐ ์๋๋๋ค" msgid "invalid option: %s" msgstr "์๋ชป๋ ์ต์
: %s" -#: builtin/diff.c:359 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "๊น ์ ์ฅ์๊ฐ ์๋๋๋ค" -#: builtin/diff.c:402 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "์๋ชป๋ '%s' ์ค๋ธ์ ํธ๊ฐ ์ฃผ์ด์ก์ต๋๋ค." -#: builtin/diff.c:411 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "๋ ๊ฐ๋ณด๋ค ๋ง์ ๋ธ๋กญ์ด ์ฃผ์ด์ก์ต๋๋ค: '%s'" -#: builtin/diff.c:416 +#: builtin/diff.c:414 #, c-format msgid "unhandled object '%s' given." msgstr "์ฒ๋ฆฌํ์ง ์์ '%s' ์ค๋ธ์ ํธ๊ฐ ์ฃผ์ด์ก์ต๋๋ค." @@ -7771,27 +7884,27 @@ msgstr "์ฒ๋ฆฌํ์ง ์์ '%s' ์ค๋ธ์ ํธ๊ฐ ์ฃผ์ด์ก์ต๋๋ค." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<์ต์
>] [<์ปค๋ฐ> [<์ปค๋ฐ>]] [--] [<๊ฒฝ๋ก>...]" -#: builtin/difftool.c:249 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "์คํจ: %d" -#: builtin/difftool.c:291 +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "%s ์ฌ๋ณผ๋ฆญ ๋งํฌ๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/difftool.c:293 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "%s ์ฌ๋ณผ๋ฆญ ๋งํฌ ํ์ผ์ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/difftool.c:301 +#: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "%2$s ์ฌ๋ณผ๋ฆญ ๋งํฌ์ ๋ํ %1$s ์ค๋ธ์ ํธ๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/difftool.c:403 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7799,72 +7912,72 @@ msgstr "" "์ปด๋ฐ์ธ๋ diff ํ์์ ('-c' ๋ฐ '--cc') ๋๋ ํฐ๋ฆฌ diff ๋ชจ๋์์๋\n" "('-d' ๋ฐ '--dir-diff') ์ง์ํ์ง ์์ต๋๋ค." -#: builtin/difftool.c:626 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "๋ ํ์ผ์ด ์์ ๋์์ต๋๋ค: '%s' ๋ฐ '%s'." -#: builtin/difftool.c:628 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "์์
ํด๋๊ฐ ๋จ๊ฒจ์ ธ ์์ต๋๋ค." -#: builtin/difftool.c:639 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "์์ ํ์ผ์ด '%s'์ ์์ต๋๋ค." -#: builtin/difftool.c:640 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "์ด ํ์ผ์ ์ง์ฐ๊ฑฐ๋ ๋ณต๊ตฌํ ์ ์์ต๋๋ค." -#: builtin/difftool.c:689 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "`diff.tool` ๋์ `diff.guitool`์ ์ฌ์ฉํ์ญ์์ค" -#: builtin/difftool.c:691 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "์ ์ฒด ๋๋ ํฐ๋ฆฌ diff๋ฅผ ์ํํฉ๋๋ค" -#: builtin/difftool.c:693 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "diff ๋๊ตฌ๋ฅผ ์คํํ๊ธฐ ์ ์ ํ๋กฌํํธ๋ฅผ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/difftool.c:699 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "dir-diff ๋ชจ๋์์ ์ฌ๋ณผ๋ฆญ ๋งํฌ๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/difftool.c:700 +#: builtin/difftool.c:707 msgid "<tool>" msgstr "<๋๊ตฌ>" -#: builtin/difftool.c:701 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "์ง์ ํ diff ๋๊ตฌ๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/difftool.c:703 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "`--tool` ์ต์
์์ ์ฌ์ฉํ ์ ์๋ diff ๋๊ตฌ ๋ชฉ๋ก์ ํ์ํฉ๋๋ค" -#: builtin/difftool.c:706 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" "์คํํ diff ๋๊ตฌ๊ฐ 0์ด ์๋ ์ฝ๋๋ฅผ ๋ฆฌํดํ๋ฉด 'git-difftool'์ด ๋๋๊ฒ ํฉ๋๋ค" -#: builtin/difftool.c:708 +#: builtin/difftool.c:715 msgid "<command>" msgstr "<๋ช
๋ น>" -#: builtin/difftool.c:709 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "diff๋ฅผ ๋ณด๋ ๋ช
๋ น์ด๋ฅผ ์ฌ์ฉ์๊ฐ ์ง์ ํฉ๋๋ค" -#: builtin/difftool.c:733 +#: builtin/difftool.c:740 msgid "no <tool> given for --tool=<tool>" msgstr "--tool=<๋๊ตฌ> ์ต์
์ <๋๊ตฌ>๊ฐ ์ฃผ์ด์ง์ง ์์์ต๋๋ค" -#: builtin/difftool.c:740 +#: builtin/difftool.c:747 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "--extcmd=<๋ช
๋ น> ์ต์
์ <๋ช
๋ น>์ด ์ฃผ์ด์ง์ง ์์์ต๋๋ค" @@ -7872,231 +7985,231 @@ msgstr "--extcmd=<๋ช
๋ น> ์ต์
์ <๋ช
๋ น>์ด ์ฃผ์ด์ง์ง ์์์ต๋๋ค" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-์ต์
]" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:998 msgid "show progress after <n> objects" msgstr "์ค๋ธ์ ํธ <n>๊ฐ ๋ค์ ์งํ ์ํฉ์ ํ์ํฉ๋๋ค" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "์๋ช
ํ ํ๊ทธ์ ์ฒ๋ฆฌ ๋ฐฉ์์ ์ ํํฉ๋๋ค" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "ํํฐ๋งํ ์ค๋ธ์ ํธ์ ๋ํ ํ๊ทธ์ ์ฒ๋ฆฌ ๋ฐฉ์์ ์ ํํฉ๋๋ค" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "์ด ํ์ผ๋ก ํ์๋ฅผ ๋ด๋ณด๋
๋๋ค" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "์ด ํ์ผ์์ ํ์๋ฅผ ๊ฐ์ ธ์ต๋๋ค" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "ํ๊ทธ์ ํ๊ทธ๋ถ์ธ ์ฌ๋์ด ์์ ๋ ๊ฐ์ง๋ก ๋ง๋ญ๋๋ค" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "์ปค๋ฐ ๋ง๋ค ์ ์ฒด ํธ๋ฆฌ๋ฅผ ์ถ๋ ฅํฉ๋๋ค" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "์คํธ๋ฆผ์ ๋๋ด๋๋ฐ ์๋ฃ ๊ธฐ๋ฅ์ ์ฌ์ฉํฉ๋๋ค" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "๋ธ๋กญ ๋ฐ์ดํฐ์ ์ถ๋ ฅ์ ๊ฑด๋๋๋๋ค" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1016 msgid "refspec" msgstr "๋ ํผ๋ฐ์ค๋ช
์ธ" -#: builtin/fast-export.c:1001 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "๋ ํผ๋ฐ์ค๋ช
์ธ๋ฅผ ๋ด๋ณด๋ธ ๋ ํผ๋ฐ์ค์ ์ ์ฉํฉ๋๋ค" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "์ถ๋ ฅ์ ์ต๋ช
ํํฉ๋๋ค" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<์ต์
>] [<์ ์ฅ์> [<๋ ํผ๋ฐ์ค๋ช
์ธ>...]]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] <group>" msgstr "git fetch [<์ต์
>] <๊ทธ๋ฃน>" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<์ต์
>] [(<์ ์ฅ์> | <๊ทธ๋ฃน>)...]" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<์ต์
>]" -#: builtin/fetch.c:90 builtin/pull.c:182 +#: builtin/fetch.c:112 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "๋ชจ๋ ๋ฆฌ๋ชจํธ์์ ๊ฐ์ ธ์ต๋๋ค" -#: builtin/fetch.c:92 builtin/pull.c:185 +#: builtin/fetch.c:114 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "๋ฎ์ด์ฐ์ง ๋ง๊ณ .git/FETCH_HEAD์ ๋ง๋ถ์
๋๋ค" -#: builtin/fetch.c:94 builtin/pull.c:188 +#: builtin/fetch.c:116 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "๋ฆฌ๋ชจํธ ์ชฝ์ ๋ฌถ์์ ์
๋ก๋ํ ๊ฒฝ๋ก" -#: builtin/fetch.c:95 builtin/pull.c:190 +#: builtin/fetch.c:117 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "๋ก์ปฌ ๋ธ๋์น๋ฅผ ๊ฐ์ ๋ก ๋ฎ์ด์๋๋ค" -#: builtin/fetch.c:97 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "์ฌ๋ฌ ๋ฆฌ๋ชจํธ์์ ๊ฐ์ ธ์ต๋๋ค" -#: builtin/fetch.c:99 builtin/pull.c:192 +#: builtin/fetch.c:121 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "๋ชจ๋ ํ๊ทธ์ ๊ด๋ จ ์ค๋ธ์ ํธ๋ฅผ ๊ฐ์ ธ์ต๋๋ค" -#: builtin/fetch.c:101 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "๋ชจ๋ ํ๊ทธ๋ฅผ ๊ฐ์ ธ์ค์ง ์์ต๋๋ค (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "๋ณ๋ ฌ์ ์ผ๋ก ๋ฐ์์ค๋ ํ์๋ชจ๋ ๊ฐ์" -#: builtin/fetch.c:105 builtin/pull.c:195 +#: builtin/fetch.c:127 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "๋ฆฌ๋ชจํธ์ ์ด์ ์๋ ๋ฆฌ๋ชจํธ ์ถ์ ๋ธ๋์น๋ฅผ ์๋ผ๋
๋๋ค" -#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 +#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 msgid "on-demand" msgstr "์ฃผ๋ฌธํ" -#: builtin/fetch.c:107 +#: builtin/fetch.c:129 msgid "control recursive fetching of submodules" msgstr "ํ์ ๋ชจ๋ ์ฌ๊ท์ ์ผ๋ก ๊ฐ์ ธ์ค๊ธฐ ๋ฐฉ์์ ์ค์ ํฉ๋๋ค" -#: builtin/fetch.c:111 builtin/pull.c:203 +#: builtin/fetch.c:133 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "๋ค์ด๋ก๋ํ ๋ฌถ์์ ๋ณด์กดํฉ๋๋ค" -#: builtin/fetch.c:113 +#: builtin/fetch.c:135 msgid "allow updating of HEAD ref" msgstr "HEAD ๋ ํผ๋ฐ์ค ์
๋ฐ์ดํธ๋ฅผ ํ์ฉํฉ๋๋ค" -#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 +#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "์์ ๋ณต์ ์ ์ปค๋ฐ ๋ด์ญ์ ๊น๊ฒ ๋ง๋ญ๋๋ค" -#: builtin/fetch.c:118 +#: builtin/fetch.c:140 msgid "deepen history of shallow repository based on time" msgstr "์์ ๋ณต์ ์ ์ปค๋ฐ ๋ด์ญ์ ์๊ฐ์ ๊ธฐ์ค์ผ๋ก ๊น๊ฒ ๋ง๋ญ๋๋ค" -#: builtin/fetch.c:124 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "์์ ํ ์ ์ฅ์๋ก ์ ํํฉ๋๋ค" -#: builtin/fetch.c:126 builtin/log.c:1450 +#: builtin/fetch.c:148 builtin/log.c:1456 msgid "dir" msgstr "๋๋ ํฐ๋ฆฌ" -#: builtin/fetch.c:127 +#: builtin/fetch.c:149 msgid "prepend this to submodule path output" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก ์ถ๋ ฅ์ ์์ ์ด ๋๋ ํฐ๋ฆฌ๋ฅผ ๋ถ์
๋๋ค" -#: builtin/fetch.c:130 +#: builtin/fetch.c:152 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "ํ์ ๋ชจ๋์ ์ฌ๊ท์ ์ผ๋ก ๊ฐ์ ธ์ฌ ๋ ๊ธฐ๋ณธ๊ฐ (์ค์ ํ์ผ๋ณด๋ค ๋ฎ์ ์ฐ์ ์์)" -#: builtin/fetch.c:134 builtin/pull.c:212 +#: builtin/fetch.c:156 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr ".git/shallow๋ฅผ ์
๋ฐ์ดํธํ๋ ๋ ํผ๋ฐ์ค๋ฅผ ํ์ฉํฉ๋๋ค" -#: builtin/fetch.c:135 builtin/pull.c:214 +#: builtin/fetch.c:157 builtin/pull.c:214 msgid "refmap" msgstr "๋ ํผ๋ฐ์ค๋งต" -#: builtin/fetch.c:136 builtin/pull.c:215 +#: builtin/fetch.c:158 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "๋ ํผ๋ฐ์ค๋งต ๊ฐ์ ธ์ค๊ธฐ๋ฅผ ์ง์ ํฉ๋๋ค" -#: builtin/fetch.c:394 +#: builtin/fetch.c:416 msgid "Couldn't find remote ref HEAD" msgstr "๋ฆฌ๋ชจํธ ๋ ํผ๋ฐ์ค HEAD๋ฅผ ์ฐพ์ ์ ์์ต๋๋ค" -#: builtin/fetch.c:512 +#: builtin/fetch.c:534 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "fetch.output ์ค์ ์ ์๋ชป๋ ๊ฐ์ด ์์ต๋๋ค: %s" -#: builtin/fetch.c:605 +#: builtin/fetch.c:627 #, c-format msgid "object %s not found" msgstr "%s ์ค๋ธ์ ํธ๊ฐ ์์ต๋๋ค" -#: builtin/fetch.c:609 +#: builtin/fetch.c:631 msgid "[up to date]" msgstr "[์ต์ ์ํ]" -#: builtin/fetch.c:622 builtin/fetch.c:702 +#: builtin/fetch.c:644 builtin/fetch.c:724 msgid "[rejected]" msgstr "[๊ฑฐ๋ถ๋จ]" -#: builtin/fetch.c:623 +#: builtin/fetch.c:645 msgid "can't fetch in current branch" msgstr "ํ์ฌ ๋ธ๋์น์์ ๊ฐ์ ธ์ฌ ์ ์์" -#: builtin/fetch.c:632 +#: builtin/fetch.c:654 msgid "[tag update]" msgstr "[ํ๊ทธ ์
๋ฐ์ดํธ]" -#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 -#: builtin/fetch.c:697 +#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 +#: builtin/fetch.c:719 msgid "unable to update local ref" msgstr "๋ก์ปฌ ๋ ํผ๋ฐ์ค๋ฅผ ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค" -#: builtin/fetch.c:652 +#: builtin/fetch.c:674 msgid "[new tag]" msgstr "[์๋ก์ด ํ๊ทธ]" -#: builtin/fetch.c:655 +#: builtin/fetch.c:677 msgid "[new branch]" msgstr "[์๋ก์ด ๋ธ๋์น]" -#: builtin/fetch.c:658 +#: builtin/fetch.c:680 msgid "[new ref]" msgstr "[์๋ก์ด ๋ ํผ๋ฐ์ค]" -#: builtin/fetch.c:697 +#: builtin/fetch.c:719 msgid "forced update" msgstr "๊ฐ์ ์
๋ฐ์ดํธ" -#: builtin/fetch.c:702 +#: builtin/fetch.c:724 msgid "non-fast-forward" msgstr "์ ๋ฐฉํฅ ์งํ์ด ์๋" -#: builtin/fetch.c:747 +#: builtin/fetch.c:769 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s์ด(๊ฐ) ๋ชจ๋ ํ์ํ ์ค๋ธ์ ํธ๋ฅผ ๋ณด๋ด์ง ์์์ต๋๋ค\n" -#: builtin/fetch.c:767 +#: builtin/fetch.c:789 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "์์ ์ต์์์ ์
๋ฐ์ดํธ๊ฐ ํ์ฉ๋์ง ์์ผ๋ฏ๋ก %s์(๋ฅผ) ๊ฑฐ๋ถํฉ๋๋ค" -#: builtin/fetch.c:855 builtin/fetch.c:951 +#: builtin/fetch.c:877 builtin/fetch.c:973 #, c-format msgid "From %.*s\n" msgstr "%.*s URL์์\n" -#: builtin/fetch.c:866 +#: builtin/fetch.c:888 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8105,55 +8218,55 @@ msgstr "" "์
๋ฐ์ดํธํ ์ ์๋ ๋ก์ปฌ ๋ ํผ๋ฐ์ค๊ฐ ์์ต๋๋ค. ๊ณผ๊ฑฐ ์ถฉ๋ ๋ธ๋์น๋ฅผ\n" " ์ ๊ฑฐํ๋ ค๋ฉด 'git remote prune %s' ๋ช
๋ น์ ์คํํด ๋ณด์ญ์์ค" -#: builtin/fetch.c:921 +#: builtin/fetch.c:943 #, c-format msgid " (%s will become dangling)" msgstr " (%s ๋ ํผ๋ฐ์ค๊ฐ ์ฐ๊ฒฐ์ด ๋์ด์ง๊ฒ ๋ฉ๋๋ค)" -#: builtin/fetch.c:922 +#: builtin/fetch.c:944 #, c-format msgid " (%s has become dangling)" msgstr " (%s ๋ ํผ๋ฐ์ค๊ฐ ์ฐ๊ฒฐ์ด ๋์ด์ก์ต๋๋ค)" -#: builtin/fetch.c:954 +#: builtin/fetch.c:976 msgid "[deleted]" msgstr "[์ญ์ ๋จ]" -#: builtin/fetch.c:955 builtin/remote.c:1023 +#: builtin/fetch.c:977 builtin/remote.c:1024 msgid "(none)" msgstr "(์์)" -#: builtin/fetch.c:978 +#: builtin/fetch.c:1000 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "๊ฐ๋ตํ ์ ์ฅ์๊ฐ ์๋ ์ ์ฅ์์ ํ์ฌ %s ๋ธ๋์น๋ก ๊ฐ์ ธ์ค๊ธฐ๋ฅผ ๊ฑฐ์ ํฉ๋๋ค" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1019 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "\"%s\" ์ต์
์ \"%s\" ๊ฐ์ %s์ ๋ํด ์ฌ๋ฐ๋ฅด์ง ์์ต๋๋ค" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1022 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "\"%s\" ์ต์
์ '%s'์ ๋ํด ๋ฌด์๋ฉ๋๋ค\n" -#: builtin/fetch.c:1076 +#: builtin/fetch.c:1098 #, c-format msgid "Don't know how to fetch from %s" msgstr "'%s'์์ ๊ฐ์ ธ์ค๋ ๋ฐฉ๋ฒ์ ์ ์ ์์ต๋๋ค" -#: builtin/fetch.c:1236 +#: builtin/fetch.c:1258 #, c-format msgid "Fetching %s\n" msgstr "%s์(๋ฅผ) ๊ฐ์ ธ์ค๋ ์ค\n" -#: builtin/fetch.c:1238 builtin/remote.c:97 +#: builtin/fetch.c:1260 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "%s์(๋ฅผ) ๊ฐ์ ธ์ฌ ์ ์์ต๋๋ค" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1278 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8161,41 +8274,41 @@ msgstr "" "๋ฆฌ๋ชจํธ ์ ์ฅ์๋ฅผ ์ง์ ํ์ง ์์์ต๋๋ค. ์ ๋ฆฌ๋น์ ์ ๊ฐ์ ธ์ฌ ์ ์๋\n" "URL์ด๋ ๋ฆฌ๋ชจํธ ์ด๋ฆ์ ์ง์ ํ์ญ์์ค." -#: builtin/fetch.c:1279 +#: builtin/fetch.c:1301 msgid "You need to specify a tag name." msgstr "ํ๊ทธ ์ด๋ฆ์ ์ง์ ํด์ผ ํฉ๋๋ค." -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1344 msgid "Negative depth in --deepen is not supported" msgstr "--deepen ์ต์
์ ์์ ๊น์ด๋ ์ง์ํ์ง ์์ต๋๋ค" -#: builtin/fetch.c:1323 +#: builtin/fetch.c:1346 msgid "--deepen and --depth are mutually exclusive" msgstr "-deepen, --depth ์ต์
์ค ํ๋๋ง ์ธ ์ ์์ต๋๋ค" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1351 msgid "--depth and --unshallow cannot be used together" msgstr "--depth ๋ฐ --unshallow ์ต์
์ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค" -#: builtin/fetch.c:1330 +#: builtin/fetch.c:1353 msgid "--unshallow on a complete repository does not make sense" msgstr "" "์์ ํ ์ ์ฅ์์ ๋ํด --unshallow ์ต์
์ ์ฌ์ฉํ๋ ๊ฑด ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1366 msgid "fetch --all does not take a repository argument" msgstr "fetch --all ๋ช
๋ น์ ์ ์ฅ์ ์ธ์๊ฐ ์์ต๋๋ค" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1368 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all ๋ช
๋ น์ ๋ ํผ๋ฐ์ค๋ช
์ธ ์ธ์์ ๊ฐ์ด ์ฐ๋ฉด ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" -#: builtin/fetch.c:1362 +#: builtin/fetch.c:1379 #, c-format msgid "No such remote or remote group: %s" msgstr "๊ทธ๋ฐ ๋ฆฌ๋ชจํธ๋ ๋ฆฌ๋ชจํธ ๊ทธ๋ฃน์ด ์์ต๋๋ค: %s" -#: builtin/fetch.c:1370 +#: builtin/fetch.c:1387 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "๊ทธ๋ฃน์ ๊ฐ์ ธ์ค๊ณ ๋ ํผ๋ฐ์ค๋ช
์ธ๋ฅผ ์ง์ ํ๋ฉด ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" @@ -8205,23 +8318,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <๋ฉ์์ง>] [--log[=<n>] | --no-log] [--file <ํ์ผ>]" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:665 msgid "populate log with at most <n> entries from shortlog" msgstr "shortlog์์ ์ต๋ <n>๊ฐ ๋ก๊ทธ๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:668 msgid "alias for --log (deprecated)" msgstr "--log์ ๋์ผ (์์ด์ง ์์ )" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "text" msgstr "ํ
์คํธ" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "use <text> as start of message" msgstr "<ํ
์คํธ>๋ฅผ ์์ ๋ฉ์์ง๋ก ์ฌ์ฉํฉ๋๋ค" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "file to read from" msgstr "์ฝ์ด๋ค์ผ ํ์ผ" @@ -8261,101 +8374,105 @@ msgstr "ํฐํด์ ์ ํฉํ๊ฒ ํ๋ ์ด์คํ๋๋ฅผ ์ธ์ฉํฉ๋๋ค" msgid "show only <n> matched refs" msgstr "<n>๊ฐ์ ํด๋นํ๋ ๋ ํผ๋ฐ์ค๋ง ํ์ํฉ๋๋ค" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:39 builtin/tag.c:414 +msgid "respect format colors" +msgstr "ํฌ๋งท ์์ ์ ์งํฉ๋๋ค" + +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "์ฃผ์ด์ง ์ค๋ธ์ ํธ๋ฅผ ๊ฐ๋ฆฌํค๋ ๋ ํผ๋ฐ์ค๋ง ํ์ํฉ๋๋ค" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "๋ณํฉํ๋ ๋ ํผ๋ฐ์ค๋ง ํ์ํฉ๋๋ค" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "๋ณํฉํ์ง ์๋ ๋ ํผ๋ฐ์ค๋ง ํ์ํฉ๋๋ค" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "์ปค๋ฐ์ด ๋ค์ด ์๋ ๋ ํผ๋ฐ์ค๋ง ํ์ํฉ๋๋ค" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "์ปค๋ฐ์ด ๋ค์ด ์์ง ์์ ๋ ํผ๋ฐ์ค๋ง ํ์ํฉ๋๋ค" -#: builtin/fsck.c:554 +#: builtin/fsck.c:543 msgid "Checking object directories" msgstr "์ค๋ธ์ ํธ ๋๋ ํฐ๋ฆฌ๋ฅผ ํ์ธํ๋ ์ค์
๋๋ค" -#: builtin/fsck.c:646 +#: builtin/fsck.c:635 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<์ต์
>] [<์ค๋ธ์ ํธ>...]" -#: builtin/fsck.c:652 +#: builtin/fsck.c:641 msgid "show unreachable objects" msgstr "์ ๊ทผํ ์ ์๋ ์ค๋ธ์ ํธ๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/fsck.c:653 +#: builtin/fsck.c:642 msgid "show dangling objects" msgstr "์ฐ๊ฒฐ์ด ๋์ด์ง ์ค๋ธ์ ํธ๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/fsck.c:654 +#: builtin/fsck.c:643 msgid "report tags" msgstr "ํ๊ทธ๋ฅผ ์๋ฆฝ๋๋ค" -#: builtin/fsck.c:655 +#: builtin/fsck.c:644 msgid "report root nodes" msgstr "์ต์์ ๋
ธ๋๋ฅผ ์๋ฆฝ๋๋ค" -#: builtin/fsck.c:656 +#: builtin/fsck.c:645 msgid "make index objects head nodes" msgstr "์ธ๋ฑ์ค ์ค๋ธ์ ํธ ํค๋ ๋
ธ๋๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/fsck.c:657 +#: builtin/fsck.c:646 msgid "make reflogs head nodes (default)" msgstr "reflog ํค๋ ๋
ธ๋๋ฅผ ๋ง๋ญ๋๋ค (๊ธฐ๋ณธ๊ฐ)" -#: builtin/fsck.c:658 +#: builtin/fsck.c:647 msgid "also consider packs and alternate objects" msgstr "๋ฌถ์๊ณผ ๋ณด์กฐ ์ค๋ธ์ ํธ๋ ๋ง๋ญ๋๋ค" -#: builtin/fsck.c:659 +#: builtin/fsck.c:648 msgid "check only connectivity" msgstr "์ฐ๊ฒฐ๋ง ํ์ธํฉ๋๋ค" -#: builtin/fsck.c:660 +#: builtin/fsck.c:649 msgid "enable more strict checking" msgstr "๋ ์๊ฒฉํ๊ฒ ํ์ธํฉ๋๋ค" -#: builtin/fsck.c:662 +#: builtin/fsck.c:651 msgid "write dangling objects in .git/lost-found" msgstr ".git/lost-found ์์ ์ฐ๊ฒฐ์ด ๋์ด์ง ์ค๋ธ์ ํธ๋ฅผ ์๋๋ค" -#: builtin/fsck.c:663 builtin/prune.c:107 +#: builtin/fsck.c:652 builtin/prune.c:107 msgid "show progress" msgstr "์งํ ์ํฉ์ ํ์ํฉ๋๋ค" -#: builtin/fsck.c:664 +#: builtin/fsck.c:653 msgid "show verbose names for reachable objects" msgstr "์ ๊ทผํ ์ ์๋ ์ค๋ธ์ ํธ์ ์ด๋ฆ์ ์์ธํ ํ์ํฉ๋๋ค" -#: builtin/fsck.c:725 +#: builtin/fsck.c:714 msgid "Checking objects" msgstr "์ค๋ธ์ ํธ๋ฅผ ํ์ธํฉ๋๋ค" -#: builtin/gc.c:26 +#: builtin/gc.c:27 msgid "git gc [<options>]" msgstr "git gc [<์ต์
>]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Failed to fstat %s: %s" msgstr "'%s'์ fstat()ํ๋๋ฐ ์คํจํ์ต๋๋ค: %s" -#: builtin/gc.c:311 +#: builtin/gc.c:312 #, c-format msgid "Can't stat %s" msgstr "'%s'์ stat()ํ ์ ์์ต๋๋ค" -#: builtin/gc.c:320 +#: builtin/gc.c:321 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8370,43 +8487,43 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:359 +#: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "๋ ํผ๋ฐ์คํ์ง ์๋ ์ค๋ธ์ ํธ๋ฅผ ์๋ผ๋
๋๋ค" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "๋ ์์ธํ ๊ฒ์ฌํฉ๋๋ค (์คํ ์๊ฐ ๋์ด๋จ)" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "์๋ ๊ฐ๋น์ง์ปฌ๋ ํฐ ๋ชจ๋๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/gc.c:363 +#: builtin/gc.c:364 msgid "force running gc even if there may be another gc running" msgstr "์ด๋ฏธ ๊ฐ๋น์ง์ปฌ๋ ํฐ๊ฐ ์คํ ์ค์ด๋๋ผ๋ ๊ฐ์ ๋ก ๊ฐ๋น์ง์ปฌ๋ ํฐ๋ฅผ ์คํํฉ๋๋ค" -#: builtin/gc.c:380 +#: builtin/gc.c:381 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "gc.logexpiry ๊ฐ์ (%s) ํ์ฑํ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/gc.c:408 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "์ต์ ์ฑ๋ฅ์ ์ํด ๋ฐฑ๊ทธ๋ผ์ด๋์์ ์๋์ผ๋ก ์ ์ฅ์์ ๋ฌถ์์ ๋ง๋ญ๋๋ค.\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "์ต์ ์ฑ๋ฅ์ ์ํด ์๋์ผ๋ก ์ ์ฅ์์ ๋ฌถ์์ ๋ง๋ญ๋๋ค.\n" -#: builtin/gc.c:411 +#: builtin/gc.c:412 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "์๋ ๊ด๋ฆฌ ์์
์ \"git help gc\" ๋ด์ฉ์ ์ฐธ๊ณ ํ์ญ์์ค.\n" -#: builtin/gc.c:436 +#: builtin/gc.c:437 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8414,7 +8531,7 @@ msgstr "" "๊ฐ๋น์ง์ปฌ๋ ํฐ๊ฐ ์ด๋ฏธ '%s' ์ปดํจํฐ์์ %<PRIuMAX> PID๋ก ์คํ ์ค์
๋๋ค (์๋๋ฉด --" "force๋ฅผ ์ฌ์ฉํ์ญ์์ค)" -#: builtin/gc.c:480 +#: builtin/gc.c:481 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8424,12 +8541,12 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<์ต์
>] [-e] <ํจํด> [<๋ฆฌ๋น์ >...] [[--] <๊ฒฝ๋ก>...]" -#: builtin/grep.c:235 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: ์ค๋ ๋๋ฅผ ๋ง๋๋๋ฐ ์คํจํ์ต๋๋ค: %s" -#: builtin/grep.c:293 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "์๋ชป๋ ์ค๋ ๋ ์๋ฅผ %2$s์ ๋ํด ์ง์ ํ์ต๋๋ค (%1$d)" @@ -8438,250 +8555,242 @@ msgstr "์๋ชป๋ ์ค๋ ๋ ์๋ฅผ %2$s์ ๋ํด ์ง์ ํ์ต๋๋ค (%1$d)" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 #, c-format msgid "no threads support, ignoring %s" msgstr "์ค๋ ๋ ๊ธฐ๋ฅ์ด ์์ต๋๋ค. %s ๋ฌด์" -#: builtin/grep.c:788 builtin/grep.c:829 +#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 #, c-format msgid "unable to read tree (%s)" msgstr "ํธ๋ฆฌ๋ฅผ ์ฝ์ ์ ์์ต๋๋ค (%s)" -#: builtin/grep.c:848 +#: builtin/grep.c:628 #, c-format msgid "unable to grep from object of type %s" msgstr "์ข
๋ฅ๊ฐ %s์ธ ์ค๋ธ์ ํธ์์ grep์ ํ ์ ์์ต๋๋ค" -#: builtin/grep.c:912 +#: builtin/grep.c:694 #, c-format msgid "switch `%c' expects a numerical value" msgstr "`%c' ์ต์
์๋ ์ซ์ ๊ฐ์ด ์์ผ ํฉ๋๋ค" -#: builtin/grep.c:999 +#: builtin/grep.c:781 msgid "search in index instead of in the work tree" msgstr "์์
ํด๋ ๋์ ์ ์ธ๋ฑ์ค์์ ๊ฒ์ํฉ๋๋ค" -#: builtin/grep.c:1001 +#: builtin/grep.c:783 msgid "find in contents not managed by git" msgstr "๊น์ผ๋ก ๊ด๋ฆฌํ์ง ์์ ๋ด์ฉ์์ ์ฐพ์ต๋๋ค" -#: builtin/grep.c:1003 +#: builtin/grep.c:785 msgid "search in both tracked and untracked files" msgstr "์ถ์ ๋๋ ํ์ผ๊ณผ ์ถ์ ๋์ง ์๋ ํ์ผ ๋ชจ๋์์ ๊ฒ์ํฉ๋๋ค" -#: builtin/grep.c:1005 +#: builtin/grep.c:787 msgid "ignore files specified via '.gitignore'" msgstr "'.gitignore'๋ก ์ง์ ํ ํ์ผ์ ๋ฌด์ํฉ๋๋ค" -#: builtin/grep.c:1007 +#: builtin/grep.c:789 msgid "recursively search in each submodule" msgstr "๊ฐ ํ์ ๋ชจ๋์ ์ฌ๊ท์ ์ผ๋ก ๊ฒ์ํฉ๋๋ค" -#: builtin/grep.c:1009 -msgid "basename" -msgstr "๋ฒ ์ด์ค์ด๋ฆ" - -#: builtin/grep.c:1010 -msgid "prepend parent project's basename to output" -msgstr "ํ๋ก์ ํธ์ ๋ฒ ์ด์ค์ผ๋ฏ์ ์ถ๋ ฅ ์์ ๋ถ์
๋๋ค" - -#: builtin/grep.c:1013 +#: builtin/grep.c:792 msgid "show non-matching lines" msgstr "์ผ์นํ์ง ์๋ ์ค์ ํ์ํฉ๋๋ค" -#: builtin/grep.c:1015 +#: builtin/grep.c:794 msgid "case insensitive matching" msgstr "๋์๋ฌธ์ ๊ตฌ๋ณํ์ง ์๊ณ ๋น๊ตํฉ๋๋ค" -#: builtin/grep.c:1017 +#: builtin/grep.c:796 msgid "match patterns only at word boundaries" msgstr "๋จ์ด ๊ฒฝ๊ณ ๋ถ๋ถ์ ๋ํด์๋ง ํจํด์ ๋ง์ถฅ๋๋ค" -#: builtin/grep.c:1019 +#: builtin/grep.c:798 msgid "process binary files as text" msgstr "๋ฐ์ด๋๋ฆฌ ํ์ผ์ ํ
์คํธ๋ก ์ฒ๋ฆฌํฉ๋๋ค" -#: builtin/grep.c:1021 +#: builtin/grep.c:800 msgid "don't match patterns in binary files" msgstr "๋ฐ์ด๋๋ฆฌ ํ์ผ์์ ํจํด์ ๋ง์ถ์ง ์์ต๋๋ค" -#: builtin/grep.c:1024 +#: builtin/grep.c:803 msgid "process binary files with textconv filters" msgstr "textconv ํํฐ๋ฅผ ์ฌ์ฉํด ๋ฐ์ด๋๋ฆฌ ํ์ผ์ ์ฒ๋ฆฌํฉ๋๋ค" -#: builtin/grep.c:1026 +#: builtin/grep.c:805 msgid "descend at most <depth> levels" msgstr "์ต๋ <๊น์ด> ๋จ๊ณ๋งํผ ๋ด๋ ค๊ฐ๋๋ค" -#: builtin/grep.c:1030 +#: builtin/grep.c:809 msgid "use extended POSIX regular expressions" msgstr "POSIX ํ์ฅ ์ ๊ท์์ ์ฌ์ฉํฉ๋๋ค" -#: builtin/grep.c:1033 +#: builtin/grep.c:812 msgid "use basic POSIX regular expressions (default)" msgstr "๊ธฐ๋ณธ POSIX ์ ๊ท์์ ์ฌ์ฉํฉ๋๋ค (๊ธฐ๋ณธ๊ฐ)" -#: builtin/grep.c:1036 +#: builtin/grep.c:815 msgid "interpret patterns as fixed strings" msgstr "ํจํด์ ๊ณ ์ ๋ฌธ์์ด๋ก ํด์ํฉ๋๋ค" -#: builtin/grep.c:1039 +#: builtin/grep.c:818 msgid "use Perl-compatible regular expressions" msgstr "ํ๊ณผ ํธํ๋๋ ์ ๊ท์์ ์ฌ์ฉํฉ๋๋ค" -#: builtin/grep.c:1042 +#: builtin/grep.c:821 msgid "show line numbers" msgstr "์ค ๋ฒํธ๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/grep.c:1043 +#: builtin/grep.c:822 msgid "don't show filenames" msgstr "ํ์ผ ์ด๋ฆ์ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/grep.c:1044 +#: builtin/grep.c:823 msgid "show filenames" msgstr "ํ์ผ ์ด๋ฆ์ ํ์ํฉ๋๋ค" -#: builtin/grep.c:1046 +#: builtin/grep.c:825 msgid "show filenames relative to top directory" msgstr "ํ์ผ ์ด๋ฆ์ ์ต์์ ๋๋ ํฐ๋ฆฌ ์๋ ๊ฒฝ๋ก๋ก ํ์ํฉ๋๋ค" -#: builtin/grep.c:1048 +#: builtin/grep.c:827 msgid "show only filenames instead of matching lines" msgstr "์ผ์นํ๋ ์ค์ ํ์ํ์ง ์๊ณ ํ์ผ ์ด๋ฆ๋ง ํ์ํฉ๋๋ค" -#: builtin/grep.c:1050 +#: builtin/grep.c:829 msgid "synonym for --files-with-matches" msgstr "--files-with-matches ์ต์
๊ณผ ๋์ผ" -#: builtin/grep.c:1053 +#: builtin/grep.c:832 msgid "show only the names of files without match" msgstr "์ผ์นํ์ง ์๋ ํ์ผ์ ์ด๋ฆ๋ง ํ์ํฉ๋๋ค" -#: builtin/grep.c:1055 +#: builtin/grep.c:834 msgid "print NUL after filenames" msgstr "ํ์ผ ์ด๋ฆ ๋ค์์ NUL์ ์ถ๋ ฅํฉ๋๋ค" -#: builtin/grep.c:1057 +#: builtin/grep.c:836 msgid "show the number of matches instead of matching lines" msgstr "์ผ์นํ๋ ์ค์ ํ์ํ์ง ์๊ณ ์ผ์นํ๋ ์๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/grep.c:1058 +#: builtin/grep.c:837 msgid "highlight matches" msgstr "์ผ์นํ๋ ๋ถ๋ถ์ ๊ฐ์กฐํฉ๋๋ค" -#: builtin/grep.c:1060 +#: builtin/grep.c:839 msgid "print empty line between matches from different files" msgstr "๋ค๋ฅธ ํ์ผ ์ฌ์ด์ ์ผ์นํ๋ ๋ถ๋ถ์ ์ฌ์ด์ ๋น ์ค์ ์ถ๋ ฅํฉ๋๋ค" -#: builtin/grep.c:1062 +#: builtin/grep.c:841 msgid "show filename only once above matches from same file" msgstr "๊ฐ์ ํ์ผ์์ ์ฌ๋ฌ ๊ฐ๊ฐ ์ผ์นํ๋ฉด ํ์ผ ์ด๋ฆ์ ํ ๋ฒ๋ง ํ์ํฉ๋๋ค" -#: builtin/grep.c:1065 +#: builtin/grep.c:844 msgid "show <n> context lines before and after matches" msgstr "์ผ์นํ๋ ๋ถ๋ถ ์๋ค์ ์ปจํ
์คํธ๋ฅผ <n>์ค ํ์ํฉ๋๋ค" -#: builtin/grep.c:1068 +#: builtin/grep.c:847 msgid "show <n> context lines before matches" msgstr "์ผ์นํ๋ ๋ถ๋ถ ์์ ์ปจํ
์คํธ๋ฅผ <n>์ค ํ์ํฉ๋๋ค" -#: builtin/grep.c:1070 +#: builtin/grep.c:849 msgid "show <n> context lines after matches" msgstr "์ผ์นํ๋ ๋ถ๋ถ ๋ค์ ์ปจํ
์คํธ๋ฅผ <n>์ค ํ์ํฉ๋๋ค" -#: builtin/grep.c:1072 +#: builtin/grep.c:851 msgid "use <n> worker threads" msgstr "<n>๊ฐ์ ์์
์ค๋ ๋๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/grep.c:1073 +#: builtin/grep.c:852 msgid "shortcut for -C NUM" msgstr "-C NUM ์ต์
์ ์ค์" -#: builtin/grep.c:1076 +#: builtin/grep.c:855 msgid "show a line with the function name before matches" msgstr "์ผ์น ํญ๋ชฉ ์์ ํจ์ ์ด๋ฆ ์ค์ ํ์ํฉ๋๋ค" -#: builtin/grep.c:1078 +#: builtin/grep.c:857 msgid "show the surrounding function" msgstr "๋ค์ด ์๋ ํจ์๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/grep.c:1081 +#: builtin/grep.c:860 msgid "read patterns from file" msgstr "ํ์ผ์์ ํจํด์ ์ฝ์ต๋๋ค" -#: builtin/grep.c:1083 +#: builtin/grep.c:862 msgid "match <pattern>" msgstr "<ํจํด>๊ณผ ์ผ์น" -#: builtin/grep.c:1085 +#: builtin/grep.c:864 msgid "combine patterns specified with -e" msgstr "-e ์ต์
์ผ๋ก ์ง์ ํ ํจํด์ ๊ฒฐํฉํฉ๋๋ค" -#: builtin/grep.c:1097 +#: builtin/grep.c:876 msgid "indicate hit with exit status without output" msgstr "์ถ๋ ฅํ์ง ์๊ณ ์ผ์นํ๋ ํญ๋ชฉ์ exit() ์ํ ๋ฒํธ๋ก ๋ฆฌํดํฉ๋๋ค" -#: builtin/grep.c:1099 +#: builtin/grep.c:878 msgid "show only matches from files that match all patterns" msgstr "๋ชจ๋ ํจํด๊ณผ ์ผ์นํ๋ ํ์ผ์ ์ผ์นํ๋ ๋ถ๋ถ๋ง ํ์ํฉ๋๋ค" -#: builtin/grep.c:1101 +#: builtin/grep.c:880 msgid "show parse tree for grep expression" msgstr "grep ํํ์์ ๋ํ ํ์ฑ ํธ๋ฆฌ๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "pager" msgstr "ํ์ด์ " -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "show matching files in the pager" msgstr "์ผ์นํ๋ ํ์ผ์ ํ์ด์ ํ๋ก๊ทธ๋จ์์ ํ์ํฉ๋๋ค" -#: builtin/grep.c:1108 +#: builtin/grep.c:887 msgid "allow calling of grep(1) (ignored by this build)" msgstr "grep(1) ์คํ์ ํ์ฉํฉ๋๋ค (์ด ๋น๋์์๋ ๋ฌด์)" -#: builtin/grep.c:1172 +#: builtin/grep.c:950 msgid "no pattern given." msgstr "ํจํด์ ์ง์ ํ์ง ์์์ต๋๋ค." -#: builtin/grep.c:1204 +#: builtin/grep.c:982 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index ๋๋ --untracked ์ต์
์ ๋ฆฌ๋น์ ๊ณผ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค" -#: builtin/grep.c:1211 +#: builtin/grep.c:989 #, c-format msgid "unable to resolve revision: %s" msgstr "๋ฆฌ๋น์ ์ ์ฐพ์๋ผ ์ ์์ต๋๋ค: %s" -#: builtin/grep.c:1245 builtin/index-pack.c:1490 +#: builtin/grep.c:1023 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "์๋ชป๋ ์ค๋ ๋ ์๋ฅผ ์ง์ ํ์ต๋๋ค (%d)" -#: builtin/grep.c:1250 +#: builtin/grep.c:1028 msgid "no threads support, ignoring --threads" msgstr "์ค๋ ๋ ๊ธฐ๋ฅ์ด ์์ต๋๋ค. --threads ์ต์
๋ฌด์" -#: builtin/grep.c:1281 +#: builtin/grep.c:1052 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ์ต์
์ ์์
ํด๋์์๋ง ๋์ํฉ๋๋ค" -#: builtin/grep.c:1304 +#: builtin/grep.c:1075 msgid "option not supported with --recurse-submodules." msgstr "--recurse-submodules์ ๊ฐ์ด ์ง์ํ์ง ์๋ ์ต์
์
๋๋ค." -#: builtin/grep.c:1310 +#: builtin/grep.c:1081 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "--cached ๋๋ --untracked ์ต์
์ --no-index ์ต์
๊ณผ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค." -#: builtin/grep.c:1316 +#: builtin/grep.c:1087 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard ์ต์
์ ์ถ์ ๋๋ ๋ด์ฉ์ ๋ํด ์ธ ์ ์์ต๋๋ค." -#: builtin/grep.c:1324 +#: builtin/grep.c:1095 msgid "both --cached and trees are given." msgstr "--cached ์ต์
๊ณผ ํธ๋ฆฌ๋ฅผ ๋ชจ๋ ์ง์ ํ์ต๋๋ค." @@ -8772,12 +8881,12 @@ msgstr "emacsclient ๋ฒ์ ํ์ฑ์ ์คํจํ์ต๋๋ค." msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient '%d' ๋ฒ์ ์ ๋๋ฌด ๊ณผ๊ฑฐ (< 22) ๋ฒ์ ์
๋๋ค." -#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "์คํ ์คํจ: '%s'" -#: builtin/help.c:208 +#: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8786,7 +8895,7 @@ msgstr "" "'%s': ์ง์ํ์ง ์๋ ๋งจ ํ์ด์ง ๋ณด๊ธฐ ํ๋ก๊ทธ๋จ ๊ฒฝ๋ก.\n" "๋์ ์ 'man.<๋๊ตฌ>.cmd' ์ต์
์ ์ฌ์ฉํด ๋ณด์ญ์์ค." -#: builtin/help.c:220 +#: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8795,345 +8904,345 @@ msgstr "" "'%s': ์ง์ํ์ง ์๋ ๋งจ ํ์ด์ง ๋ณด๊ธฐ ํ๋ก๊ทธ๋จ ๋ช
๋ น.\n" "๋์ ์ 'man.<๋๊ตฌ>.path' ์ต์
์ ์ฌ์ฉํด ๋ณด์ญ์์ค." -#: builtin/help.c:337 +#: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': ์ ์ ์๋ ๋งจ ํ์ด์ง ๋ณด๊ธฐ ํ๋ก๊ทธ๋จ." -#: builtin/help.c:354 +#: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "์์ฒญ์ ์ฒ๋ฆฌํ ๋งจ ํ์ด์ง ๋ณด๊ธฐ ํ๋ก๊ทธ๋จ์ด ์์ต๋๋ค" -#: builtin/help.c:362 +#: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "์์ฒญ์ ์ฒ๋ฆฌํ ์ธํฌ ํ์ด์ง ๋ณด๊ธฐ ํ๋ก๊ทธ๋จ์ด ์์ต๋๋ค" -#: builtin/help.c:404 +#: builtin/help.c:407 msgid "Defining attributes per path" msgstr "๊ฒฝ๋ก๋ง๋ค ์์ฑ ์ ์ํ๊ธฐ" -#: builtin/help.c:405 +#: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" msgstr "๋งค์ผ๋งค์ผ ์ฌ์ฉํ๋ 20๊ฐ ๋ด์ธ์ ๊น ๋ช
๋ น" -#: builtin/help.c:406 +#: builtin/help.c:409 msgid "A Git glossary" msgstr "๊น ์ฉ์ด ์ฌ์ " -#: builtin/help.c:407 +#: builtin/help.c:410 msgid "Specifies intentionally untracked files to ignore" msgstr "์๋์ ์ผ๋ก ์ถ์ ํ์ง ์๋ ํ์ผ์ ๋ฌด์ํ๊ฒ ์ง์ ํ๊ธฐ" -#: builtin/help.c:408 +#: builtin/help.c:411 msgid "Defining submodule properties" msgstr "ํ์ ๋ชจ๋ ์์ฑ ์ ์ํ๊ธฐ" -#: builtin/help.c:409 +#: builtin/help.c:412 msgid "Specifying revisions and ranges for Git" msgstr "๊น์ ๋ฆฌ๋น์ ๋ฐ ๋ฒ์๋ฅผ ์ง์ ํ๊ธฐ" -#: builtin/help.c:410 +#: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "๊น ๋ฐ๋ผํ๊ธฐ ์๋ด์ (๋ฒ์ 1.5.1 ์ดํ)" -#: builtin/help.c:411 +#: builtin/help.c:414 msgid "An overview of recommended workflows with Git" msgstr "์ถ์ฒํ๋ ๊น ํ์ฉ ์์
์์์ ๊ฐ์" -#: builtin/help.c:423 +#: builtin/help.c:426 msgid "The common Git guides are:\n" msgstr "์์ฃผ ์ฌ์ฉํ๋ ๊น ์๋ด์๋ ๋ค์๊ณผ ๊ฐ์ต๋๋ค:\n" -#: builtin/help.c:441 +#: builtin/help.c:444 #, c-format -msgid "`git %s' is aliased to `%s'" -msgstr "`git %s' ๋ช
๋ น์ `%s' ๋ช
๋ น์ ๋จ์ถ์
๋๋ค" +msgid "'%s' is aliased to '%s'" +msgstr "'%s' ๋ช
๋ น์ '%s' ๋ช
๋ น์ ๋จ์ถ์
๋๋ค" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "์ฌ์ฉ๋ฒ: %s%s" -#: builtin/index-pack.c:155 +#: builtin/index-pack.c:156 #, c-format msgid "unable to open %s" msgstr "%s์(๋ฅผ) ์ด ์ ์์ต๋๋ค" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:206 #, c-format msgid "object type mismatch at %s" msgstr "์ค๋ธ์ ํธ ์ข
๋ฅ๊ฐ ๋ง์ง ์์ต๋๋ค (%s)" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:226 #, c-format msgid "did not receive expected object %s" msgstr "์์ํ %s ์ค๋ธ์ ํธ๋ฅผ ๋ฐ์ง ์์์ต๋๋ค" -#: builtin/index-pack.c:228 +#: builtin/index-pack.c:229 #, c-format msgid "object %s: expected type %s, found %s" msgstr "%s ์ค๋ธ์ ํธ: ์์ํ ์ข
๋ฅ %s, ์ค์ %s" -#: builtin/index-pack.c:270 +#: builtin/index-pack.c:271 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "%d ๋ฐ์ดํธ๋ฅผ ์ฑ์ธ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "early EOF" msgstr "๋๋ฌด ๋นจ๋ฆฌ ํ์ผ์ด ๋๋จ" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:282 msgid "read error on input" msgstr "์
๋ ฅ์ ์ฝ๊ธฐ ์ค๋ฅ" -#: builtin/index-pack.c:293 +#: builtin/index-pack.c:294 msgid "used more bytes than were available" msgstr "์๋ ๋ฐ์ดํธ๋ณด๋ค ๋ ๋ง์ด ์ฌ์ฉํฉ๋๋ค" -#: builtin/index-pack.c:300 +#: builtin/index-pack.c:301 msgid "pack too large for current definition of off_t" msgstr "ํ์ฌ ์ ์๋ off_t์ ๋นํด ๋ฌถ์์ด ๋๋ฌด ํฝ๋๋ค" -#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "๋ฌถ์ ํฌ๊ธฐ๊ฐ ์ต๋ ํ์ฉ ํฌ๊ธฐ๋ฅผ ๋์์ต๋๋ค" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:319 #, c-format msgid "unable to create '%s'" msgstr "'%s'์(๋ฅผ) ๋ง๋ค ์ ์์ต๋๋ค" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:325 #, c-format msgid "cannot open packfile '%s'" msgstr "'%s' ๋ฌถ์ ํ์ผ์ ์ด ์ ์์ต๋๋ค" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 msgid "pack signature mismatch" msgstr "๋ฌถ์ ์๋ช
์ด ๋ง์ง ์์ต๋๋ค" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "๋ฌถ์์ %<PRIu32> ๋ฒ์ ์ ์ง์ํ์ง ์์ต๋๋ค" -#: builtin/index-pack.c:358 +#: builtin/index-pack.c:359 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "๋ฌถ์์ %<PRIuMAX> ์คํ์
์ ์๋ชป๋ ์ค๋ธ์ ํธ๊ฐ ์์ต๋๋ค: %s" -#: builtin/index-pack.c:479 +#: builtin/index-pack.c:480 #, c-format msgid "inflate returned %d" msgstr "inflate๊ฐ %d๋ฒ์ ๋ฆฌํดํ์ต๋๋ค" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "offset value overflow for delta base object" msgstr "๋ธํ ๋ฒ ์ด์ค ์ค๋ธ์ ํธ์ ๋ํด ์คํ์
๊ฐ์ด ์ค๋ฒํ๋ก์ฐ" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 msgid "delta base offset is out of bound" msgstr "๋ธํ ๋ฒ ์ด์ค ์คํ์
์ด ๋ฒ์๋ฅผ ๋ฒ์ด๋ฌ์ต๋๋ค" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:545 #, c-format msgid "unknown object type %d" msgstr "์ ์ ์๋ ์ค๋ธ์ ํธ ์ข
๋ฅ %d๋ฒ" -#: builtin/index-pack.c:575 +#: builtin/index-pack.c:576 msgid "cannot pread pack file" msgstr "๋ฌถ์ ํ์ผ์ ๋ํด pread๋ฅผ ํ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 #, 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:603 +#: builtin/index-pack.c:604 msgid "serious inflate inconsistency" msgstr "์ฌ๊ฐํ inflate ๋ถ์กฐํ" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:816 builtin/index-pack.c:825 +#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:817 builtin/index-pack.c:826 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 ์ถฉ๋์ด %s์์ ๋ฐ๊ฒฌ๋์์ต๋๋ค!" -#: builtin/index-pack.c:751 builtin/pack-objects.c:167 -#: builtin/pack-objects.c:261 +#: builtin/index-pack.c:752 builtin/pack-objects.c:168 +#: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "%s์(๋ฅผ) ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:815 #, c-format msgid "cannot read existing object info %s" msgstr "๊ธฐ์กด %s ์ค๋ธ์ ํธ ์ ๋ณด๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object %s" msgstr "๊ธฐ์กด %s ์ค๋ธ์ ํธ๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:836 +#: builtin/index-pack.c:837 #, c-format msgid "invalid blob object %s" msgstr "์๋ชป๋ ๋ธ๋กญ ์ค๋ธ์ ํธ %s" -#: builtin/index-pack.c:851 +#: builtin/index-pack.c:852 #, c-format msgid "invalid %s" msgstr "์๋ชป๋ %s" -#: builtin/index-pack.c:854 +#: builtin/index-pack.c:855 msgid "Error in object" msgstr "์ค๋ธ์ ํธ์ ์ค๋ฅ" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:857 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s์ ๋ชจ๋ ํ์ ์ค๋ธ์ ํธ์ ์ ๊ทผํ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:928 builtin/index-pack.c:959 +#: builtin/index-pack.c:929 builtin/index-pack.c:960 msgid "failed to apply delta" msgstr "๋ธํ๋ฅผ ์ ์ฉํ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "์ค๋ธ์ ํธ๋ฅผ ๋ฐ๋ ์ค" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "์ค๋ธ์ ํธ ์ธ๋ฑ์ค๋ฅผ ๋ง๋๋ ์ค" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "๋ฌถ์์ด ์์๋์์ต๋๋ค (SHA1 ์ผ์นํ์ง ์์)" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "๋ฌถ์ ํ์ผ์ ๋ํด fstat()ํ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "๋ฌถ์์ ๋์ ์ฐ๋ ๊ธฐ ๋ฐ์ดํฐ๊ฐ ์์ต๋๋ค" -#: builtin/index-pack.c:1184 +#: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects()์์ ๊ทน์ฌํ ํผ๋" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "๋ธํ๋ฅผ ์์๋ด๋ ์ค" -#: builtin/index-pack.c:1218 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "์ค๋ ๋๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค: %s" -#: builtin/index-pack.c:1260 +#: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "๊ทน์ฌํ ํผ๋" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1267 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "๋ก์ปฌ ์ค๋ธ์ ํธ %d๊ฐ ๋ง์นจ" -#: builtin/index-pack.c:1278 +#: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "%s์ ๋ํด ์์์น ๋ชปํ ํ
์ผ ์ฒดํฌ์ฌ (๋์คํฌ ์์?)" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "๋ฌถ์์ ์์๋ด์ง ๋ชปํ ๋ธํ %d๊ฐ๊ฐ ์์ต๋๋ค" -#: builtin/index-pack.c:1306 +#: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "์ถ๊ฐํ ์ค๋ธ์ ํธ๋ฅผ deflateํ ์ ์์ต๋๋ค (%d)" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "%s ๋ก์ปฌ ์ค๋ธ์ ํธ๊ฐ ์์๋์์ต๋๋ค" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 msgid "error while closing pack file" msgstr "๋ฌถ์ ํ์ผ์ ๋ซ๋๋ฐ ์ค๋ฅ" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1421 #, c-format msgid "cannot write keep file '%s'" msgstr "'%s' ๋ณด์กด ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:1428 +#: builtin/index-pack.c:1429 #, c-format msgid "cannot close written keep file '%s'" msgstr "์ด '%s' ๋ณด์กด ํ์ผ์ ๋ซ์ง ๋ชปํ์ต๋๋ค" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1439 msgid "cannot store pack file" msgstr "๋ฌถ์ ํ์ผ์ ์ ์ฅํ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1447 msgid "cannot store index file" msgstr "์ธ๋ฑ์ค ํ์ผ์ ์ ์ฅํ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1485 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "์๋ชป๋ pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1552 +#: builtin/index-pack.c:1553 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "๊ธฐ์กด '%s' ๋ฌถ์ ํ์ผ์ ์ด ์ ์์ต๋๋ค" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1555 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "'%s'์ ๋ํ ๊ธฐ์กด ๋ฌถ์ idx ํ์ผ์ ์ด ์ ์์ต๋๋ค" -#: builtin/index-pack.c:1602 +#: builtin/index-pack.c:1603 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "๋ธํ ์๋: ์ค๋ธ์ ํธ %d๊ฐ" -#: builtin/index-pack.c:1609 +#: builtin/index-pack.c:1610 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "์ฒด์ธ ๊ธธ์ด = %d: ์ค๋ธ์ ํธ %lu๊ฐ" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1623 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "'%s' ๋ฌถ์ํ์ผ ์ด๋ฆ์ด '.pack'์ผ๋ก ๋๋์ง ์์ต๋๋ค" -#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 -#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 #, c-format msgid "bad %s" msgstr "์๋ชป๋ %s" -#: builtin/index-pack.c:1743 +#: builtin/index-pack.c:1744 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ์ต์
์ --stdin ์ต์
๊ณผ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค" -#: builtin/index-pack.c:1745 +#: builtin/index-pack.c:1746 msgid "--stdin requires a git repository" msgstr "--stdin ์ต์
์ ๊น ์ ์ฅ์๊ฐ ํ์ํฉ๋๋ค" -#: builtin/index-pack.c:1753 +#: builtin/index-pack.c:1754 msgid "--verify with no packfile name given" msgstr "--verify ์ต์
์ ๋ฌถ์ํ์ผ ์ด๋ฆ์ ์ง์ ํ์ง ์์์ต๋๋ค" @@ -9265,132 +9374,164 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ํ ํฐ>[(=|:)<" "๊ฐ>])...] [<ํ์ผ>...]" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "ํ์ผ์ ์ง์ ํธ์งํฉ๋๋ค" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "๋น ํธ๋ ์ผ๋ฌ๋ฅผ ์๋ผ๋
๋๋ค" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "์ ํธ๋ ์ผ๋ฌ๋ฅผ ๋์ ์์น" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "ํธ๋ ์ผ๋ฌ๊ฐ ์ด๋ฏธ ์์ ๋ ๋์" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "ํธ๋ ์ผ๋ฌ๊ฐ ์์ ๋ ๋์" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "ํธ๋ ์ผ๋ฌ๋ง ์ถ๋ ฅํฉ๋๋ค" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "์ค์ ๊ท์น์ ์ ์ฉํ์ง ์์ต๋๋ค" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "๊ณต๋ฐฑ์ผ๋ก ๊ณ์๋ ๊ฐ์ ์ฐ๊ฒฐํฉ๋๋ค" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "ํ์ฑ ์ต์
์ค์ " + +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "ํธ๋ ์ผ๋ฌ" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "์ถ๊ฐํ ํธ๋ ์ผ๋ฌ" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "--trailer ์ต์
๊ณผ --only-input ์ต์
์ ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" + +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "ํ์ผ ์ง์ ํธ์ง์ ์
๋ ฅ ํ์ผ์ ์ง์ ํ์ง ์์์ต๋๋ค" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<์ต์
>] [<๋ฆฌ๋น์ -๋ฒ์>] [[--] <๊ฒฝ๋ก>...]" -#: builtin/log.c:46 +#: builtin/log.c:47 msgid "git show [<options>] <object>..." msgstr "git show [<์ต์
>] <์ค๋ธ์ ํธ>..." -#: builtin/log.c:90 +#: builtin/log.c:91 #, c-format msgid "invalid --decorate option: %s" msgstr "์๋ชป๋ --decorate ์ต์
: %s" -#: builtin/log.c:147 +#: builtin/log.c:148 msgid "suppress diff output" msgstr "diff๋ฅผ ์ถ๋ ฅํ์ง ์์ต๋๋ค" -#: builtin/log.c:148 +#: builtin/log.c:149 msgid "show source" msgstr "์์ค๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/log.c:149 +#: builtin/log.c:150 msgid "Use mail map file" msgstr "๋ฉ์ผ ๋งต ํ์ผ์ ์ฌ์ฉํฉ๋๋ค" -#: builtin/log.c:150 +#: builtin/log.c:151 msgid "decorate options" msgstr "๊พธ๋ฏธ๊ธฐ ์ต์
" -#: builtin/log.c:153 +#: builtin/log.c:154 msgid "Process line range n,m in file, counting from 1" msgstr "ํ์ผ์์ n,m ๋ฒ์์ ์ค์ ์ฒ๋ฆฌํฉ๋๋ค (1๋ถํฐ ์์)" -#: builtin/log.c:249 +#: builtin/log.c:250 #, c-format msgid "Final output: %d %s\n" msgstr "์ต์ข
์ถ๋ ฅ: %d %s\n" -#: builtin/log.c:497 +#: builtin/log.c:501 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ์๋ชป๋ ํ์ผ" -#: builtin/log.c:512 builtin/log.c:606 +#: builtin/log.c:516 builtin/log.c:610 #, c-format msgid "Could not read object %s" msgstr "%s ์ค๋ธ์ ํธ๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/log.c:630 +#: builtin/log.c:634 #, c-format msgid "Unknown type: %d" msgstr "์ ์ ์๋ ์ข
๋ฅ: %d" -#: builtin/log.c:751 +#: builtin/log.c:755 msgid "format.headers without value" msgstr "format.headers ์ค์ ์ ๊ฐ์ด ์์" -#: builtin/log.c:852 +#: builtin/log.c:856 msgid "name of output directory is too long" msgstr "์ถ๋ ฅ ๋๋ ํฐ๋ฆฌ์ ์ด๋ฆ์ด ๋๋ฌด ๊น๋๋ค" -#: builtin/log.c:868 +#: builtin/log.c:872 #, c-format msgid "Cannot open patch file %s" msgstr "%s ํจ์น ํ์ผ์ ์ด ์ ์์ต๋๋ค" -#: builtin/log.c:885 +#: builtin/log.c:889 msgid "Need exactly one range." msgstr "์ ํํ ํ๋์ ๋ฒ์๊ฐ ํ์ํฉ๋๋ค." -#: builtin/log.c:895 +#: builtin/log.c:899 msgid "Not a range." msgstr "๋ฒ์๊ฐ ์๋๋๋ค." -#: builtin/log.c:1001 +#: builtin/log.c:1005 msgid "Cover letter needs email format" msgstr "์ปค๋ฒ๋ ํฐ๋ ์ ์๋ฉ์ผ ํ์์ด์ด์ผ ํฉ๋๋ค" -#: builtin/log.c:1081 +#: builtin/log.c:1085 #, c-format msgid "insane in-reply-to: %s" msgstr "์ ์ ๋๊ฐ in-reply-to ํค๋: %s" -#: builtin/log.c:1108 +#: builtin/log.c:1112 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<์ต์
>] [<์์์๊ฐ> | <๋ฆฌ๋น์ -๋ฒ์>]" -#: builtin/log.c:1158 +#: builtin/log.c:1162 msgid "Two output directories?" msgstr "์ถ๋ ฅ ๋๋ ํฐ๋ฆฌ๊ฐ ๋๊ฐ?" -#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 +#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 #, c-format msgid "Unknown commit %s" msgstr "์ ์ ์๋ ์ปค๋ฐ %s" -#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 +#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "'%s'์(๋ฅผ) ์ฌ๋ฐ๋ฅธ ๋ ํผ๋ฐ์ค๋ก ์์๋ด๋๋ฐ ์คํจํ์ต๋๋ค." -#: builtin/log.c:1280 +#: builtin/log.c:1284 msgid "Could not find exact merge base." msgstr "์ ํํ ๋ณํฉ ๊ธฐ์ค์ ์ ์ฐพ์ ์ ์์ต๋๋ค." -#: builtin/log.c:1284 +#: builtin/log.c:1288 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" @@ -9401,218 +9542,226 @@ msgstr "" "์๋๋ฉด ์ง์ '--base=<๊ธฐ์ค์ -์ปค๋ฐ-ID>' ์ต์
์ผ๋ก ๊ธฐ์ค์ ์ปค๋ฐ์ ์ง์ ํ \n" "์๋ ์์ต๋๋ค." -#: builtin/log.c:1304 +#: builtin/log.c:1308 msgid "Failed to find exact merge base" msgstr "์ ํํ ๋ณํฉ ๊ธฐ์ค์ ์ ์ฐพ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/log.c:1315 +#: builtin/log.c:1319 msgid "base commit should be the ancestor of revision list" msgstr "๊ธฐ์ค์ ์ปค๋ฐ์ ๋ฆฌ๋น์ ๋ชฉ๋ก์ ์์ ์ปค๋ฐ์ด์ด์ผ ํฉ๋๋ค" -#: builtin/log.c:1319 +#: builtin/log.c:1323 msgid "base commit shouldn't be in revision list" msgstr "๊ธฐ์ค์ ์ปค๋ฐ์ ๋ฆฌ๋น์ ๋ชฉ๋ก์ ๋ค์ด ์์ผ๋ฉด ์ ๋ฉ๋๋ค" -#: builtin/log.c:1368 +#: builtin/log.c:1372 msgid "cannot get patch id" msgstr "ํจ์น ID๋ฅผ ์์๋ผ ์ ์์ต๋๋ค" -#: builtin/log.c:1425 +#: builtin/log.c:1431 msgid "use [PATCH n/m] even with a single patch" msgstr "ํ๋์ ํจ์น์ ๋ํด์๋ [PATCh n/m]์ ๋ถ์
๋๋ค" -#: builtin/log.c:1428 +#: builtin/log.c:1434 msgid "use [PATCH] even with multiple patches" msgstr "์ฌ๋ฌ ๊ฐ ํจ์น์ ๋ํด์๋ [PATCH]๋ฅผ ๋ถ์
๋๋ค" -#: builtin/log.c:1432 +#: builtin/log.c:1438 msgid "print patches to standard out" msgstr "ํจ์น๋ฅผ ํ์ค ์ถ๋ ฅ์ผ๋ก ํ์ํฉ๋๋ค" -#: builtin/log.c:1434 +#: builtin/log.c:1440 msgid "generate a cover letter" msgstr "์ปค๋ฒ๋ ํฐ๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/log.c:1436 +#: builtin/log.c:1442 msgid "use simple number sequence for output file names" msgstr "์ถ๋ ฅ ํ์ผ ์ด๋ฆ์ ๊ฐ๋จํ ์ผ๋ จ ๋ฒํธ๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/log.c:1437 +#: builtin/log.c:1443 msgid "sfx" msgstr "ํ์ฅ์" -#: builtin/log.c:1438 +#: builtin/log.c:1444 msgid "use <sfx> instead of '.patch'" msgstr "'.patch' ๋์ <ํ์ฅ์>๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/log.c:1440 +#: builtin/log.c:1446 msgid "start numbering patches at <n> instead of 1" msgstr "ํจ์น ๋ฒํธ๋ฅผ 1 ๋์ <n>์์ ์์ํฉ๋๋ค" -#: builtin/log.c:1442 +#: builtin/log.c:1448 msgid "mark the series as Nth re-roll" msgstr "์๋ฆฌ์ฆ๋ฅผ N๋ฒ์งธ re-roll๋ก ํ์ํฉ๋๋ค" -#: builtin/log.c:1444 +#: builtin/log.c:1450 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "[PATCH] ๋์ [RFC PATCH]๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/log.c:1447 +#: builtin/log.c:1453 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[PATCH] ๋์ [<์ ๋์ด>]๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/log.c:1450 +#: builtin/log.c:1456 msgid "store resulting files in <dir>" msgstr "๊ฒฐ๊ณผ ํ์ผ์ <๋๋ ํฐ๋ฆฌ>์ ์ ์ฅํฉ๋๋ค" -#: builtin/log.c:1453 +#: builtin/log.c:1459 msgid "don't strip/add [PATCH]" msgstr "[PATCH]๋ฅผ ์๋ฅด๊ฑฐ๋ ์ถ๊ฐํ์ง ์์ต๋๋ค" -#: builtin/log.c:1456 +#: builtin/log.c:1462 msgid "don't output binary diffs" msgstr "๋ฐ์ด๋๋ฆฌ diff๋ฅผ ๋ง๋ค์ง ์์ต๋๋ค" -#: builtin/log.c:1458 +#: builtin/log.c:1464 msgid "output all-zero hash in From header" msgstr "From ํค๋์์ ๋ชจ๋ 0์ธ ํด์๋ฅผ ์ถ๋ ฅํฉ๋๋ค" -#: builtin/log.c:1460 +#: builtin/log.c:1466 msgid "don't include a patch matching a commit upstream" msgstr "์
์คํธ๋ฆผ์ ์๋ ํจ์น๋ฅผ ํฌํจํ์ง ์์ต๋๋ค" -#: builtin/log.c:1462 +#: builtin/log.c:1468 msgid "show patch format instead of default (patch + stat)" msgstr "๊ธฐ๋ณธ๊ฐ (ํจ์น + ํต๊ณ) ๋์ ํจ์น ํ์์ ํ์ํฉ๋๋ค" -#: builtin/log.c:1464 +#: builtin/log.c:1470 msgid "Messaging" msgstr "๋ฉ์์ง" -#: builtin/log.c:1465 +#: builtin/log.c:1471 msgid "header" msgstr "ํค๋" -#: builtin/log.c:1466 +#: builtin/log.c:1472 msgid "add email header" msgstr "์ ์๋ฉ์ผ ํค๋" -#: builtin/log.c:1467 builtin/log.c:1469 +#: builtin/log.c:1473 builtin/log.c:1475 msgid "email" msgstr "์ ์๋ฉ์ผ" -#: builtin/log.c:1467 +#: builtin/log.c:1473 msgid "add To: header" msgstr "To: ํค๋๋ฅผ ์ถ๊ฐํฉ๋๋ค" -#: builtin/log.c:1469 +#: builtin/log.c:1475 msgid "add Cc: header" msgstr "Cc: ํค๋๋ฅผ ์ถ๊ฐํฉ๋๋ค" -#: builtin/log.c:1471 +#: builtin/log.c:1477 msgid "ident" msgstr "์ ์" -#: builtin/log.c:1472 +#: builtin/log.c:1478 msgid "set From address to <ident> (or committer ident if absent)" msgstr "<์ ์>์์ From ์ฃผ์๋ฅผ ์ค์ ํฉ๋๋ค (์์ผ๋ฉด ์ปค๋ฏธํฐ ์ฃผ์ ์ ์ ์ฌ์ฉ)" -#: builtin/log.c:1474 +#: builtin/log.c:1480 msgid "message-id" msgstr "๋ฉ์์ง-ID" -#: builtin/log.c:1475 +#: builtin/log.c:1481 msgid "make first mail a reply to <message-id>" msgstr "์ฒซ ๋ฉ์ผ์ <๋ฉ์์ง-ID>์ ๋ํ ๋ต์ฅ ๋ฉ์ผ๋ก ๋ง๋ญ๋๋ค" -#: builtin/log.c:1476 builtin/log.c:1479 +#: builtin/log.c:1482 builtin/log.c:1485 msgid "boundary" msgstr "๊ฒฝ๊ณ" -#: builtin/log.c:1477 +#: builtin/log.c:1483 msgid "attach the patch" msgstr "ํจ์น๋ฅผ ์ฒจ๋ถํฉ๋๋ค" -#: builtin/log.c:1480 +#: builtin/log.c:1486 msgid "inline the patch" msgstr "ํจ์น๋ฅผ ๋ณธ๋ฌธ์ ํฌํจํฉ๋๋ค" -#: builtin/log.c:1484 +#: builtin/log.c:1490 msgid "enable message threading, styles: shallow, deep" msgstr "๋ฉ์์ง์ ์ค๋ ๋๋ฅผ ์ฌ์ฉ, ์คํ์ผ: shallow, deep" -#: builtin/log.c:1486 +#: builtin/log.c:1492 msgid "signature" msgstr "์๋ช
" -#: builtin/log.c:1487 +#: builtin/log.c:1493 msgid "add a signature" msgstr "์๋ช
์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/log.c:1488 +#: builtin/log.c:1494 msgid "base-commit" msgstr "๋ฒ ์ด์ค-์ปค๋ฐ" -#: builtin/log.c:1489 +#: builtin/log.c:1495 msgid "add prerequisite tree info to the patch series" msgstr "์ ์ ์กฐ๊ฑด ํธ๋ฆฌ ์ ๋ณด๋ฅผ ํจ์น ์๋ฆฌ์ฆ์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/log.c:1491 +#: builtin/log.c:1497 msgid "add a signature from a file" msgstr "ํ์ผ์์ ์๋ช
์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/log.c:1492 +#: builtin/log.c:1498 msgid "don't print the patch filenames" msgstr "ํจ์น ํ์ผ ์ด๋ฆ์ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/log.c:1567 +#: builtin/log.c:1500 +msgid "show progress while generating patches" +msgstr "ํจ์น๋ฅผ ๋ง๋๋ ๋์ ์งํ๋ฅ ์ ํ์ํฉ๋๋ค" + +#: builtin/log.c:1575 #, c-format msgid "invalid ident line: %s" msgstr "์๋ชป๋ ์ ์ ์ค: %s" -#: builtin/log.c:1582 +#: builtin/log.c:1590 msgid "-n and -k are mutually exclusive." msgstr "-n ๋ฐ -k ์ต์
์ ํ๋๋ง ์จ์ผ ํฉ๋๋ค." -#: builtin/log.c:1584 +#: builtin/log.c:1592 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc ๋ฐ -k ์ต์
์ ํ๋๋ง ์จ์ผ ํฉ๋๋ค." -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "--name-only does not make sense" msgstr "--name-only ์ต์
์ ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "--name-status does not make sense" msgstr "--name-status ์ต์
์ ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" -#: builtin/log.c:1596 +#: builtin/log.c:1604 msgid "--check does not make sense" msgstr "--check ์ต์
์ ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" -#: builtin/log.c:1626 +#: builtin/log.c:1634 msgid "standard output, or directory, which one?" msgstr "ํ์ค ์ถ๋ ฅ์ด๋ ๋๋ ํฐ๋ฆฌ ์ค์ ํ๋๋ง ์ง์ ํด์ผ ํฉ๋๋ค." -#: builtin/log.c:1628 +#: builtin/log.c:1636 #, c-format msgid "Could not create directory '%s'" msgstr "'%s' ๋๋ ํฐ๋ฆฌ๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: builtin/log.c:1722 +#: builtin/log.c:1729 #, c-format msgid "unable to read signature file '%s'" msgstr "'%s' ์๋ช
ํ์ผ์ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/log.c:1794 +#: builtin/log.c:1761 +msgid "Generating patches" +msgstr "ํจ์น ์์ฑ" + +#: builtin/log.c:1805 msgid "Failed to create output files" msgstr "์ถ๋ ฅ ํ์ผ์ ๋ง๋๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/log.c:1843 +#: builtin/log.c:1855 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<์
์คํธ๋ฆผ> [<ํค๋> [<ํ๊ณ๊ฐ>]]]" -#: builtin/log.c:1897 +#: builtin/log.c:1909 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9620,103 +9769,103 @@ msgstr "" "์ถ์ ๋๋ ๋ฆฌ๋ชจํธ ๋ธ๋์น๋ฅผ ์ฐพ์ ์ ์์ต๋๋ค. <์
์คํธ๋ฆผ>์ ์๋์ผ๋ก ์ง์ ํ์ญ์" "์ค.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:466 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<์ต์
>] [<ํ์ผ>...]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:515 msgid "identify the file status with tags" msgstr "ํ์ผ ์ํ๋ฅผ ํ๊ทธ์ ๊ฐ์ด ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:517 msgid "use lowercase letters for 'assume unchanged' files" msgstr "'๋ณ๊ฒฝ๋์ง ์์๋ค๊ณ ๊ฐ์ ' ํ์ผ์ ์๋ฌธ์๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:519 msgid "show cached files in the output (default)" msgstr "์ถ๋ ฅ์ ์บ์๋ ํ์ผ์ ํ์ํฉ๋๋ค (๊ธฐ๋ณธ๊ฐ)" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:521 msgid "show deleted files in the output" msgstr "์ถ๋ ฅ์ ์ญ์ ๋ ํ์ผ์ ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:523 msgid "show modified files in the output" msgstr "์ถ๋ ฅ์ ์์ ๋ ํ์ผ์ ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:525 msgid "show other files in the output" msgstr "์ถ๋ ฅ์ ๊ธฐํ ํ์ผ์ ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:527 msgid "show ignored files in the output" msgstr "์ถ๋ ฅ์ ๋ฌด์๋ ํ์ผ์ ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:530 msgid "show staged contents' object name in the output" msgstr "์ถ๋ ฅ์ ์ปค๋ฐ ํ์๋ ๋ด์ฉ์ ์ค๋ธ์ ํธ ์ด๋ฆ์ ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:532 msgid "show files on the filesystem that need to be removed" msgstr "ํ์ผ ์์คํ
์์ ์ ๊ฑฐํด์ผ ํ๋ ํ์ผ์ ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:534 msgid "show 'other' directories' names only" msgstr "๊ธฐํ ๋๋ ํฐ๋ฆฌ์ ์ด๋ฆ๋ง ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:536 msgid "show line endings of files" msgstr "ํ์ผ์ ์ค ๋์ ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:538 msgid "don't show empty directories" msgstr "๋น ๋๋ ํฐ๋ฆฌ ํ์ํ์ง ์๊ธฐ" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:541 msgid "show unmerged files in the output" msgstr "์ถ๋ ฅ์ ๋ณํฉํ์ง ์์ ํ์ผ์ ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:543 msgid "show resolve-undo information" msgstr "resolve-undo ์ ๋ณด๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:545 msgid "skip files matching pattern" msgstr "ํจํด์ ์ผ์นํ๋ ํ์ผ์ ๊ฑด๋๋๋๋ค" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:548 msgid "exclude patterns are read from <file>" msgstr "์ ์ธํ ํจํด์ <ํ์ผ>์์ ์ฝ์ต๋๋ค" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:551 msgid "read additional per-directory exclude patterns in <file>" msgstr "<ํ์ผ>์์ ์ถ๊ฐ์ ์ธ ๋๋ ํฐ๋ฆฌ๋ณ ์ ์ธ ํจํด์ ์ฝ์ต๋๋ค" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:553 msgid "add the standard git exclusions" msgstr "ํ์ค ๊น ์ ์ธ ํจํด์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:556 msgid "make the output relative to the project top directory" msgstr "์ต์์ ๋๋ ํฐ๋ฆฌ ์๋ ๊ฒฝ๋ก๋ก ์ถ๋ ฅํฉ๋๋ค" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:559 msgid "recurse through submodules" msgstr "ํ์ ๋ชจ๋์ ์ฌ๊ท์ ์ผ๋ก ์ ์ฉ" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:561 msgid "if any <file> is not in the index, treat this as an error" msgstr "<ํ์ผ>์ด ์ธ๋ฑ์ค ์์ ์์ผ๋ฉด ์ค๋ฅ๋ก ์ทจ๊ธํฉ๋๋ค" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:562 msgid "tree-ish" msgstr "ํธ๋ฆฌ-๋ฐ์" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:563 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "<ํธ๋ฆฌ-๋ฐ์> ๋ค๋ก ์ ๊ฑฐํ ๊ฒฝ๋ก๊ฐ ์๋ค๊ณ ๊ฐ์ ํฉ๋๋ค" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:565 msgid "show debugging data" msgstr "๋๋ฒ๊น
๋ฐ์ดํฐ๋ฅผ ํ์ํฉ๋๋ค" @@ -9807,177 +9956,181 @@ msgstr "์ ์ฒด ํธ๋ฆฌ ๋ชฉ๋ก ํ์, ํ์ฌ ๋๋ ํฐ๋ฆฌ๋ง ์๋๋ผ (--full-na msgid "empty mbox: '%s'" msgstr "๋น mbox: '%s'" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<์ต์
>] [<์ปค๋ฐ>...]" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:104 +#: builtin/merge.c:107 msgid "switch `m' requires a value" msgstr "`m' ์ต์
์๋ ๊ฐ์ด ํ์ํฉ๋๋ค" -#: builtin/merge.c:141 +#: builtin/merge.c:144 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "'%s' ๋ณํฉ ์ ๋ต์ ์ฐพ์ ์ ์์ต๋๋ค.\n" -#: builtin/merge.c:142 +#: builtin/merge.c:145 #, c-format msgid "Available strategies are:" msgstr "์ฌ์ฉ ๊ฐ๋ฅํ ์ ๋ต์:" -#: builtin/merge.c:147 +#: builtin/merge.c:150 #, c-format msgid "Available custom strategies are:" msgstr "์ฌ์ฉ ๊ฐ๋ฅํ ์ฌ์ฉ์ ์ค์ ์ ๋ต์:" -#: builtin/merge.c:197 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "๋ณํฉ์ด ๋๋ ๋ diffstat์ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/merge.c:200 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "๋ณํฉ์ด ๋๋ ๋ diffstat์ ํ์ํฉ๋๋ค" -#: builtin/merge.c:201 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(--stat ์ต์
๊ณผ ๋์ผ)" -#: builtin/merge.c:203 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "๋ณํฉ ์ปค๋ฐ์ ๋ฉ์์ง์ shortlog ํญ๋ชฉ์ (์ต๋ <n>๊ฐ) ์ถ๊ฐํฉ๋๋ค" -#: builtin/merge.c:206 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "๋ณํฉํ๋ ๋์ ํ๋์ ์ปค๋ฐ์ ๋ง๋ญ๋๋ค" -#: builtin/merge.c:208 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "๋ณํฉ์ด ์ฑ๊ณตํ๋ฉด ์ปค๋ฐ์ ํฉ๋๋ค (๊ธฐ๋ณธ๊ฐ)" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:152 msgid "edit message before committing" msgstr "์ปค๋ฐ ์ ์ ๋ฉ์์ง๋ฅผ ํธ์งํฉ๋๋ค" -#: builtin/merge.c:211 +#: builtin/merge.c:214 msgid "allow fast-forward (default)" msgstr "์ ๋ฐฉํฅ ์งํ์ ํ์ฉํฉ๋๋ค (๊ธฐ๋ณธ๊ฐ)" -#: builtin/merge.c:213 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "์ ๋ฐฉํฅ ์งํ์ด ๋ถ๊ฐ๋ฅํ๋ฉด ์ค์งํฉ๋๋ค" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "์ง์ ํ ์ปค๋ฐ์ ์ฌ๋ฐ๋ฅธ GPG ์๋ช
์ด ์๋์ง ๊ฒ์ฆํฉ๋๋ค" -#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 #: builtin/revert.c:109 msgid "strategy" msgstr "์ ๋ต" -#: builtin/merge.c:219 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:166 msgid "merge strategy to use" msgstr "์ฌ์ฉํ ๋ณํฉ ์ ๋ต" -#: builtin/merge.c:220 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:169 msgid "option=value" msgstr "์ต์
=๊ฐ" -#: builtin/merge.c:221 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "์ ํํ ๋ณํฉ ์ ๋ต์ ๋ํ ์ต์
" -#: builtin/merge.c:223 +#: builtin/merge.c:226 msgid "merge commit message (for a non-fast-forward merge)" msgstr "๋ณํฉ ์ปค๋ฐ ๋ฉ์์ง (์ ๋ฐฉํฅ์ด ์๋ ๋ณํฉ์ ๋ํด)" -#: builtin/merge.c:227 +#: builtin/merge.c:230 msgid "abort the current in-progress merge" msgstr "ํ์ฌ ์งํ ์ค์ธ ๋ณํฉ์ ์ค์งํฉ๋๋ค" -#: builtin/merge.c:229 +#: builtin/merge.c:232 msgid "continue the current in-progress merge" msgstr "ํ์ฌ ์งํ ์ค์ธ ๋ณํฉ์ ๊ณ์ํฉ๋๋ค" -#: builtin/merge.c:231 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "๊ด๊ณ ์๋ ์ปค๋ฐ ๋ด์ญ์ ๋ณํฉ์ ํ์ฉํฉ๋๋ค" -#: builtin/merge.c:259 +#: builtin/merge.c:240 +msgid "verify commit-msg hook" +msgstr "์ปค๋ฐ ๋ฉ์์ง ํํฌ๋ฅผ ๊ฒ์ฆํฉ๋๋ค" + +#: builtin/merge.c:265 msgid "could not run stash." msgstr "stash๋ฅผ ์คํํ ์ ์์ต๋๋ค." -#: builtin/merge.c:264 +#: builtin/merge.c:270 msgid "stash failed" msgstr "์คํ์ ์คํจ" -#: builtin/merge.c:269 +#: builtin/merge.c:275 #, c-format msgid "not a valid object: %s" msgstr "์ฌ๋ฐ๋ฅธ ์ค๋ธ์ ํธ๊ฐ ์๋๋๋ค: %s" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:297 builtin/merge.c:314 msgid "read-tree failed" msgstr "read-tree ์คํจ" -#: builtin/merge.c:335 +#: builtin/merge.c:344 msgid " (nothing to squash)" msgstr " (ํฉ์น ๋ด์ฉ์ด ์์ต๋๋ค)" -#: builtin/merge.c:346 +#: builtin/merge.c:355 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "์ปค๋ฐ ํฉ์น๊ธฐ -- HEAD๋ฅผ ์
๋ฐ์ดํธํ์ง ์์ต๋๋ค\n" -#: builtin/merge.c:396 +#: builtin/merge.c:405 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "๋ณํฉ ๋ฉ์์ง๊ฐ ์์ต๋๋ค -- HEAD๋ฅผ ์
๋ฐ์ดํธํ์ง ์์ต๋๋ค\n" -#: builtin/merge.c:447 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s'์ด(๊ฐ) ์ปค๋ฐ์ ๊ฐ๋ฆฌํค์ง ์์ต๋๋ค" -#: builtin/merge.c:537 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "์๋ชป๋ branch.%s.mergeoptions ๋ฌธ์์ด: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:666 msgid "Not handling anything other than two heads merge." msgstr "๋ ๊ฐ์ ํค๋ ๋ณํฉ ์ธ์๋ ์ฒ๋ฆฌํ์ง ์์ต๋๋ค." -#: builtin/merge.c:671 +#: builtin/merge.c:680 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive์ ๋ํด ์ ์ ์๋ ์ต์
: -X%s" -#: builtin/merge.c:686 +#: builtin/merge.c:695 #, c-format msgid "unable to write %s" msgstr "%s์ ์ธ ์ ์์ต๋๋ค" -#: builtin/merge.c:738 +#: builtin/merge.c:747 #, c-format msgid "Could not read from '%s'" msgstr "'%s'์์ ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/merge.c:747 +#: builtin/merge.c:756 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "๋ณํฉ์ ์ปค๋ฐํ์ง ์์ต๋๋ค. ๋ณํฉ์ ๋ง์น๋ ค๋ฉด 'git commit'์ ์ฌ์ฉํ์ญ์์ค.\n" -#: builtin/merge.c:753 +#: builtin/merge.c:762 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9993,68 +10146,68 @@ msgstr "" "'%c' ๋ฌธ์๋ก ์์ํ๋ ์ค์ ๋ฌด์๋๊ณ , ๋ฉ์์ง๊ฐ ๋น์ด ์์ผ๋ฉด ์ปค๋ฐ์\n" "์ค์งํฉ๋๋ค.\n" -#: builtin/merge.c:777 +#: builtin/merge.c:798 msgid "Empty commit message." msgstr "๋น ์ปค๋ฐ ๋ฉ์์ง." -#: builtin/merge.c:797 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "ํ๋ฅญํฉ๋๋ค.\n" -#: builtin/merge.c:850 +#: builtin/merge.c:871 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "์๋ ๋ณํฉ์ด ์คํจํ์ต๋๋ค. ์ถฉ๋์ ๋ฐ๋ก์ก๊ณ ๊ฒฐ๊ณผ๋ฌผ์ ์ปค๋ฐํ์ญ์์ค.\n" -#: builtin/merge.c:889 +#: builtin/merge.c:910 msgid "No current branch." msgstr "ํ์ฌ ๋ธ๋์น๊ฐ ์์ต๋๋ค." -#: builtin/merge.c:891 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "ํ์ฌ ๋ธ๋์น์ ๋ํ ๋ฆฌ๋ชจํธ๊ฐ ์์ต๋๋ค." -#: builtin/merge.c:893 +#: builtin/merge.c:914 msgid "No default upstream defined for the current branch." msgstr "ํ์ฌ ๋ธ๋์น์ ๋ํด ๊ธฐ๋ณธ ์
์คํธ๋ฆผ์ ์ง์ ํ์ง ์์์ต๋๋ค." -#: builtin/merge.c:898 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "๋ฆฌ๋ชจํธ %2$s์์ %1$s์ ๋ํ ๋ฆฌ๋ชจํธ ์ถ์ ๋ธ๋์น๊ฐ ์์ต๋๋ค" -#: builtin/merge.c:945 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "์๋ชป๋ ๊ฐ '%s', ํ๊ฒฝ '%s'" -#: builtin/merge.c:1046 +#: builtin/merge.c:1073 #, c-format msgid "not something we can merge in %s: %s" msgstr "%s ์์์ ๋ณํฉํ ์ ์๋ ํญ๋ชฉ์ด ์๋๋๋ค: %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1107 msgid "not something we can merge" msgstr "๋ณํฉํ ์ ์๋ ํญ๋ชฉ์ด ์๋๋๋ค" -#: builtin/merge.c:1145 +#: builtin/merge.c:1172 msgid "--abort expects no arguments" msgstr "--abort ์ต์
์ ์ธ์๋ฅผ ๋ฐ์ง ์์ต๋๋ค" -#: builtin/merge.c:1149 +#: builtin/merge.c:1176 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "์ค์งํ ๋ณํฉ ์์
์ด ์์ต๋๋ค. (MERGE_HEAD๊ฐ ์์)" -#: builtin/merge.c:1161 +#: builtin/merge.c:1188 msgid "--continue expects no arguments" msgstr "--continue ์ต์
์ ์ธ์๋ฅผ ๋ฐ์ง ์์ต๋๋ค" -#: builtin/merge.c:1165 +#: builtin/merge.c:1192 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "์งํ ์ค์ธ ๋ณํฉ ์์
์ด ์์ต๋๋ค. (MERGE_HEAD๊ฐ ์์)" -#: builtin/merge.c:1181 +#: builtin/merge.c:1208 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10062,7 +10215,7 @@ msgstr "" "๋ณํฉ์ ๋ง์น์ง ์์์ต๋๋ค. (MERGE_HEAD ์์)\n" "๋ณํฉํ๊ธฐ ์ ์ ๋ณ๊ฒฝ ์ฌํญ์ ์ปค๋ฐํ์ญ์์ค." -#: builtin/merge.c:1188 +#: builtin/merge.c:1215 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10070,112 +10223,112 @@ msgstr "" "์ปค๋ฐ ๋นผ์ค๊ธฐ๋ฅผ ๋ง์น์ง ์์์ต๋๋ค. (COMMIT_PICK_HEAD ์์)\n" "๋ณํฉํ๊ธฐ ์ ์ ๋ณ๊ฒฝ ์ฌํญ์ ์ปค๋ฐํ์ญ์์ค." -#: builtin/merge.c:1191 +#: builtin/merge.c:1218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "์ปค๋ฐ ๋นผ์ค๊ธฐ๋ฅผ ๋ง์น์ง ์์์ต๋๋ค. (CHERRY_PICK_HEAD ์์)" -#: builtin/merge.c:1200 +#: builtin/merge.c:1227 msgid "You cannot combine --squash with --no-ff." msgstr "--squash ์ต์
์ --no-ff ์ต์
๊ณผ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค." -#: builtin/merge.c:1208 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "์ปค๋ฐ์ ์ง์ ํ์ง ์์๊ณ merge.defaultToUpstream๋ฅผ ์ค์ ํ์ง ์์์ต๋๋ค." -#: builtin/merge.c:1225 +#: builtin/merge.c:1252 msgid "Squash commit into empty head not supported yet" msgstr "๋น ํค๋๋ก ์ปค๋ฐ์ ํฉ์น๊ธฐ๋ ์ง์ํ์ง ์์ต๋๋ค" -#: builtin/merge.c:1227 +#: builtin/merge.c:1254 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "์ ๋ฐฉํฅ์ด ์๋ ์ปค๋ฐ์ ๋น ํค๋์์๋ ์๋ค๊ฐ ๋ง์ง ์์ต๋๋ค" -#: builtin/merge.c:1232 +#: builtin/merge.c:1259 #, c-format msgid "%s - not something we can merge" msgstr "%s - ๋ณํฉํ ์ ์๋ ํญ๋ชฉ์ด ์๋๋๋ค" -#: builtin/merge.c:1234 +#: builtin/merge.c:1261 msgid "Can merge only exactly one commit into empty head" msgstr "๋น ํค๋์๋ ์ ํํ ํ๋์ ์ปค๋ฐ๋ง ๋ณํฉํ ์ ์์ต๋๋ค" -#: builtin/merge.c:1268 +#: builtin/merge.c:1295 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "%s ์ปค๋ฐ์ ์ ๋ขฐํ์ง ์๋ (์๋ช
์๊ฐ %s๋ผ๊ณ ํ๋) GPG ์๋ช
์ด ์์ต๋๋ค." -#: builtin/merge.c:1271 +#: builtin/merge.c:1298 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "%s ์ปค๋ฐ์ ์๋ชป๋ (์๋ช
์๊ฐ %s๋ผ๊ณ ํ๋) GPG ์๋ช
์ด ์์ต๋๋ค." -#: builtin/merge.c:1274 +#: builtin/merge.c:1301 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "%s ์ปค๋ฐ์ GPG ์๋ช
์ด ์์ต๋๋ค." -#: builtin/merge.c:1277 +#: builtin/merge.c:1304 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "%s ์ปค๋ฐ์ %s์ ์ฌ๋ฐ๋ฅธ GPG ์๋ช
์ด ์์ต๋๋ค\n" -#: builtin/merge.c:1339 +#: builtin/merge.c:1366 msgid "refusing to merge unrelated histories" msgstr "๊ด๊ณ ์๋ ์ปค๋ฐ ๋ด์ญ์ ๋ณํฉ์ ๊ฑฐ๋ถํฉ๋๋ค" -#: builtin/merge.c:1348 -msgid "Already up-to-date." +#: builtin/merge.c:1375 +msgid "Already up to date." msgstr "์ด๋ฏธ ์
๋ฐ์ดํธ ์ํ์
๋๋ค." -#: builtin/merge.c:1358 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "์
๋ฐ์ดํธ ์ค %s..%s\n" -#: builtin/merge.c:1399 +#: builtin/merge.c:1426 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "์์ฃผ ๊ฐ๋จํ ์ธ๋ฑ์ค ๋ด๋ถ ๋ณํฉ์ ์๋ํฉ๋๋ค...\n" -#: builtin/merge.c:1406 +#: builtin/merge.c:1433 #, c-format msgid "Nope.\n" msgstr "์๋.\n" -#: builtin/merge.c:1431 -msgid "Already up-to-date. Yeeah!" +#: builtin/merge.c:1458 +msgid "Already up to date. Yeeah!" msgstr "์ด๋ฏธ ์
๋ฐ์ดํธ ์ํ์
๋๋ค. ์ผํธ!" -#: builtin/merge.c:1437 +#: builtin/merge.c:1464 msgid "Not possible to fast-forward, aborting." msgstr "์ ๋ฐฉํฅ์ด ๋ถ๊ฐ๋ฅํ๋ฏ๋ก, ์ค์งํฉ๋๋ค." -#: builtin/merge.c:1460 builtin/merge.c:1539 +#: builtin/merge.c:1487 builtin/merge.c:1566 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "ํธ๋ฆฌ๋ฅผ ๋ณธ๋ ์์น๋ก ๋๋๋ฆฝ๋๋ค...\n" -#: builtin/merge.c:1464 +#: builtin/merge.c:1491 #, c-format msgid "Trying merge strategy %s...\n" msgstr "๋ณํฉ ์ ๋ต %s ์๋...\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1557 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "๋ณํฉ์ ์ฒ๋ฆฌํ ์ ๋ต์ด ์์ต๋๋ค.\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1559 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "์ ๋ต %s(์ผ)๋ก ๋ณํฉ์ด ์คํจํ์ต๋๋ค.\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1568 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "์๋ ํด๊ฒฐ์ ์ค๋น๋ฅผ ์ํด %s ์ ๋ต์ ์ฌ์ฉํฉ๋๋ค.\n" -#: builtin/merge.c:1553 +#: builtin/merge.c:1580 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "์๋ ๋ณํฉ์ด ์ ์งํ๋์์ต๋๋ค. ์์ฒญํ๋๋ก ์ปค๋ฐ ์ ์ ์ค์งํฉ๋๋ค\n" @@ -10315,7 +10468,7 @@ msgstr "git mv [<์ต์
>] <์๋ณธ>... <๋์>" msgid "Directory %s is in index and no submodule?" msgstr "%s ๋๋ ํฐ๋ฆฌ๊ฐ ์ธ๋ฑ์ค์ ์๊ณ ํ์ ๋ชจ๋์ด ์์ต๋๋ค?" -#: builtin/mv.c:85 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "๊ณ์ํ๋ ค๋ฉด .gitmodules์ ๋ณ๊ฒฝ ์ฌํญ์ ์คํ
์ด์ง์ ๋ฃ๊ฑฐ๋ ์คํ์ ํ์ญ์์ค" @@ -10332,68 +10485,68 @@ msgstr "๋์์ด ์ด๋ฏธ ์์ด๋ ๊ฐ์ ๋ก ์ฎ๊ธฐ๊ธฐ/์ด๋ฆ ๋ฐ๊พธ๊ธฐ๋ฅผ ํฉ๋ msgid "skip move/rename errors" msgstr "์ฎ๊ธฐ๊ธฐ/์ด๋ฆ ๋ฐ๊พธ๊ธฐ ์ค๋ฅ๋ฅผ ๊ฑด๋ ๋๋๋ค" -#: builtin/mv.c:168 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "๋์์ด ('%s') ๋๋ ํฐ๋ฆฌ๊ฐ ์๋๋๋ค" -#: builtin/mv.c:179 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "'%s'์(๋ฅผ) '%s'(์ผ)๋ก ์ด๋ฆ ๋ฐ๊พธ๊ธฐํฉ๋๋ค\n" -#: builtin/mv.c:183 +#: builtin/mv.c:182 msgid "bad source" msgstr "์๋ชป๋ ์๋ณธ" -#: builtin/mv.c:186 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "๋๋ ํฐ๋ฆฌ๋ฅผ ์๊ธฐ ์์ ์ผ๋ก ์ฎ๊ธธ ์ ์์ต๋๋ค" -#: builtin/mv.c:189 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "๋๋ ํฐ๋ฆฌ๋ฅผ ํ์ผ๋ก ์ฎ๊ธธ ์ ์์ต๋๋ค" -#: builtin/mv.c:198 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "์๋ณธ ๋๋ ํฐ๋ฆฌ๊ฐ ๋น์ด ์์ต๋๋ค" -#: builtin/mv.c:223 +#: builtin/mv.c:222 msgid "not under version control" msgstr "๋ฒ์ ์ปจํธ๋กค ์ค์ด ์๋๋๋ค" -#: builtin/mv.c:226 +#: builtin/mv.c:225 msgid "destination exists" msgstr "๋์์ด ์์ต๋๋ค" -#: builtin/mv.c:234 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "'%s' ๋ฎ์ด์ฐ๊ธฐ" -#: builtin/mv.c:237 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "๋ฎ์ด์ธ ์ ์์ต๋๋ค" -#: builtin/mv.c:240 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "๋์ผํ ๋์์ ๋ํด ์ฌ๋ฌ ๊ฐ ์๋ณธ" -#: builtin/mv.c:242 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "๋์ ๋๋ ํฐ๋ฆฌ๊ฐ ์์ต๋๋ค" -#: builtin/mv.c:249 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, ์๋ณธ=%s, ๋์=%s" -#: builtin/mv.c:270 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "์ด๋ฆ ๋ฐ๊พธ๊ธฐ, '%s'์์ '%s'(์ผ)๋ก\n" -#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 +#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "'%s'์ ์ด๋ฆ ๋ฐ๊พธ๊ธฐ๊ฐ ์คํจํ์ต๋๋ค" @@ -10584,19 +10737,19 @@ msgstr "๋
ธํธ ์ค๋ธ์ ํธ๋ฅผ ์ธ ์ ์์ต๋๋ค" msgid "the note contents have been left in %s" msgstr "๋
ธํธ ๋ด์ฉ์ %s์ ๋จ์ต๋๋ค" -#: builtin/notes.c:234 builtin/tag.c:517 +#: builtin/notes.c:234 builtin/tag.c:500 #, c-format msgid "cannot read '%s'" msgstr "'%s'์(๋ฅผ) ์ฝ์ ์ ์์ต๋๋ค" -#: builtin/notes.c:236 builtin/tag.c:520 +#: builtin/notes.c:236 builtin/tag.c:503 #, c-format msgid "could not open or read '%s'" msgstr "'%s'์(๋ฅผ) ์ด๊ฑฐ๋ ์ฝ์ ์ ์์ต๋๋ค" #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 -#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "'%s'์(๋ฅผ) ์ฌ๋ฐ๋ฅธ ๋ ํผ๋ฐ์ค๋ก ์์๋ด๋๋ฐ ์คํจํ์ต๋๋ค." @@ -10624,47 +10777,47 @@ msgstr "'%s'์์ '%s'(์ผ)๋ก ๋
ธํธ๋ฅผ ๋ณต์ฌํ๋๋ฐ ์คํจํ์ต๋๋ค" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:348 +#: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "%s์์ ๋
ธํธ๋ฅผ %s ํ๊ธฐ๋ฅผ ๊ฑฐ๋ถํฉ๋๋ค (refs/notes/ ๋ฐ์)" -#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 -#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 -#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "ํ๋ผ๋ฏธํฐ๊ฐ ๋๋ฌด ๋ง์ต๋๋ค" -#: builtin/notes.c:381 builtin/notes.c:667 +#: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "%s ์ค๋ธ์ ํธ์ ๋ํด ๋
ธํธ๊ฐ ์์ต๋๋ค." -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "๋ฌธ์์ด๋ก ๋
ธํธ ๋ด์ฉ" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "ํ์ผ ์์ ๋
ธํธ ๋ด์ฉ" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "์ง์ ํ ๋
ธํธ ์ค๋ธ์ ํธ๋ฅผ ์ฌ์ฌ์ฉํ๊ณ ํธ์งํฉ๋๋ค" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "์ง์ ํ ๋
ธํธ ์ค๋ธ์ ํธ๋ฅผ ์ฌ์ฌ์ฉํฉ๋๋ค" -#: builtin/notes.c:414 builtin/notes.c:577 +#: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "๋น ๋
ธํธ ์ ์ฅ์ ํ์ฉํฉ๋๋ค" -#: builtin/notes.c:415 builtin/notes.c:486 +#: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "๊ธฐ์กด ๋
ธํธ๋ฅผ ๋ฐ๊ฟ๋๋ค" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10673,29 +10826,29 @@ msgstr "" "๋
ธํธ๋ฅผ ์ถ๊ฐํ ์ ์์ต๋๋ค. %s ์ค๋ธ์ ํธ์ ๋ํ ๊ธฐ์กด ๋
ธํธ๊ฐ ์์ต๋๋ค. ๊ธฐ์กด ๋
ธํธ" "๋ฅผ ๋ฎ์ด์ฐ๋ ค๋ฉด '-f' ์ต์
์ ์ฌ์ฉํ์ญ์์ค" -#: builtin/notes.c:455 builtin/notes.c:534 +#: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "%s ์ค๋ธ์ ํธ์ ๋ํ ๊ธฐ์กด ๋
ธํธ๋ฅผ ๋ฎ์ด์๋๋ค\n" -#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "%s ์ค๋ธ์ ํธ์ ๋ํ ๋
ธํธ๋ฅผ ์ ๊ฑฐํฉ๋๋ค\n" -#: builtin/notes.c:487 +#: builtin/notes.c:488 msgid "read objects from stdin" msgstr "ํ์ค ์
๋ ฅ์์ ์ค๋ธ์ ํธ๋ฅผ ์ฝ์ต๋๋ค" -#: builtin/notes.c:489 +#: builtin/notes.c:490 msgid "load rewriting config for <command> (implies --stdin)" msgstr "<๋ช
๋ น>์ ๋ํ ๋ค์์ฐ๊ธฐ ์ค์ ์ ์ฝ์ด๋ค์
๋๋ค (--stdin ์ต์
ํฌํจ)" -#: builtin/notes.c:507 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "ํ๋ผ๋ฏธํฐ๊ฐ ๋๋ฌด ์ ์ต๋๋ค" -#: builtin/notes.c:528 +#: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10704,12 +10857,12 @@ msgstr "" "๋
ธํธ๋ฅผ ๋ณต์ฌํ ์ ์์ต๋๋ค. %s ์ค๋ธ์ ํธ์ ๋ํ ๊ธฐ์กด ๋
ธํธ๊ฐ ์์ต๋๋ค. ๊ธฐ์กด ๋
ธํธ" "๋ฅผ ๋ฎ์ด์ฐ๋ ค๋ฉด '-f' ์ต์
์ ์ฌ์ฉํ์ญ์์ค" -#: builtin/notes.c:540 +#: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "์๋ณธ %s ์ค๋ธ์ ํธ์ ๋ํ ๋
ธํธ๊ฐ ์์ต๋๋ค. ๋ณต์ฌํ ์ ์์ต๋๋ค." -#: builtin/notes.c:592 +#: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10718,52 +10871,52 @@ msgstr "" "-m/-F/-c/-C ์ต์
์ 'edit' ํ์ ๋ช
๋ น์ ๋ํด ์ฌ์ฉ์ ๊ถํ์ง ์์ต๋๋ค.\n" "๋์ ์ 'git notes add -f -m/-F/-c/-C' ๋ช
๋ น์ ์ฌ์ฉํ์ญ์์ค.\n" -#: builtin/notes.c:687 +#: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "NOTES_MERGE_PARTIAL ๋ ํผ๋ฐ์ค ์ญ์ ์ ์คํจํ์ต๋๋ค" -#: builtin/notes.c:689 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "NOTES_MERGE_REF ๋ ํผ๋ฐ์ค ์ญ์ ์ ์คํจํ์ต๋๋ค" -#: builtin/notes.c:691 +#: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "'git notes merge' ์์
ํธ๋ฆฌ ์ ๊ฑฐ์ ์คํจํ์ต๋๋ค" -#: builtin/notes.c:711 +#: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "NOTES_MERGE_PARTIAL ๋ ํผ๋ฐ์ค ์ฝ๊ธฐ์ ์คํจํ์ต๋๋ค" -#: builtin/notes.c:713 +#: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "NOTES_MERGE_PARTIAL์์ ์ปค๋ฐ์ ์ฐพ์ ์ ์์ต๋๋ค." -#: builtin/notes.c:715 +#: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "NOTES_MERGE_PARTIAL์์ ์ปค๋ฐ์ ํ์ฑํ ์ ์์ต๋๋ค." -#: builtin/notes.c:728 +#: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "NOTES_MERGE_REF ์์๋ด๊ธฐ์ ์คํจํ์ต๋๋ค" -#: builtin/notes.c:731 +#: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "๋
ธํธ ๋ณํฉ์ ๋ง์น๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/notes.c:757 +#: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "์ ์ ์๋ ๋
ธํธ ๋ณํฉ ์ ๋ต %s" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "General options" msgstr "์ผ๋ฐ ์ต์
" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "Merge options" msgstr "๋ณํฉ ์ต์
" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10771,46 +10924,46 @@ msgstr "" "์ฃผ์ด์ง ์ ๋ต์ ์ฌ์ฉํด ๋
ธํธ ์ถฉ๋์ ํด๊ฒฐํฉ๋๋ค (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "๋ณํฉํ์ง ์์ ๋
ธํธ ์ปค๋ฐ" -#: builtin/notes.c:781 +#: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "๋ณํฉํ์ง ์์ ๋
ธํธ๋ฅผ ์ปค๋ฐํด ๋
ธํธ ๋ณํฉ์ ๋ง์นฉ๋๋ค" -#: builtin/notes.c:783 +#: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "๋
ธํธ ๋ณํฉ ํด๊ฒฐ ์ค์ง" -#: builtin/notes.c:785 +#: builtin/notes.c:786 msgid "abort notes merge" msgstr "๋
ธํธ ๋ณํฉ์ ์ค์งํฉ๋๋ค" -#: builtin/notes.c:796 +#: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "--commit, --abort, -s/--strategy ์ต์
์ ์์ด ์ธ ์ ์์ต๋๋ค" -#: builtin/notes.c:801 +#: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "๋ณํฉํ ๋
ธํธ ๋ ํผ๋ฐ์ค๋ฅผ ์ง์ ํด์ผ ํฉ๋๋ค" -#: builtin/notes.c:825 +#: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "์ ์ ์๋ ์ ๋ต(-s/--strategy): %s" -#: builtin/notes.c:862 +#: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "%s ์์น๋ก ๋
ธํธ ๋ณํฉ์ด ์ด๋ฏธ %s์์ ์งํ์ค์
๋๋ค" -#: builtin/notes.c:865 +#: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "ํ์ฌ ๋
ธํธ ๋ ํผ๋ฐ์ค์ (%s) ๋งํฌ๋ฅผ ์ ์ฅํ๋๋ฐ ์คํจํ์ต๋๋ค." -#: builtin/notes.c:867 +#: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10821,223 +10974,223 @@ msgstr "" "merge --commit' ๋ช
๋ น์ผ๋ก ์ปค๋ฐํ์ญ์์ค. ๋๋ 'git notes merge --abort' ๋ช
๋ น์ผ" "๋ก ๋ณํฉ์ ์ค์งํ์ญ์์ค.\n" -#: builtin/notes.c:889 +#: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "%s ์ค๋ธ์ ํธ์ ๋
ธํธ๊ฐ ์์ต๋๋ค\n" -#: builtin/notes.c:901 +#: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "์๋ ๋
ธํธ๋ฅผ ์ ๊ฑฐํ๋ ค๋ ์๋๋ฅผ ์ค๋ฅ๊ฐ ์๋ ๊ฒ์ผ๋ก ์ทจ๊ธํฉ๋๋ค" -#: builtin/notes.c:904 +#: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "ํ์ค ์
๋ ฅ์์ ์ค๋ธ์ ํธ ์ด๋ฆ์ ์ฝ์ต๋๋ค" -#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "์ ๊ฑฐํ์ง ์๊ณ , ๋ณด์ฌ์ฃผ๊ธฐ๋ง ํฉ๋๋ค" -#: builtin/notes.c:943 +#: builtin/notes.c:944 msgid "report pruned notes" msgstr "์๋ผ๋ธ ๋
ธํธ๋ฅผ ์๋ฆฝ๋๋ค" -#: builtin/notes.c:985 +#: builtin/notes.c:986 msgid "notes-ref" msgstr "๋
ธํธ-๋ ํผ๋ฐ์ค" -#: builtin/notes.c:986 +#: builtin/notes.c:987 msgid "use notes from <notes-ref>" msgstr "<๋
ธํธ-๋ ํผ๋ฐ์ค>์์ ๋
ธํธ๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/notes.c:1021 +#: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "์ ์ ์๋ ํ์ ๋ช
๋ น: %s" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<์ต์
>...] [< <๋ ํผ๋ฐ์ค๋ชฉ๋ก> | < <์ค๋ธ์ ํธ๋ชฉ๋ก>]" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:32 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<์ต์
>...] <๋ฒ ์ด์ค์ด๋ฆ> [< <๋ ํผ๋ฐ์ค๋ชฉ๋ก> | < <์ค๋ธ์ ํธ๋ชฉ๋ก" ">]" -#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 +#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 #, c-format msgid "deflate error (%d)" msgstr "deflate ์ค๋ฅ (%d)" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "๋ฐฐํธ๋งต ์ฐ๊ธฐ๋ฅผ ํ์ง ์์ต๋๋ค. ๋ฌถ์์ pack.packSizeLimit ๊ฐ์ ๋ฐ๋ผ ์ชผ๊ฐ์ง๋๋ค" -#: builtin/pack-objects.c:789 +#: builtin/pack-objects.c:790 msgid "Writing objects" msgstr "์ค๋ธ์ ํธ ์ฐ๋ ์ค" -#: builtin/pack-objects.c:1069 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "๋ฌถ์์ ๋ค์ด์์ง ์์ ์ค๋ธ์ ํธ๊ฐ ์์ผ๋ฏ๋ก, ๋นํธ๋งต ์ฐ๊ธฐ๋ฅผ ํ์ง ์์ต๋๋ค" -#: builtin/pack-objects.c:2434 +#: builtin/pack-objects.c:2440 msgid "Compressing objects" msgstr "์ค๋ธ์ ํธ ์์ถํ๋ ์ค" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2849 #, c-format msgid "unsupported index version %s" msgstr "์ง์ํ์ง ์๋ ์ธ๋ฑ์ค ๋ฒ์ %s" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2853 #, c-format msgid "bad index version '%s'" msgstr "์๋ชป๋ ์ธ๋ฑ์ค ๋ฒ์ '%s'" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2883 msgid "do not show progress meter" msgstr "์งํ๋ฅ ์ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2885 msgid "show progress meter" msgstr "์งํ๋ฅ ์ ํ์ํฉ๋๋ค" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2887 msgid "show progress meter during object writing phase" msgstr "์ค๋ธ์ ํธ ์ฐ๊ธฐ ๋จ๊ณ์์ ์งํ๋ฅ ์ ํ์ํฉ๋๋ค" -#: builtin/pack-objects.c:2884 +#: builtin/pack-objects.c:2890 msgid "similar to --all-progress when progress meter is shown" msgstr "์งํ๋ฅ ์ด ํ์๋ ๋ --all-progress์ ๋น์ทํฉ๋๋ค" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2891 msgid "version[,offset]" msgstr "๋ฒ์ [,์คํ์
]" -#: builtin/pack-objects.c:2886 +#: builtin/pack-objects.c:2892 msgid "write the pack index file in the specified idx format version" msgstr "์ง์ ํ ๋ฒ์ ์ ์ธ๋ฑ์ค ํ์์ ๋ฐ๋ผ ๋ฌถ์ ์ธ๋ฑ์ค ํ์ผ์ ์๋๋ค" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2895 msgid "maximum size of each output pack file" msgstr "์ถ๋ ฅ ๋ฌถ์ ํ์ผ์ ์ต๋ ํฌ๊ธฐ" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2897 msgid "ignore borrowed objects from alternate object store" msgstr "๋ณด์กฐ ์ค๋ธ์ ํธ ์ ์ฅ์์์ ๋น๋ ค์จ ์ค๋ธ์ ํธ๋ฅผ ๋ฌด์ํฉ๋๋ค" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2899 msgid "ignore packed objects" msgstr "๋ฌถ์ ์ค๋ธ์ ํธ๋ฅผ ๋ฌด์ํฉ๋๋ค" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2901 msgid "limit pack window by objects" msgstr "๋ฌถ์ ์๋์ฐ๋ฅผ ์ค๋ธ์ ํธ ๋จ์๋ก ์ ํํฉ๋๋ค" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2903 msgid "limit pack window by memory in addition to object limit" msgstr "๋ฌถ์ ์๋์ฐ๋ฅผ ์ค๋ธ์ ํธ ๋จ์์ ์ถ๊ฐ๋ก ๋ฉ๋ชจ๋ฆฌ ๋จ์๋ก ์ ํํฉ๋๋ค" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2905 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "๊ฒฐ๊ณผ๋ฌผ ๋ฌถ์์์ ํ์ฉ๋๋ ์ต๋ ๊ธธ์ด์ ๋ธํ ์ฒด์ธ" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2907 msgid "reuse existing deltas" msgstr "๊ธฐ์กด ๋ธํ๋ฅผ ์ฌ์ฌ์ฉํฉ๋๋ค" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2909 msgid "reuse existing objects" msgstr "๊ธฐ์กด ์ค๋ธ์ ํธ๋ฅผ ์ฌ์ฌ์ฉํฉ๋๋ค" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2911 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA ์ค๋ธ์ ํธ๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2913 msgid "use threads when searching for best delta matches" msgstr "์ต์์ ๋ธํ ์ผ์น๋ฅผ ๊ฒ์ํ๋๋ฐ ์ค๋ ๋๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2915 msgid "do not create an empty pack output" msgstr "๋น ๋ฌถ์ ์ถ๋ ฅ์ ๋ง๋ค์ง ์์ต๋๋ค" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2917 msgid "read revision arguments from standard input" msgstr "ํ์ค ์
๋ ฅ์์ ๋ฆฌ๋น์ ์ธ์๋ฅผ ์ฝ์ต๋๋ค" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2919 msgid "limit the objects to those that are not yet packed" msgstr "๋ฌถ์ง ์๋ ์ค๋ธ์ ํธ ์๋ฅผ ์ ํํฉ๋๋ค" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:2922 msgid "include objects reachable from any reference" msgstr "๋ชจ๋ ๋ ํผ๋ฐ์ค์์ ์ ๊ทผ ๊ฐ๋ฅํ ์ค๋ธ์ ํธ๋ฅผ ํฌํจํฉ๋๋ค" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2925 msgid "include objects referred by reflog entries" msgstr "reflog ํญ๋ชฉ์์ ๋ ํผ๋ฐ์คํ ์ ์๋ ์ค๋ธ์ ํธ๋ฅผ ํฌํจํฉ๋๋ค" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2928 msgid "include objects referred to by the index" msgstr "์ธ๋ฑ์ค์์< ๋ ํผ๋ฐ์คํ๋ ์ค๋ธ์ ํธ๋ฅผ ํฌํจํฉ๋๋ค" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2931 msgid "output pack to stdout" msgstr "๋ฌถ์์ ํ์ค ์ถ๋ ฅ์ผ๋ก ์ถ๋ ฅํฉ๋๋ค" -#: builtin/pack-objects.c:2927 +#: builtin/pack-objects.c:2933 msgid "include tag objects that refer to objects to be packed" msgstr "๋ฌถ์์ ๋ค์ด๊ฐ ์ค๋ธ์ ํธ๋ฅผ ๋ ํผ๋ฐ์คํ๋ ํ๊ทธ ์ค๋ธ์ ํธ๋ฅผ ํฌํจํฉ๋๋ค" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2935 msgid "keep unreachable objects" msgstr "์ ๊ทผ ๋ถ๊ฐ๋ฅ ์ค๋ธ์ ํธ๋ฅผ ๋ณด์กดํฉ๋๋ค" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2937 msgid "pack loose unreachable objects" msgstr "๋์จํ ์ ๊ทผ ๋ถ๊ฐ๋ฅ ์ค๋ธ์ ํธ๋ฅผ ๋ฌถ์ต๋๋ค" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2939 msgid "unpack unreachable objects newer than <time>" msgstr "<์๊ฐ>๋ณด๋ค ์๋ก์ด ์ ๊ทผ ๋ถ๊ฐ๋ฅ ์ค๋ธ์ ํธ์ ๋ฌถ์์ ํ๋๋ค" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2942 msgid "create thin packs" msgstr "์์ ๋ฌถ์์ ๋ง๋ญ๋๋ค" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:2944 msgid "create packs suitable for shallow fetches" msgstr "์์ ๊ฐ์ ธ์ค๊ธฐ์ ์ ํฉํ ๋ฌถ์์ ๋ง๋ญ๋๋ค" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:2946 msgid "ignore packs that have companion .keep file" msgstr "ํด๋นํ๋ .keep ํ์ผ์ด ์๋ ๋ฌถ์์ ๋ฌด์ํฉ๋๋ค" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2948 msgid "pack compression level" msgstr "๋ฌถ์ ์์ถ ๋จ๊ณ" # FIXME: graft? -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2950 msgid "do not hide commits by grafts" msgstr "๋ถ์ด ์๋ ์ปค๋ฐ์ ์จ๊ธฐ์ง ์์ต๋๋ค" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2952 msgid "use a bitmap index if available to speed up counting objects" msgstr "๊ฐ๋ฅํ๋ฉด ๋นํธ๋งต ์ธ๋ฑ์ค๋ฅผ ์ฌ์ฉํด ์ค๋ธ์ ํธ ์ธ๊ธฐ ์๋๋ฅผ ๋์
๋๋ค" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2954 msgid "write a bitmap index together with the pack index" msgstr "๋ฌถ์ ์ธ๋ฑ์ค์ ๊ฐ์ด ๋นํธ๋งต ์ธ๋ฑ์ค๋ฅผ ์๋๋ค" -#: builtin/pack-objects.c:3075 +#: builtin/pack-objects.c:3081 msgid "Counting objects" msgstr "์ค๋ธ์ ํธ ๊ฐ์ ์ธ๋ ์ค" @@ -11053,11 +11206,11 @@ msgstr "๋ชจ๋ ๋ฌถ์ต๋๋ค" msgid "prune loose refs (default)" msgstr "๋์จํ ๋ ํผ๋ฐ์ค๋ฅผ ์๋ผ๋
๋๋ค (๊ธฐ๋ณธ๊ฐ)" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:8 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:40 +#: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "์ค๋ณต๋ ์ค๋ธ์ ํธ ์ ๊ฑฐ" @@ -11098,7 +11251,7 @@ msgstr "๋ณํฉ ๊ด๋ จ ์ต์
" msgid "incorporate changes by rebasing rather than merging" msgstr "๋ณ๊ฒฝ ์ฌํญ์ ์ ์ฉํ ๋ ๋ณํฉํ๋ ๋์ ๋ฆฌ๋ฒ ์ด์คํฉ๋๋ค" -#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 +#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 msgid "allow fast-forward" msgstr "์ ๋ฐฉํฅ ์งํ์ ํ์ฉํฉ๋๋ค" @@ -11119,18 +11272,18 @@ msgstr "๋ณ๋ ฌ์ ์ผ๋ก ํ์ ์คํํ ํ์๋ชจ๋ ๊ฐ์" msgid "Invalid value for pull.ff: %s" msgstr "pull.ff์ ๋ํด ์๋ชป๋ ๊ฐ: %s" -#: builtin/pull.c:399 +#: builtin/pull.c:403 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "๊ฐ์ ธ์จ ๋ ํผ๋ฐ์ค ์ค์ ๋ฆฌ๋ฒ ์ด์คํ ๋์ ํ๋ณด๊ฐ ์์ต๋๋ค." -#: builtin/pull.c:401 +#: builtin/pull.c:405 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "๊ฐ์ ธ์จ ๋ ํผ๋ฐ์ค ์ค์ ๋ณํฉํ ๋์ ํ๋ณด๊ฐ ์์ต๋๋ค." -#: builtin/pull.c:402 +#: builtin/pull.c:406 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11138,7 +11291,7 @@ msgstr "" "๋ณดํต ์ด๋ฐ ๊ฒฝ์ฐ๋ ๋ฆฌ๋ชจํธ ์ชฝ์๋ ์๋ ์์ผ๋์นด๋ ๋ ํผ๋ฐ์ค๋ช
์ธ๊ฐ\n" "์ฃผ์ด์ก์ ๋ ์ผ์ด๋ฉ๋๋ค." -#: builtin/pull.c:405 +#: builtin/pull.c:409 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11149,42 +11302,42 @@ msgstr "" "์ด ๋ฆฌ๋ชจํธ๋ ํ์ฌ ๋ธ๋์น์ ๋ํด ๊ธฐ๋ณธ์ผ๋ก ์ค์ ๋ ๋ฆฌ๋ชจํธ๊ฐ\n" "์๋๊ธฐ ๋๋ฌธ์, ๋ช
๋ นํ์์ ๋ธ๋์น๋ฅผ ์ง์ ํด์ผ ํฉ๋๋ค." -#: builtin/pull.c:410 git-parse-remote.sh:73 +#: builtin/pull.c:414 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "ํ์ฌ ์ด๋ค ๋ธ๋์น ์์๋ ์์ง ์์ต๋๋ค." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 +#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "์ด๋ค ๋ธ๋์น๋ฅผ ๋์์ผ๋ก ๋ฆฌ๋ฒ ์ด์คํ ์ง ์ง์ ํ์ญ์์ค." -#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 +#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "์ด๋ค ๋ธ๋์น๋ฅผ ๋์์ผ๋ก ๋ณํฉํ ์ง ์ง์ ํ์ญ์์ค." -#: builtin/pull.c:415 builtin/pull.c:430 +#: builtin/pull.c:419 builtin/pull.c:434 msgid "See git-pull(1) for details." msgstr "์์ธํ ์ ๋ณด๋ git-pull(1) ํ์ด์ง๋ฅผ ์ฐธ๊ณ ํ์ญ์์ค." -#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 +#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<๋ฆฌ๋ชจํธ>" -#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 +#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<๋ธ๋์น>" -#: builtin/pull.c:425 git-parse-remote.sh:75 +#: builtin/pull.c:429 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "ํ์ฌ ๋ธ๋์น์ ์ถ์ ์ ๋ณด๊ฐ ์์ต๋๋ค." -#: builtin/pull.c:434 git-parse-remote.sh:95 +#: builtin/pull.c:438 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:439 +#: builtin/pull.c:443 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11193,27 +11346,27 @@ msgstr "" "์ค์ ์์ ๋ฆฌ๋ชจํธ์ '%s' ๋ ํผ๋ฐ์ค์ ๋ณํฉํ๋๋ก ์ง์ ํ์ง๋ง,\n" "๊ทธ๋ฐ ๋ ํผ๋ฐ์ค๋ฅผ ๊ฐ์ ธ์ค์ง ์์์ต๋๋ค." -#: builtin/pull.c:792 +#: builtin/pull.c:796 msgid "ignoring --verify-signatures for rebase" msgstr "๋ฆฌ๋ฒ ์ด์ค์ ๋ํด --verify-signatures ์ต์
์ ๋ฌด์ํฉ๋๋ค" -#: builtin/pull.c:840 +#: builtin/pull.c:844 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash ์ต์
์ --rebase ์ต์
๊ณผ ๊ฐ์ด ์จ์ผ ํฉ๋๋ค." -#: builtin/pull.c:848 +#: builtin/pull.c:852 msgid "Updating an unborn branch with changes added to the index." msgstr "๋ง๋ค์ด์ง์ง ์์ ๋ธ๋์น๋ฅผ ์ธ๋ฑ์ค์ ์ถ๊ฐ๋ ๋ณ๊ฒฝ ์ฌํญ์ผ๋ก ์
๋ฐ์ดํธํฉ๋๋ค." -#: builtin/pull.c:851 +#: builtin/pull.c:855 msgid "pull with rebase" msgstr "๋ฆฌ๋ฒ ์ด์ค๋ก ํํ๊ธฐ" -#: builtin/pull.c:852 +#: builtin/pull.c:856 msgid "please commit or stash them." msgstr "์ปค๋ฐํ๊ฑฐ๋ ์คํ์์ ๋ฃ์ผ์ญ์์ค." -#: builtin/pull.c:877 +#: builtin/pull.c:881 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11224,7 +11377,7 @@ msgstr "" "์์
ํด๋๋ฅผ %s ์ปค๋ฐ์์ ์ ๋ฐฉํฅ\n" "์งํํฉ๋๋ค." -#: builtin/pull.c:882 +#: builtin/pull.c:886 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11241,15 +11394,15 @@ msgstr "" "$ git reset --hard\n" "๋ณต๊ตฌ๋ฉ๋๋ค." -#: builtin/pull.c:897 +#: builtin/pull.c:901 msgid "Cannot merge multiple branches into empty head." msgstr "์ฌ๋ฌ ๋ธ๋์น๋ฅผ ๋น ํค๋๋ก ๋ณํฉํ ์ ์์ต๋๋ค." -#: builtin/pull.c:901 +#: builtin/pull.c:905 msgid "Cannot rebase onto multiple branches." msgstr "์ฌ๋ฌ ๋ธ๋์น๋ก ๋ฆฌ๋ฒ ์ด์คํ ์ ์์ต๋๋ค." -#: builtin/pull.c:908 +#: builtin/pull.c:912 msgid "cannot rebase with locally recorded submodule modifications" msgstr "๋ก์ปฌ์์ ๊ธฐ๋กํ ํ์ ๋ชจ๋ ์์ ์ฌํญ์ ์ด์ฉํด ๋ฆฌ๋ฒ ์ด์คํ ์ ์์ต๋๋ค" @@ -11629,19 +11782,47 @@ msgstr "unpack-trees ๋๋ฒ๊น
" msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<์ต์
>]" -#: builtin/rebase--helper.c:20 +#: builtin/rebase--helper.c:22 +msgid "keep empty commits" +msgstr "๋น ์ปค๋ฐ์ ์ ์งํฉ๋๋ค" + +#: builtin/rebase--helper.c:23 msgid "continue rebase" msgstr "๋ฆฌ๋ฒ ์ด์ค ๊ณ์" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:25 msgid "abort rebase" msgstr "๋ฆฌ๋ฒ ์ด์ค๋ฅผ ์ค์งํฉ๋๋ค" -#: builtin/receive-pack.c:28 +#: builtin/rebase--helper.c:28 +msgid "make rebase script" +msgstr "๋ฆฌ๋ฒ ์ด์ค ์คํฌ๋ฆฝํธ๋ฅผ ๋ง๋ญ๋๋ค" + +#: builtin/rebase--helper.c:30 +msgid "shorten SHA-1s in the todo list" +msgstr "ํ ์ผ ๋ชฉ๋ก์ SHA-1์ ์ค์
๋๋ค" + +#: builtin/rebase--helper.c:32 +msgid "expand SHA-1s in the todo list" +msgstr "ํ ์ผ ๋ชฉ๋ก์ SHA-1์ ๋์
๋๋ค" + +#: builtin/rebase--helper.c:34 +msgid "check the todo list" +msgstr "ํ ์ผ ๋ชฉ๋ก์ ํ์ธํฉ๋๋ค" + +#: builtin/rebase--helper.c:36 +msgid "skip unnecessary picks" +msgstr "๋ถํ์ํ ๋นผ์ค๊ธฐ๋ฅผ ๊ฑด๋๋๋๋ค" + +#: builtin/rebase--helper.c:38 +msgid "rearrange fixup/squash lines" +msgstr "fixup/squash ์ค ์ฌ๊ตฌ์ฑ" + +#: builtin/receive-pack.c:29 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:838 +#: builtin/receive-pack.c:839 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" @@ -11668,7 +11849,7 @@ msgstr "" "์ด ๋ฉ์์ง๋ฅผ ๋ณด์ง ์๊ณ ๊ธฐ๋ณธ ๋์์ ๊ณ์ ํ๋ ค๋ฉด,\n" "'receive.denyCurrentBranch' ์ค์ ๋ณ์๋ฅผ 'refuse'๋ก ์ค์ ํ์ญ์์ค." -#: builtin/receive-pack.c:858 +#: builtin/receive-pack.c:859 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" @@ -11688,11 +11869,11 @@ msgstr "" "\n" "์ด ๋ฉ์์ง๋ฅผ ๋ณด์ง ์์ผ๋ ค๋ฉด, ์ด ์ค์ ๋ณ์๋ฅผ 'refuse'๋ก ์ค์ ํ์ญ์์ค." -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1932 msgid "quiet" msgstr "์ถ๋ ฅ ์๊ธฐ" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1946 msgid "You must specify a directory." msgstr "๋๋ ํฐ๋ฆฌ๋ฅผ ์ง์ ํด์ผ ํฉ๋๋ค." @@ -11842,12 +12023,12 @@ msgstr "--mirror ์ต์
๊ณผ ๊ฐ์ด ๋ง์คํฐ ๋ธ๋์น๋ฅผ ์ง์ ํ๋ฉด ์๋ค๊ฐ msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "๋ง์คํฐ ๋ธ๋์น๋ฅผ ์ง์ ์ fetch ๋ฏธ๋ฌ์์๋ง ์๋ค๊ฐ ๋ง์ต๋๋ค" -#: builtin/remote.c:191 builtin/remote.c:630 +#: builtin/remote.c:191 builtin/remote.c:631 #, c-format msgid "remote %s already exists." msgstr "%s ๋ฆฌ๋ชจํธ๊ฐ ์ด๋ฏธ ์์ต๋๋ค." -#: builtin/remote.c:195 builtin/remote.c:634 +#: builtin/remote.c:195 builtin/remote.c:635 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s'์(๋) ์ฌ๋ฐ๋ฅธ ๋ฆฌ๋ชจํธ ์ด๋ฆ์ด ์๋๋๋ค" @@ -11870,17 +12051,17 @@ msgstr "(์ผ์น)" msgid "(delete)" msgstr "(์ญ์ )" -#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 +#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "๊ทธ๋ฐ ๋ฆฌ๋ชจํธ๊ฐ ์์ต๋๋ค: %s" -#: builtin/remote.c:640 +#: builtin/remote.c:641 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "์ค์ ์น์
์ '%s'์์ '%s'(์ผ)๋ก ๋ฐ๊ฟ ์ ์์ต๋๋ค" -#: builtin/remote.c:660 +#: builtin/remote.c:661 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11891,17 +12072,17 @@ msgstr "" "\t%s\n" "\tํ์ํ๋ฉด ์ค์ ์ ์๋์ผ๋ก ์
๋ฐ์ดํธํ์ญ์์ค." -#: builtin/remote.c:696 +#: builtin/remote.c:697 #, c-format msgid "deleting '%s' failed" msgstr "'%s' ์ญ์ ๊ฐ ์คํจํ์ต๋๋ค" -#: builtin/remote.c:730 +#: builtin/remote.c:731 #, c-format msgid "creating '%s' failed" msgstr "'%s' ๋ง๋ค๊ธฐ๊ฐ ์คํจํ์ต๋๋ค" -#: builtin/remote.c:795 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11913,113 +12094,113 @@ msgstr[0] "" "๋ค.\n" "์ญ์ ํ๋ ค๋ฉด ๋ค์์ ์ฌ์ฉํ์ญ์์ค:" -#: builtin/remote.c:809 +#: builtin/remote.c:810 #, c-format msgid "Could not remove config section '%s'" msgstr "์ค์ ์น์
'%s'์(๋ฅผ) ์ ๊ฑฐํ ์ ์์ต๋๋ค" -#: builtin/remote.c:910 +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ์ ํญ๋ชฉ (๋ค์ ๊ฐ์ ธ์ค๊ธฐ๋ remotes/%s ์๋ ์ ์ฅ๋ฉ๋๋ค)" -#: builtin/remote.c:913 +#: builtin/remote.c:914 msgid " tracked" msgstr " ์ถ์ ๋จ" -#: builtin/remote.c:915 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr " ์ค๋๋จ (์ ๊ฑฐํ๋ ค๋ฉด 'git remote prune'์ ์ฌ์ฉํ์ญ์์ค)" -#: builtin/remote.c:917 +#: builtin/remote.c:918 msgid " ???" msgstr " ???" -#: builtin/remote.c:958 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "์๋ชป๋ branch.%s.merge ๊ฐ. ์ฌ๋ฌ ๊ฐ ๋ธ๋์น๋ก ๋ฆฌ๋ฒ ์ด์คํ ์ ์์ต๋๋ค" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases interactively onto remote %s" msgstr "๋ฆฌ๋ชจํธ %s ์๋ก ๋ํ์์ผ๋ก ๋ฆฌ๋ฒ ์ด์คํฉ๋๋ค" -#: builtin/remote.c:967 +#: builtin/remote.c:968 #, c-format msgid "rebases onto remote %s" msgstr "๋ฆฌ๋ชจํธ %s ์๋ก ๋ฆฌ๋ฒ ์ด์คํฉ๋๋ค" -#: builtin/remote.c:970 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr " ๋ณํฉ: ๋ฆฌ๋ชจํธ %s" -#: builtin/remote.c:973 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "๋ณํฉ: ๋ฆฌ๋ชจํธ %s" -#: builtin/remote.c:976 +#: builtin/remote.c:977 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s ๊ทธ๋ฆฌ๊ณ ๋ฆฌ๋ชจํธ %s\n" -#: builtin/remote.c:1019 +#: builtin/remote.c:1020 msgid "create" msgstr "๋ง๋ค๊ธฐ" -#: builtin/remote.c:1022 +#: builtin/remote.c:1023 msgid "delete" msgstr "์ญ์ " -#: builtin/remote.c:1026 +#: builtin/remote.c:1027 msgid "up to date" msgstr "์ต์ ์ํ" -#: builtin/remote.c:1029 +#: builtin/remote.c:1030 msgid "fast-forwardable" msgstr "์ ๋ฐฉํฅ ์งํ ๊ฐ๋ฅ" -#: builtin/remote.c:1032 +#: builtin/remote.c:1033 msgid "local out of date" msgstr "๋ก์ปฌ์ด ๋ค๋จ์ด์ง" -#: builtin/remote.c:1039 +#: builtin/remote.c:1040 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s์์ %-*s(์ผ)๋ก ๊ฐ์ (%s)" -#: builtin/remote.c:1042 +#: builtin/remote.c:1043 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s์์ %-*s(์ผ)๋ก ํธ์ (%s)" -#: builtin/remote.c:1046 +#: builtin/remote.c:1047 #, c-format msgid " %-*s forces to %s" msgstr " %-*s์์ %s(์ผ)๋ก ๊ฐ์ " -#: builtin/remote.c:1049 +#: builtin/remote.c:1050 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s์์ %s(์ผ)๋ก ํธ์" -#: builtin/remote.c:1117 +#: builtin/remote.c:1118 msgid "do not query remotes" msgstr "๋ฆฌ๋ชจํธ์ ์ง์ํ์ง ์์ต๋๋ค" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid "* remote %s" msgstr "* ๋ฆฌ๋ชจํธ %s" -#: builtin/remote.c:1145 +#: builtin/remote.c:1146 #, c-format msgid " Fetch URL: %s" msgstr " ๊ฐ์ ธ์ค๊ธฐ URL: %s" -#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 +#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 msgid "(no URL)" msgstr "(URL ์์)" @@ -12027,182 +12208,182 @@ msgstr "(URL ์์)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1161 builtin/remote.c:1163 #, c-format msgid " Push URL: %s" msgstr " ํธ์ URL: %s" -#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 +#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 #, c-format msgid " HEAD branch: %s" msgstr " HEAD ๋ธ๋์น: %s" -#: builtin/remote.c:1164 +#: builtin/remote.c:1165 msgid "(not queried)" msgstr "(์ง์ํ์ง ์์)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1167 msgid "(unknown)" msgstr "(์ ์ ์์)" -#: builtin/remote.c:1170 +#: builtin/remote.c:1171 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD ๋ธ๋์น (๋ฆฌ๋ชจํธ HEAD๋ ์ ๋งคํ๊ณ , ๋ค์ ์ค ํ๋์ผ ์ ์์ต๋๋ค):\n" -#: builtin/remote.c:1182 +#: builtin/remote.c:1183 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " ๋ฆฌ๋ชจํธ ๋ธ๋์น:%s" -#: builtin/remote.c:1185 builtin/remote.c:1211 +#: builtin/remote.c:1186 builtin/remote.c:1212 msgid " (status not queried)" msgstr " (์ํ๋ฅผ ์ง์ํ์ง ์์)" -#: builtin/remote.c:1194 +#: builtin/remote.c:1195 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 'git pull'์ ์ฌ์ฉํ ๋ก์ปฌ ๋ธ๋์น๋ฅผ ์ค์ :" -#: builtin/remote.c:1202 +#: builtin/remote.c:1203 msgid " Local refs will be mirrored by 'git push'" msgstr " ๋ก์ปฌ ๋ ํผ๋ฐ์ค๋ฅผ 'git push'๋ก ๋ฏธ๋ฌ๋งํ ์์ " -#: builtin/remote.c:1208 +#: builtin/remote.c:1209 #, 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:1229 +#: builtin/remote.c:1230 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "๋ ํผ๋ฐ์ค/๋ฆฌ๋ชจํธ/<์ด๋ฆ>/HEAD ๊ฐ์ ๋ฆฌ๋ชจํธ์ ๋ง๊ฒ ์ค์ ํฉ๋๋ค" -#: builtin/remote.c:1231 +#: builtin/remote.c:1232 msgid "delete refs/remotes/<name>/HEAD" msgstr "๋ ํผ๋ฐ์ค/๋ฆฌ๋ชจํธ/<์ด๋ฆ>/HEAD ๊ฐ์ ์ญ์ ํฉ๋๋ค" -#: builtin/remote.c:1246 +#: builtin/remote.c:1247 msgid "Cannot determine remote HEAD" msgstr "๋ฆฌ๋ชจํธ HEAD๋ฅผ ๊ฒฐ์ ํ ์ ์์ต๋๋ค" -#: builtin/remote.c:1248 +#: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "๋ฆฌ๋ชจํธ HEAD ๋ธ๋์น๊ฐ ์ฌ๋ฌ๊ฐ์
๋๋ค. ๋ค์ ์ค ํ๋๋ฅผ ๋ช
์์ ์ผ๋ก ์ง์ ํ์ญ์์ค:" -#: builtin/remote.c:1258 +#: builtin/remote.c:1259 #, c-format msgid "Could not delete %s" msgstr "%s์(๋ฅผ) ์ญ์ ํ ์ ์์ต๋๋ค" -#: builtin/remote.c:1266 +#: builtin/remote.c:1267 #, c-format msgid "Not a valid ref: %s" msgstr "์ฌ๋ฐ๋ฅธ ๋ ํผ๋ฐ์ค๊ฐ ์๋๋๋ค: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1269 #, c-format msgid "Could not setup %s" msgstr "%s์(๋ฅผ) ์ค์ ํ ์ ์์ต๋๋ค" -#: builtin/remote.c:1286 +#: builtin/remote.c:1287 #, c-format msgid " %s will become dangling!" msgstr " %s์ ์ฐ๊ฒฐ์ด ๋์ด์ง๋๋ค!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1288 #, c-format msgid " %s has become dangling!" msgstr " %s์ ์ฐ๊ฒฐ์ด ๋์ด์ก์ต๋๋ค!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1298 #, c-format msgid "Pruning %s" msgstr "์๋ผ๋: %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1299 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1315 #, c-format msgid " * [would prune] %s" msgstr " * [์๋ผ๋ผ ์์ ] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1318 #, c-format msgid " * [pruned] %s" msgstr " * [์๋ผ๋] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1363 msgid "prune remotes after fetching" msgstr "๊ฐ์ ธ์จ ํ์ ๋ฆฌ๋ชจํธ๋ฅผ ์๋ผ๋
๋๋ค" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 #, c-format msgid "No such remote '%s'" msgstr "๊ทธ๋ฐ ๋ฆฌ๋ชจํธ๊ฐ ์์ต๋๋ค ('%s')" -#: builtin/remote.c:1441 +#: builtin/remote.c:1442 msgid "add branch" msgstr "๋ธ๋์น๋ฅผ ์ถ๊ฐํฉ๋๋ค" -#: builtin/remote.c:1448 +#: builtin/remote.c:1449 msgid "no remote specified" msgstr "๋ฆฌ๋ชจํธ๋ฅผ ์ง์ ํ์ง ์์์ต๋๋ค" -#: builtin/remote.c:1465 +#: builtin/remote.c:1466 msgid "query push URLs rather than fetch URLs" msgstr "๊ฐ์ ธ์ค๊ธฐ URL์ด ์๋๋ผ ํธ์ URL์ ์ง์ํฉ๋๋ค" -#: builtin/remote.c:1467 +#: builtin/remote.c:1468 msgid "return all URLs" msgstr "๋ชจ๋ URL์ ๋ฆฌํดํฉ๋๋ค" -#: builtin/remote.c:1495 +#: builtin/remote.c:1496 #, c-format msgid "no URLs configured for remote '%s'" msgstr "'%s' ๋ฆฌ๋ชจํธ์ ๋ํ URL์ ์ค์ ํ์ง ์์์ต๋๋ค" -#: builtin/remote.c:1521 +#: builtin/remote.c:1522 msgid "manipulate push URLs" msgstr "ํธ์ URL์ ์ง์ ํฉ๋๋ค" -#: builtin/remote.c:1523 +#: builtin/remote.c:1524 msgid "add URL" msgstr "URL์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/remote.c:1525 +#: builtin/remote.c:1526 msgid "delete URLs" msgstr "URL์ ์ญ์ ํฉ๋๋ค" -#: builtin/remote.c:1532 +#: builtin/remote.c:1533 msgid "--add --delete doesn't make sense" msgstr "--add --delete ์ต์
์ ๋๋ค ์ฐ๋ฉด ์ ๋ฉ๋๋ค" -#: builtin/remote.c:1573 +#: builtin/remote.c:1572 #, c-format msgid "Invalid old URL pattern: %s" msgstr "์๋ชป๋ ์ค๋์ URL ํจํด: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1580 #, c-format msgid "No such URL found: %s" msgstr "๊ทธ๋ฐ URL์ด ์์ต๋๋ค: %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1582 msgid "Will not delete all non-push URLs" msgstr "ํธ์์ฉ์ด ์๋ ๋ชจ๋ URL์ ์ญ์ ํ์ง ์์ต๋๋ค" -#: builtin/remote.c:1597 +#: builtin/remote.c:1598 msgid "be verbose; must be placed before a subcommand" msgstr "์์ธํ ํ์ํฉ๋๋ค (ํ์ ๋ช
๋ น ์์ ์์ผ ํฉ๋๋ค)" -#: builtin/remote.c:1628 +#: builtin/remote.c:1629 #, c-format msgid "Unknown subcommand: %s" msgstr "์ ์ ์๋ ํ์ ๋ช
๋ น: %s" @@ -12300,7 +12481,7 @@ msgstr "precious-objects ์ ์ฅ์์ ๋ฌถ์์ ์ญ์ ํ ์ ์์ต๋๋ค" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable ๋ฐ -A ์ต์
์ ํธํ๋์ง ์์ต๋๋ค" -#: builtin/repack.c:406 builtin/worktree.c:116 +#: builtin/repack.c:406 builtin/worktree.c:134 #, c-format msgid "failed to remove '%s'" msgstr "'%s' ์ ๊ฑฐ์ ์คํจํ์ต๋๋ค" @@ -12432,121 +12613,121 @@ msgstr "๋ณํฉ" msgid "keep" msgstr "์ ์ง" -#: builtin/reset.c:77 +#: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "์ฌ๋ฐ๋ฅธ HEAD๊ฐ ์์ต๋๋ค." -#: builtin/reset.c:79 +#: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "HEAD์ ํธ๋ฆฌ๋ฅผ ์ฐพ๋๋ฐ ์คํจํ์ต๋๋ค." -#: builtin/reset.c:85 +#: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "%s์ ํธ๋ฆฌ๋ฅผ ์ฐพ๋๋ฐ ์คํจํ์ต๋๋ค." -#: builtin/reset.c:103 +#: builtin/reset.c:113 #, c-format msgid "HEAD is now at %s" msgstr "HEAD์ ํ์ฌ ์์น๋ %s์
๋๋ค" -#: builtin/reset.c:186 +#: builtin/reset.c:197 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "๋ณํฉ ์ค์ %s ๋ฆฌ์
์ ํ ์ ์์ต๋๋ค." -#: builtin/reset.c:286 +#: builtin/reset.c:297 msgid "be quiet, only report errors" msgstr "๊ฐ๋ตํ ํ์, ์ค๋ฅ๋ง ํ์ํฉ๋๋ค" -#: builtin/reset.c:288 +#: builtin/reset.c:299 msgid "reset HEAD and index" msgstr "HEAD์ ์ธ๋ฑ์ค๋ฅผ ๋ฆฌ์
ํฉ๋๋ค" -#: builtin/reset.c:289 +#: builtin/reset.c:300 msgid "reset only HEAD" msgstr "HEAD๋ง ๋ฆฌ์
ํฉ๋๋ค" -#: builtin/reset.c:291 builtin/reset.c:293 +#: builtin/reset.c:302 builtin/reset.c:304 msgid "reset HEAD, index and working tree" msgstr "HEAD, ์ธ๋ฑ์ค, ์์
ํด๋๋ฅผ ๋ฆฌ์
ํฉ๋๋ค" -#: builtin/reset.c:295 +#: builtin/reset.c:306 msgid "reset HEAD but keep local changes" msgstr "HEAD๋ฅผ ๋ฆฌ์
ํ์ง๋ง ๋ก์ปฌ ๋ณ๊ฒฝ ์ฌํญ์ ๋จ๊ฒจ๋ก๋๋ค" -#: builtin/reset.c:301 +#: builtin/reset.c:312 msgid "record only the fact that removed paths will be added later" msgstr "์ ๊ฑฐํ ๊ฒฝ๋ก๋ฅผ ๋์ค์ ์ถ๊ฐํ๋ค๋ ์ฌ์ค๋ง ๊ธฐ๋กํฉ๋๋ค" -#: builtin/reset.c:320 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "'%s'์(๋ฅผ) ์ฌ๋ฐ๋ฅธ ๋ฆฌ๋น์ ์ผ๋ก ์ฐพ๋๋ฐ ์คํจํ์ต๋๋ค." -#: builtin/reset.c:328 +#: builtin/reset.c:337 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "'%s'์(๋ฅผ) ์ฌ๋ฐ๋ฅธ ํธ๋ฆฌ๋ก ์ฐพ๋๋ฐ ์คํจํ์ต๋๋ค." -#: builtin/reset.c:337 +#: builtin/reset.c:346 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ์ต์
์ --{hard,mixed,soft} ์ต์
๊ณผ ํธํ๋์ง ์์ต๋๋ค" -#: builtin/reset.c:346 +#: builtin/reset.c:355 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed ์ต์
์ ๊ฒฝ๋ก์ ๊ฐ์ด ์ฐ๊ธฐ๋ ์ ๊ฑฐ๋ ์์ ์
๋๋ค. ๋์ ์ 'git reset -- <๊ฒฝ" "๋ก>'๋ฅผ ์ฌ์ฉํ์ญ์์ค." -#: builtin/reset.c:348 +#: builtin/reset.c:357 #, c-format msgid "Cannot do %s reset with paths." msgstr "๊ฒฝ๋ก์ ๊ฐ์ด %s ๋ฆฌ์
์ ํ ์ ์์ต๋๋ค." -#: builtin/reset.c:358 +#: builtin/reset.c:367 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s ๋ฆฌ์
์ ๊ฐ๋ตํ ์ ์ฅ์์์๋ง ์ธ ์ ์์ต๋๋ค" -#: builtin/reset.c:362 +#: builtin/reset.c:371 msgid "-N can only be used with --mixed" msgstr "-N ์ต์
์ --mixed ์ต์
๊ณผ ๊ฐ์ด ์จ์ผ๋ง ํฉ๋๋ค" -#: builtin/reset.c:379 +#: builtin/reset.c:388 msgid "Unstaged changes after reset:" msgstr "๋ฆฌ์
๋ค์ ์คํ
์ด์งํ์ง ์์ ๋ณ๊ฒฝ ์ฌํญ:" -#: builtin/reset.c:385 +#: builtin/reset.c:394 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "์ธ๋ฑ์ค ํ์ผ์ '%s' ๋ฆฌ๋น์ ์ผ๋ก ๋ฆฌ์
ํ ์ ์์ต๋๋ค." -#: builtin/reset.c:389 +#: builtin/reset.c:398 msgid "Could not write new index file." msgstr "์ ์ธ๋ฑ์ค ํ์ผ์ ์ธ ์ ์์ต๋๋ค." -#: builtin/rev-list.c:358 +#: builtin/rev-list.c:361 msgid "rev-list does not support display of notes" msgstr "rev-list๋ ๋
ธํธ ํ์๋ฅผ ์ง์ํ์ง ์์ต๋๋ค" -#: builtin/rev-parse.c:394 +#: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<์ต์
>] -- [<์ธ์>...]" -#: builtin/rev-parse.c:399 +#: builtin/rev-parse.c:407 msgid "keep the `--` passed as an arg" msgstr "์ธ์๋ก ๋๊ธด `--`๋ฅผ ์ ์งํฉ๋๋ค" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:409 msgid "stop parsing after the first non-option argument" msgstr "์ฒซ๋ฒ์งธ ์ต์
์ด ์๋ ์ธ์ ๋ค์ ํ์ฑ์ ์ค์งํฉ๋๋ค" -#: builtin/rev-parse.c:404 +#: builtin/rev-parse.c:412 msgid "output in stuck long form" msgstr "stuck long ํ์์ผ๋ก ์ถ๋ ฅํฉ๋๋ค" -#: builtin/rev-parse.c:535 +#: builtin/rev-parse.c:545 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12639,11 +12820,11 @@ msgstr "๋น ๋ฉ์์ง๋ก ์ปค๋ฐ์ ํ์ฉํฉ๋๋ค" msgid "keep redundant, empty commits" msgstr "์ฌ๋ถ์ ๋น ์ปค๋ฐ์ ์ ์งํฉ๋๋ค" -#: builtin/revert.c:212 +#: builtin/revert.c:214 msgid "revert failed" msgstr "๋๋๋ฆฌ๊ธฐ ์คํจ" -#: builtin/revert.c:225 +#: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "cherry-pick ์คํจ" @@ -12708,17 +12889,17 @@ msgstr "์ฌ๊ท์ ์ ๊ฑฐ๋ฅผ ํ์ฉํฉ๋๋ค" msgid "exit with a zero status even if nothing matched" msgstr "์๋ฌด ๊ฒ๋ ์ผ์นํ์ง ์์ผ๋ฉด ์ํ 0๋ฒ์ผ๋ก ๋๋ฉ๋๋ค" -#: builtin/rm.c:308 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "-r ์ต์
์ด ์์ผ๋ฉด ์ฌ๊ท์ ์ผ๋ก '%s'์(๋ฅผ) ์ ๊ฑฐํ์ง ์์ต๋๋ค" -#: builtin/rm.c:347 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: %s์(๋ฅผ) ์ ๊ฑฐํ ์ ์์ต๋๋ค" -#: builtin/rm.c:370 +#: builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "'%s'์(๋ฅผ) ์ ๊ฑฐํ ์ ์์ต๋๋ค" @@ -12755,27 +12936,27 @@ msgstr "๋ฆฌ๋ชจํธ ๋์ ํ๋ก๊ทธ๋จ์ ์ํ๋ฅผ ํ์ํฉ๋๋ค" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<์ต์
>] [<๋ฆฌ๋น์ -๋ฒ์>] [[--] [<๊ฒฝ๋ก>...]]" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:263 msgid "Group by committer rather than author" msgstr "์์ฑ์๊ฐ ์๋ ์ปค๋ฏธํฐ๋ก ๋ฌถ์ต๋๋ค" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:265 msgid "sort output according to the number of commits per author" msgstr "์์ฑ์๋ณ ์ปค๋ฐ ์์ ๋ฐ๋ผ ์ ๋ ฌํฉ๋๋ค" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:267 msgid "Suppress commit descriptions, only provides commit count" msgstr "์ปค๋ฐ ์ค๋ช
์ ์๋ตํ๊ณ , ์ปค๋ฐ ์๋ง ํ์ํฉ๋๋ค" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:269 msgid "Show the email address of each author" msgstr "์์ฑ์์ ์ ์๋ฉ์ผ ์ฃผ์๋ฅผ ํ์ํฉ๋๋ค" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:270 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:271 msgid "Linewrap output" msgstr "์ค๋ฐ๊ฟ ์ถ๋ ฅ" @@ -12972,35 +13153,35 @@ msgstr "์ฃผ์ ๋ฌธ์๋ก ์์ํ๋ ๋ชจ๋ ์ค์ ๊ฑด๋๋ฐ๊ณ ์ ๊ฑฐํฉ๋๋ค msgid "prepend comment character and space to each line" msgstr "๊ฐ ์ค์ ์์ ์ฃผ์ ๋ฌธ์์ ๊ณต๋ฐฑ์ ๋ถ์
๋๋ค" -#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 #, c-format msgid "No such ref: %s" msgstr "๊ทธ๋ฐ ๋ ํผ๋ฐ์ค๊ฐ ์์ต๋๋ค: %s" -#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 #, c-format msgid "Expecting a full ref name, got %s" msgstr "์ ์ฒด ๋ ํผ๋ฐ์ค ์ด๋ฆ์ด ํ์ํ์ง๋ง, ์
๋ ฅ์ %s" -#: builtin/submodule--helper.c:72 +#: builtin/submodule--helper.c:71 #, c-format msgid "cannot strip one component off url '%s'" msgstr "'%s' URL ํ๋์ ๋จ๊ณ๋ฅผ ์๋ผ๋ผ ์ ์์ต๋๋ค" -#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 msgid "alternative anchor for relative paths" msgstr "์๋ ๊ฒฝ๋ก์ ์ฌ์ฉํ ๋๋ค๋ฅธ ๊ธฐ์ค" -#: builtin/submodule--helper.c:310 +#: builtin/submodule--helper.c:307 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<๊ฒฝ๋ก>] [<๊ฒฝ๋ก>...]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr ".gitmodules์์ ํ์ ๋ชจ๋ ๊ฒฝ๋ก '%s'์ ๋ํ URL์ด ์์ต๋๋ค" -#: builtin/submodule--helper.c:395 +#: builtin/submodule--helper.c:389 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13008,79 +13189,79 @@ msgid "" msgstr "" "'%s' ์ค์ ์ ์ฐพ์๋ณผ ์ ์์ต๋๋ค. ์ด ์ ์ฅ์๊ฐ ์์ฒด ์
์คํธ๋ฆผ์ด๋ผ๊ณ ๊ฐ์ ํฉ๋๋ค." -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:400 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '%s'์ ๋ํ URL์ ๋ฑ๋กํ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:404 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "'%3$s' ๊ฒฝ๋ก์ ๋ํด '%1$s' (%2$s) ํ์ ๋ชจ๋ ๋ฑ๋ก\n" -#: builtin/submodule--helper.c:420 +#: builtin/submodule--helper.c:414 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "๊ฒฝ๊ณ : '%s' ํ์ ๋ชจ๋์ ๋ํด ์ปค๋งจ๋ ์
๋ฐ์ดํธ ๋ชจ๋๊ฐ ์ ์๋์์ต๋๋ค\n" -#: builtin/submodule--helper.c:427 +#: builtin/submodule--helper.c:421 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "'%s' ํ์ ๋ชจ๋์ ๋ํด ์
๋ฐ์ดํธ ๋ชจ๋ ๋ฑ๋ก์ด ์คํจํ์ต๋๋ค" -#: builtin/submodule--helper.c:443 +#: builtin/submodule--helper.c:437 msgid "Suppress output for initializing a submodule" msgstr "ํ์ ๋ชจ๋ ์ด๊ธฐํ์ ์ถ๋ ฅ์ ํ์ง ์์ต๋๋ค" -#: builtin/submodule--helper.c:448 +#: builtin/submodule--helper.c:442 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<๊ฒฝ๋ก>]" -#: builtin/submodule--helper.c:476 +#: builtin/submodule--helper.c:470 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <๊ฒฝ๋ก>" -#: builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:475 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "๊ฒฝ๋ก '%s'์ ๋ํด .gitmodules์ ์๋ ํ์๋ชจ๋ ๋งคํ์ด ์์ต๋๋ค" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 +#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "'%s' ํ์ ๋ชจ๋์ ๋ณด์กฐ ์ค๋ธ์ ํธ๋ฅผ ์ถ๊ฐํ ์ ์์ต๋๋ค: %s" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:597 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "submodule.alternateErrorStrategy์ ๋ํ ๊ฐ์ด('%s') ์ ์ ์๋ ๊ฐ์
๋๋ค" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "submodule.alternateLocation์ ๋ํ ๊ฐ์ด('%s') ์ ์ ์๋ ๊ฐ์
๋๋ค" -#: builtin/submodule--helper.c:633 +#: builtin/submodule--helper.c:626 msgid "where the new submodule will be cloned to" msgstr "์ ํ์ ๋ชจ๋์ ๋ณต์ ํ ๋์ ์์น" -#: builtin/submodule--helper.c:636 +#: builtin/submodule--helper.c:629 msgid "name of the new submodule" msgstr "์ ํ์ ๋ชจ๋ ์ด๋ฆ" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:632 msgid "url where to clone the submodule from" msgstr "ํ์ ๋ชจ๋์ ๋ณต์ ํด ์ฌ URL" -#: builtin/submodule--helper.c:645 +#: builtin/submodule--helper.c:638 msgid "depth for shallow clones" msgstr "์์ ๋ณต์ ์ ์ฌ์ฉํ ๊น์ด" -#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 msgid "force cloning progress" msgstr "๋ณต์ ์งํ ์ํฉ์ ํญ์ ํ์ํฉ๋๋ค" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:646 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13088,82 +13269,82 @@ msgstr "" "git submodule--helper clone [--prefix=<๊ฒฝ๋ก>] [--quiet] [--reference <์ ์ฅ์" ">] [--name <์ด๋ฆ>] [--depth <๊น์ด>] --url <url> --path <๊ฒฝ๋ก>" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:677 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "'%s'์์ ํ์ ๋ชจ๋ ๊ฒฝ๋ก '%s'์ ๋ณต์ ํ๋๋ฐ ์คํจํ์ต๋๋ค" -#: builtin/submodule--helper.c:699 +#: builtin/submodule--helper.c:692 #, c-format msgid "could not get submodule directory for '%s'" msgstr "'%s'์ ๋ํ ํ์ ๋ชจ๋ ๋๋ ํฐ๋ฆฌ๋ฅผ ๊ฐ์ ธ์ฌ ์ ์์ต๋๋ค" -#: builtin/submodule--helper.c:764 +#: builtin/submodule--helper.c:757 #, c-format msgid "Submodule path '%s' not initialized" msgstr "'%s' ํ์ ๋ชจ๋ ๊ฒฝ๋ก๊ฐ ์ด๊ธฐํ๋์ง ์์์ต๋๋ค" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:761 msgid "Maybe you want to use 'update --init'?" msgstr "'update --init'์ ํ๋ ค๊ณ ํ ๊ฒ ์๋์์ต๋๊น?" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:790 #, c-format msgid "Skipping unmerged submodule %s" msgstr "๋ณํฉํ์ง ํ์ ๋ชจ๋ %s ๊ฑด๋๋" -#: builtin/submodule--helper.c:814 +#: builtin/submodule--helper.c:819 #, c-format msgid "Skipping submodule '%s'" msgstr "ํ์ ๋ชจ๋ '%s' ๊ฑด๋๋" -#: builtin/submodule--helper.c:942 +#: builtin/submodule--helper.c:952 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "'%s' ๋ณต์ ํ๋๋ฐ ์คํจํ์ต๋๋ค. ์ฌ์๋ ์์ " -#: builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:963 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "๋๋ฒ์งธ '%s' ๋ณต์ ํ๋๋ฐ ์คํจํ์ต๋๋ค. ์ค์งํฉ๋๋ค" -#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 +#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 msgid "path into the working tree" msgstr "์์
ํด๋๋ก ๊ฐ๋ ๊ฒฝ๋ก" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:996 msgid "path into the working tree, across nested submodule boundaries" msgstr "์์
ํด๋๋ก ๊ฐ๋ ๊ฒฝ๋ก, ๋ด์ฅ๋ ํ์ ๋ชจ๋์ ๊ฒฝ๊ณ ํต๊ณผ" -#: builtin/submodule--helper.c:981 +#: builtin/submodule--helper.c:1000 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout ๋๋ none" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:1004 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "์ง์ ํ ๊ฐ์์ ๋ฆฌ๋น์ ์์ ์๋ฆฐ ์์ ๋ณต์ ๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/submodule--helper.c:988 +#: builtin/submodule--helper.c:1007 msgid "parallel jobs" msgstr "๋ณ๋ ฌ ์์
๊ฐ์" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1009 msgid "whether the initial clone should follow the shallow recommendation" msgstr "์ต์ด ๋ณต์ ๊ฐ ์์ ๋ณต์ ์ถ์ฒ์ ๋ฐ๋ฅผ์ง ์ฌ๋ถ" -#: builtin/submodule--helper.c:991 +#: builtin/submodule--helper.c:1010 msgid "don't print cloning progress" msgstr "๋ณต์ ๊ณผ์ ์ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/submodule--helper.c:998 +#: builtin/submodule--helper.c:1017 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<๊ฒฝ๋ก>] [<๊ฒฝ๋ก>...]" -#: builtin/submodule--helper.c:1008 +#: builtin/submodule--helper.c:1030 msgid "bad value for update parameter" msgstr "ํ๋ผ๋ฏธํฐ ์
๋ฐ์ดํธ์ ๊ฐ์ด ์๋ชป๋์์ต๋๋ค" -#: builtin/submodule--helper.c:1079 +#: builtin/submodule--helper.c:1098 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13172,20 +13353,20 @@ msgstr "" "ํ์ ๋ชจ๋ (%s) ๋ธ๋์น๊ฐ ์์ ํ๋ก์ ํธ ๋ธ๋์น๋ฅผ ์ด์ด๋ฐ๋๋ก ์ค์ ๋์์ง๋ง, ์์ " "ํ๋ก์ ํธ์ ๋ธ๋์น๊ฐ ์์ต๋๋ค" -#: builtin/submodule--helper.c:1163 +#: builtin/submodule--helper.c:1214 msgid "recurse into submodules" msgstr "ํ์ ๋ชจ๋์ ์ฌ๊ท์ ์ผ๋ก ์ ์ฉ" -#: builtin/submodule--helper.c:1169 +#: builtin/submodule--helper.c:1220 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<๊ฒฝ๋ก>...]" -#: builtin/submodule--helper.c:1232 +#: builtin/submodule--helper.c:1278 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s์์ --super-prefix ์ต์
์ ์ง์ํ์ง ์์ต๋๋ค" -#: builtin/submodule--helper.c:1238 +#: builtin/submodule--helper.c:1284 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s'์(๋) ์ฌ๋ฐ๋ฅธ submodule--helper ํ์ ๋ช
๋ น์ด ์๋๋๋ค" @@ -13198,23 +13379,23 @@ msgstr "git symbolic-ref [<์ต์
>] <์ด๋ฆ> [<๋ ํผ๋ฐ์ค>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <์ด๋ฆ>" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "์ฌ๋ณผ์ด ์๋ (๋ถ๋ฆฌ๋) ๋ ํผ๋ฐ์ค์ ๋ํด ์๋ฌ ๋ฉ์์ง๋ฅผ ํ์ํ์ง ์์ต๋๋ค" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" msgstr "์ฌ๋ณผ๋ฆญ ๋ ํผ๋ฐ์ค๋ฅผ ์ญ์ ํฉ๋๋ค" -#: builtin/symbolic-ref.c:43 +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "๋ ํผ๋ฐ์ค ์ถ๋ ฅ์ ์ค์
๋๋ค" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "์ด์ " -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "์
๋ฐ์ดํธ์ ์ด์ " @@ -13244,17 +13425,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<ํ์>] <ํ๊ทธ์ด๋ฆ>..." -#: builtin/tag.c:84 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "'%s' ํ๊ทธ๊ฐ ์์ต๋๋ค." -#: builtin/tag.c:100 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "'%s' ํ๊ทธ ์ญ์ ํจ (๊ณผ๊ฑฐ %s)\n" -#: builtin/tag.c:129 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -13267,7 +13448,7 @@ msgstr "" " %s\n" "'%c' ๋ฌธ์๋ก ์์ํ๋ ์ค์ ๋ฌด์๋ฉ๋๋ค.\n" -#: builtin/tag.c:133 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -13281,142 +13462,142 @@ msgstr "" " %s\n" "'%c' ๋ฌธ์๋ก ์์ํ๋ ์ค์ ์ ์ง๋ฉ๋๋ค. ์ ๊ฑฐํ๋ ค๋ฉด ์ง์ ์ง์์ผ ํฉ๋๋ค.\n" -#: builtin/tag.c:211 +#: builtin/tag.c:189 msgid "unable to sign the tag" msgstr "ํ๊ทธ์ ์๋ช
ํ ์ ์์ต๋๋ค" -#: builtin/tag.c:213 +#: builtin/tag.c:191 msgid "unable to write tag file" msgstr "ํ๊ทธ ํ์ผ์ ์ธ ์ ์์ต๋๋ค" -#: builtin/tag.c:237 +#: builtin/tag.c:215 msgid "bad object type." msgstr "์๋ชป๋ ์ค๋ธ์ ํธ ์ข
๋ฅ." -#: builtin/tag.c:283 +#: builtin/tag.c:261 msgid "no tag message?" msgstr "ํ๊ทธ ๋ฉ์์ง ์์?" -#: builtin/tag.c:290 +#: builtin/tag.c:268 #, c-format msgid "The tag message has been left in %s\n" msgstr "ํ๊ทธ ๋ฉ์์ง๊ฐ %s ํ์ผ์ ๋จ์ ์์ต๋๋ค\n" -#: builtin/tag.c:398 +#: builtin/tag.c:376 msgid "list tag names" msgstr "ํ๊ทธ ์ด๋ฆ ๋ชฉ๋ก์ ํ์ํฉ๋๋ค" -#: builtin/tag.c:400 +#: builtin/tag.c:378 msgid "print <n> lines of each tag message" msgstr "๊ฐ ํ๊ทธ ๋ฉ์์ง์ <n>์ค์ ํ์ํฉ๋๋ค" -#: builtin/tag.c:402 +#: builtin/tag.c:380 msgid "delete tags" msgstr "ํ๊ทธ๋ฅผ ์ญ์ ํฉ๋๋ค" -#: builtin/tag.c:403 +#: builtin/tag.c:381 msgid "verify tags" msgstr "ํ๊ทธ๋ฅผ ๊ฒ์ฆํฉ๋๋ค" -#: builtin/tag.c:405 +#: builtin/tag.c:383 msgid "Tag creation options" msgstr "ํ๊ทธ ๋ง๋ค๊ธฐ ์ต์
" -#: builtin/tag.c:407 +#: builtin/tag.c:385 msgid "annotated tag, needs a message" msgstr "์ฃผ์ ๋ฌ๋ฆฐ ํ๊ทธ, ๋ฉ์์ง๊ฐ ํ์ํฉ๋๋ค" -#: builtin/tag.c:409 +#: builtin/tag.c:387 msgid "tag message" msgstr "ํ๊ทธ ๋ฉ์์ง" -#: builtin/tag.c:411 +#: builtin/tag.c:389 msgid "annotated and GPG-signed tag" msgstr "์ฃผ์ ๋ฌ๋ฆฌ๊ณ GPG ์๋ช
ํ ํ๊ทธ" -#: builtin/tag.c:415 +#: builtin/tag.c:393 msgid "use another key to sign the tag" msgstr "ํ๊ทธ๋ฅผ ์๋ช
ํ๋๋ฐ ์ง์ ํ ํค๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/tag.c:416 +#: builtin/tag.c:394 msgid "replace the tag if exists" msgstr "ํ๊ทธ๊ฐ ์์ผ๋ฉด ๋ฐ๊ฟ๋๋ค" -#: builtin/tag.c:417 builtin/update-ref.c:369 +#: builtin/tag.c:395 builtin/update-ref.c:368 msgid "create a reflog" msgstr "reflog๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/tag.c:419 +#: builtin/tag.c:397 msgid "Tag listing options" msgstr "ํ๊ทธ ๋ชฉ๋ก ๋ณด๊ธฐ ์ต์
" -#: builtin/tag.c:420 +#: builtin/tag.c:398 msgid "show tag list in columns" msgstr "ํ๊ทธ ๋ชฉ๋ก์ ์ฌ๋ฌ ์ด๋ก ํ์ํฉ๋๋ค" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:399 builtin/tag.c:401 msgid "print only tags that contain the commit" msgstr "ํด๋น ์ปค๋ฐ์ด ๋ค์ด ์๋ ํ๊ทธ๋ง ํ์ํฉ๋๋ค" -#: builtin/tag.c:422 builtin/tag.c:424 +#: builtin/tag.c:400 builtin/tag.c:402 msgid "print only tags that don't contain the commit" msgstr "ํด๋น ์ปค๋ฐ์ด ๋ค์ด ์์ง ์์ ํ๊ทธ๋ง ํ์ํฉ๋๋ค" -#: builtin/tag.c:425 +#: builtin/tag.c:403 msgid "print only tags that are merged" msgstr "๋ณํฉ๋ ํ๊ทธ๋ง ํ์ํฉ๋๋ค" -#: builtin/tag.c:426 +#: builtin/tag.c:404 msgid "print only tags that are not merged" msgstr "๋ณํฉ๋์ง ์์ ํ๊ทธ๋ง ํ์ํฉ๋๋ค" -#: builtin/tag.c:431 +#: builtin/tag.c:409 msgid "print only tags of the object" msgstr "ํด๋น ์ค๋ธ์ ํธ์ ํ๊ทธ๋ง ํ์ํฉ๋๋ค" -#: builtin/tag.c:470 +#: builtin/tag.c:453 msgid "--column and -n are incompatible" msgstr "--column ๋ฐ -n ์ต์
์ ํธํ๋์ง ์์ต๋๋ค" -#: builtin/tag.c:492 +#: builtin/tag.c:475 msgid "-n option is only allowed in list mode" msgstr "-n ์ต์
์ ๋ฆฌ์คํธ ๋ชจ๋์์๋ง ํ์ฉํฉ๋๋ค" -#: builtin/tag.c:494 +#: builtin/tag.c:477 msgid "--contains option is only allowed in list mode" msgstr "--contains ์ต์
์ ๋ฆฌ์คํธ ๋ชจ๋์์๋ง ํ์ฉํฉ๋๋ค" -#: builtin/tag.c:496 +#: builtin/tag.c:479 msgid "--no-contains option is only allowed in list mode" msgstr "--no-contains ์ต์
์ ๋ฆฌ์คํธ ๋ชจ๋์์๋ง ํ์ฉํฉ๋๋ค" -#: builtin/tag.c:498 +#: builtin/tag.c:481 msgid "--points-at option is only allowed in list mode" msgstr "--points-at ์ต์
์ ๋ฆฌ์คํธ ๋ชจ๋์์๋ง ํ์ฉํฉ๋๋ค" -#: builtin/tag.c:500 +#: builtin/tag.c:483 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "--merged ๋ฐ --no-merged ์ต์
์ ๋ฆฌ์คํธ ๋ชจ๋์์๋ง ํ์ฉํฉ๋๋ค" -#: builtin/tag.c:511 +#: builtin/tag.c:494 msgid "only one -F or -m option is allowed." msgstr "ํ๋์ -F ๋๋ -m ์ต์
๋ง ์ธ ์ ์์ต๋๋ค." -#: builtin/tag.c:530 +#: builtin/tag.c:513 msgid "too many params" msgstr "ํ๋ผ๋ฏธํฐ๊ฐ ๋๋ฌด ๋ง์ต๋๋ค" -#: builtin/tag.c:536 +#: builtin/tag.c:519 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s'์(๋) ์ฌ๋ฐ๋ฅธ ํ๊ทธ ์ด๋ฆ์ด ์๋๋๋ค." -#: builtin/tag.c:541 +#: builtin/tag.c:524 #, c-format msgid "tag '%s' already exists" msgstr "ํ๊ทธ '%s'์ด(๊ฐ) ์ด๋ฏธ ์์ต๋๋ค" -#: builtin/tag.c:571 +#: builtin/tag.c:554 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "ํ๊ทธ '%s' ์
๋ฐ์ดํธ (๊ณผ๊ฑฐ %s)\n" @@ -13483,128 +13664,128 @@ msgstr "๋๋ ํฐ๋ฆฌ๋ฅผ ์ญ์ ํ ํ์ ๋๋ ํฐ๋ฆฌ ์ ๋ณด๊ฐ ๋ฐ๋์ง ์์ msgid " OK" msgstr " ์ค์ผ์ด" -#: builtin/update-index.c:569 +#: builtin/update-index.c:571 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<์ต์
>] [--] [<ํ์ผ>...]" -#: builtin/update-index.c:924 +#: builtin/update-index.c:926 msgid "continue refresh even when index needs update" msgstr "์ธ๋ฑ์ค์ ์
๋ฐ์ดํธ๊ฐ ํ์ํ๋๋ผ๋ ์๋ก ๊ณ ์นจ์ ๊ณ์ํฉ๋๋ค" -#: builtin/update-index.c:927 +#: builtin/update-index.c:929 msgid "refresh: ignore submodules" msgstr "์๋ก ๊ณ ์นจ: ํ์ ๋ชจ๋ ๋ฌด์" -#: builtin/update-index.c:930 +#: builtin/update-index.c:932 msgid "do not ignore new files" msgstr "์ ํ์ผ์ ๋ฌด์ํ ์ ์์ต๋๋ค" -#: builtin/update-index.c:932 +#: builtin/update-index.c:934 msgid "let files replace directories and vice-versa" msgstr "๋๋ ํฐ๋ฆฌ๋ฅผ ํ์ผ๋ก, ๋๋ ๊ทธ ๋ฐ๋๋ก ๋ฐ๊ฟ ์ ์๊ฒ ํ์ฉํฉ๋๋ค" -#: builtin/update-index.c:934 +#: builtin/update-index.c:936 msgid "notice files missing from worktree" msgstr "์์
ํด๋์์ ์๋ฆผ ํ์ผ์ด ์์ต๋๋ค" -#: builtin/update-index.c:936 +#: builtin/update-index.c:938 msgid "refresh even if index contains unmerged entries" msgstr "์ธ๋ฑ์ค์ ๋ณํฉํ์ง ์์ ํญ๋ชฉ์ด ์์ด๋ ์๋ก ๊ณ ์นฉ๋๋ค" -#: builtin/update-index.c:939 +#: builtin/update-index.c:941 msgid "refresh stat information" msgstr "ํ์ผ ์ ๋ณด๋ฅผ ์๋ก ๊ณ ์นฉ๋๋ค" -#: builtin/update-index.c:943 +#: builtin/update-index.c:945 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "--refresh์ ๋์ผํ์ง๋ง, assume-unchanged ์ค์ ์ ๋ฌด์ํฉ๋๋ค" -#: builtin/update-index.c:947 +#: builtin/update-index.c:949 msgid "<mode>,<object>,<path>" msgstr "<๋ชจ๋>,<์ค๋ธ์ ํธ>,<๊ฒฝ๋ก>" -#: builtin/update-index.c:948 +#: builtin/update-index.c:950 msgid "add the specified entry to the index" msgstr "์ง์ ํ ํญ๋ชฉ์ ์ธ๋ฑ์ค์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/update-index.c:957 +#: builtin/update-index.c:959 msgid "mark files as \"not changing\"" msgstr "ํ์ผ์ \"๋ฐ๊พธ์ง ์์\"์ผ๋ก ํ์ํฉ๋๋ค" -#: builtin/update-index.c:960 +#: builtin/update-index.c:962 msgid "clear assumed-unchanged bit" msgstr "๋ฐ๊พธ์ง ์์์ผ๋ก ๊ฐ์ (assumed-unchanged) ๋นํธ๋ฅผ ์ง์๋๋ค" -#: builtin/update-index.c:963 +#: builtin/update-index.c:965 msgid "mark files as \"index-only\"" msgstr "ํ์ผ์ ์ธ๋ฑ์ค ์ ์ฉ์ผ๋ก (\"index-only\") ํ์ํฉ๋๋ค" -#: builtin/update-index.c:966 +#: builtin/update-index.c:968 msgid "clear skip-worktree bit" msgstr "์์
ํด๋ ๊ฑด๋๋ฐ๊ธฐ (skip-worktree) ๋นํธ๋ฅผ ์ง์๋๋ค" -#: builtin/update-index.c:969 +#: builtin/update-index.c:971 msgid "add to index only; do not add content to object database" msgstr "" "์ธ๋ฑ์ค์๋ง ์ถ๊ฐํฉ๋๋ค. ๋ด์ฉ์ ์ค๋ธ์ ํธ ๋ฐ์ดํฐ๋ฒ ์ด์ค์ ์ถ๊ฐํ์ง ์์ต๋๋ค" -#: builtin/update-index.c:971 +#: builtin/update-index.c:973 msgid "remove named paths even if present in worktree" msgstr "์์
ํด๋์ ์์ด๋ ํด๋น ๊ฒฝ๋ก๋ฅผ ์ ๊ฑฐํฉ๋๋ค" -#: builtin/update-index.c:973 +#: builtin/update-index.c:975 msgid "with --stdin: input lines are terminated by null bytes" msgstr "--stdin๊ณผ ๊ฐ์ด ์ฌ์ฉ: ์
๋ ฅ ์ค์ NUL ๋ฐ์ดํธ๋ก ๋๋ฉ๋๋ค" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "read list of paths to be updated from standard input" msgstr "ํ์ค ์
๋ ฅ์์ ์
๋ฐ์ดํธํ ๊ฒฝ๋ก์ ๋ชฉ๋ก์ ์ฝ์ต๋๋ค" -#: builtin/update-index.c:979 +#: builtin/update-index.c:981 msgid "add entries from standard input to the index" msgstr "ํ์ค ์
๋ ฅ์์ ์ฝ์ ํญ๋ชฉ์ ์ธ๋ฑ์ค์ ์ถ๊ฐํฉ๋๋ค" -#: builtin/update-index.c:983 +#: builtin/update-index.c:985 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "๊ฒฝ๋ก ๋ชฉ๋ก์ ๋ํด #2 ๋ฐ #3 ์คํ
์ด์ง์ ๋ค์ ํฉ๋๋ค" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "only update entries that differ from HEAD" msgstr "HEAD์ ๋ค๋ฅธ ํญ๋ชฉ๋ง ์
๋ฐ์ดํธํฉ๋๋ค" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "ignore files missing from worktree" msgstr "์์
ํด๋์ ์๋ ํ์ผ์ ๋ฌด์ํฉ๋๋ค" -#: builtin/update-index.c:994 +#: builtin/update-index.c:996 msgid "report actions to standard output" msgstr "ํ์ค ์ถ๋ ฅ์ ๋์์ ์๋ฆฝ๋๋ค" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "์ ์ฅํ ํด๊ฒฐ๋์ง ์์ ์ถฉ๋์ ๋ฌด์ํฉ๋๋ค (์ฌ์ฉ์์ฉ ๋ช
๋ น ์ฉ๋)" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1002 msgid "write index in this format" msgstr "์ธ๋ฑ์ค๋ฅผ ์ด ํ์์ผ๋ก ์๋๋ค" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1004 msgid "enable or disable split index" msgstr "์คํ๋ฆฟ ์ธ๋ฑ์ค๋ฅผ ์ผ๊ฑฐ๋ ๋๋๋ค" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1006 msgid "enable/disable untracked cache" msgstr "์ถ์ ํ์ง ์๋ ์บ์ ์ฌ์ฉ์ ์ผ๊ฑฐ๋ ๋๋๋ค" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "test if the filesystem supports untracked cache" msgstr "ํ์ผ ์์คํ
์ด ์ถ์ ํ์ง ์๋ ์บ์๋ฅผ ์ง์ํ๋์ง ๊ฒ์ฌํฉ๋๋ค" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "enable untracked cache without testing the filesystem" msgstr "ํ์ผ ์์คํ
์ํ ์์ด ์ถ์ ํ์ง ์๋ ์บ์๋ฅผ ์ฌ์ฉํฉ๋๋ค" -#: builtin/update-index.c:1108 +#: builtin/update-index.c:1107 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13612,7 +13793,7 @@ msgstr "" "core.splitIndex ๊ฐ์ด ๊ฑฐ์ง์
๋๋ค. ์ ๋ง๋ก ์คํ๋ฆฟ ์ธ๋ฑ์ค๋ฅผ ์ฌ์ฉํ๋ ค๋ฉด ์ด ๊ฐ์ ์ " "๊ฑฐํ๊ฑฐ๋ ๋ฐ๊พธ์ญ์์ค." -#: builtin/update-index.c:1117 +#: builtin/update-index.c:1116 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -13620,7 +13801,7 @@ msgstr "" "core.splitIndex ๊ฐ์ด ์ฐธ์
๋๋ค. ์ ๋ง๋ก ์คํ๋ฆฟ ์ธ๋ฑ์ค๋ฅผ ์ฌ์ฉํ์ง ์์ผ๋ ค๋ฉด ์ด ๊ฐ" "์ ์ ๊ฑฐํ๊ฑฐ๋ ๋ฐ๊พธ์ญ์์ค." -#: builtin/update-index.c:1128 +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13628,11 +13809,11 @@ msgstr "" "core.untrackedCache ๊ฐ์ด ์ฐธ์
๋๋ค. ์ ๋ง๋ก ์ถ์ ํ์ง ์๋ ์บ์๋ฅผ ์ฌ์ฉํ์ง ์์ผ" "๋ ค๋ฉด ์ด ๊ฐ์ ์ ๊ฑฐํ๊ฑฐ๋ ๋ฐ๊พธ์ญ์์ค." -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "์ถ์ ๋์ง ์๋ ํ์ผ ์บ์๋ฅผ ์ฌ์ฉํ์ง ์์ต๋๋ค" -#: builtin/update-index.c:1140 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13640,7 +13821,7 @@ msgstr "" "core.untrackedCache ๊ฐ์ด ๊ฑฐ์ง์
๋๋ค. ์ ๋ง๋ก ์ถ์ ํ์ง ์๋ ์บ์๋ฅผ ์ฌ์ฉํ๋ ค๋ฉด " "์ด ๊ฐ์ ์ ๊ฑฐํ๊ฑฐ๋ ๋ฐ๊พธ์ญ์์ค." -#: builtin/update-index.c:1144 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "'%s'์ ๋ํด ์ถ์ ๋์ง ์๋ ์บ์๋ฅผ ์ฌ์ฉํ์ง ์์ต๋๋ค" @@ -13657,19 +13838,19 @@ msgstr "git update-ref [<์ต์
>] <๋ ํผ๋ฐ์ค์ด๋ฆ> <์-๊ฐ> [<๊ณผ๊ฑฐ-๊ฐ msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<์ต์
>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "๋ ํผ๋ฐ์ค๋ฅผ ์ญ์ ํฉ๋๋ค" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "<๋ ํผ๋ฐ์ค์ด๋ฆ>์ ๊ฐ๋ฆฌํค์ง ์๋ ํญ๋ชฉ์ผ๋ก ์
๋ฐ์ดํธํฉ๋๋ค" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "ํ์ค ์
๋ ฅ์ NUL๋ก ๋๋๋ ์ธ์๊ฐ ์์ต๋๋ค" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "ํ์ค ์
๋ ฅ์์ ์
๋ฐ์ดํธ๋ฅผ ์ฝ์ต๋๋ค" @@ -13733,102 +13914,109 @@ msgstr "git worktree prune [<์ต์
>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <๊ฒฝ๋ก>" -#: builtin/worktree.c:44 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "worktrees/%s ์ ๊ฑฐ: ์ฌ๋ฐ๋ฅธ ๋๋ ํฐ๋ฆฌ๊ฐ ์๋๋๋ค" -#: builtin/worktree.c:50 +#: builtin/worktree.c:52 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "worktrees/%s ์ ๊ฑฐ: gitdir ํ์ผ์ด ์์ต๋๋ค" -#: builtin/worktree.c:55 +#: builtin/worktree.c:57 builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "worktrees/%s ์ ๊ฑฐ: gitdir ํ์ผ์ ์ฝ์ ์ ์์ต๋๋ค (%s)" -#: builtin/worktree.c:66 +#: builtin/worktree.c:76 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "์์
ํธ๋ฆฌ ์ ๊ฑฐ/%s: ๋ถ์กฑํ๊ฒ ์ฝ์ (%<PRIuMAX> ๋ฐ์ดํธ ์์, %<PRIuMAX> ๋ฐ์ดํธ ์ฝ์)" + +#: builtin/worktree.c:84 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "worktrees/%s ์ ๊ฑฐ: gitdir ํ์ผ์ด ์ฌ๋ฐ๋ฅด์ง ์์ต๋๋ค" -#: builtin/worktree.c:82 +#: builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "worktrees/%s ์ ๊ฑฐ: gitdir ํ์ผ์ด ์๋ ์์น๋ฅผ ๊ฐ๋ฆฌํต๋๋ค" -#: builtin/worktree.c:129 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "์๋ผ๋ธ ์์
ํด๋๋ฅผ ์๋ฆฝ๋๋ค" -#: builtin/worktree.c:131 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "<์๊ฐ>๋ณด๋ค ์ค๋ ๋ ์์
ํด๋๋ฅผ ๋ง๋ฃํฉ๋๋ค" -#: builtin/worktree.c:205 +#: builtin/worktree.c:223 #, c-format msgid "'%s' already exists" msgstr "'%s'์ด(๊ฐ) ์ด๋ฏธ ์์ต๋๋ค" -#: builtin/worktree.c:236 +#: builtin/worktree.c:254 #, c-format msgid "could not create directory of '%s'" msgstr "'%s'์ ๋๋ ํฐ๋ฆฌ๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: builtin/worktree.c:275 +#: builtin/worktree.c:293 #, c-format msgid "Preparing %s (identifier %s)" msgstr "%s ์ค๋น ์ค (ID %s)" -#: builtin/worktree.c:327 +#: builtin/worktree.c:345 msgid "checkout <branch> even if already checked out in other worktree" msgstr "๋ค๋ฅธ ์์
ํด๋์์ ์ฒดํฌ์์ํ๋๋ผ๋ <๋ธ๋์น>๋ฅผ ์ฒดํฌ์์ํฉ๋๋ค" -#: builtin/worktree.c:329 +#: builtin/worktree.c:347 msgid "create a new branch" msgstr "์ ๋ธ๋์น๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/worktree.c:331 +#: builtin/worktree.c:349 msgid "create or reset a branch" msgstr "๋ธ๋์น๋ฅผ ๋ง๋ค๊ฑฐ๋ ๋ฆฌ์
ํฉ๋๋ค" -#: builtin/worktree.c:333 +#: builtin/worktree.c:351 msgid "populate the new working tree" msgstr "์ ์์
ํด๋๋ฅผ ๋ง๋ญ๋๋ค" -#: builtin/worktree.c:334 +#: builtin/worktree.c:352 msgid "keep the new working tree locked" msgstr "์ ์์
ํด๋๋ฅผ ์ ๊ถ ๋ก๋๋ค" -#: builtin/worktree.c:342 +#: builtin/worktree.c:360 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, --detach ์ต์
์ค ํ๋๋ง ์ธ ์ ์์ต๋๋ค" -#: builtin/worktree.c:479 +#: builtin/worktree.c:499 msgid "reason for locking" msgstr "์ ๊ทธ๋ ์ด์ " -#: builtin/worktree.c:491 builtin/worktree.c:524 +#: builtin/worktree.c:511 builtin/worktree.c:544 #, c-format msgid "'%s' is not a working tree" msgstr "'%s'์(๋) ์์
ํด๋๊ฐ ์๋๋๋ค" -#: builtin/worktree.c:493 builtin/worktree.c:526 +#: builtin/worktree.c:513 builtin/worktree.c:546 msgid "The main working tree cannot be locked or unlocked" msgstr "๋ฉ์ธ ์์
ํด๋๋ฅผ ์ ๊ทธ๊ฑฐ๋ ์ ๊ธ ํด์ ํ ์ ์์ต๋๋ค" -#: builtin/worktree.c:498 +#: builtin/worktree.c:518 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s'์(๋) ์ด๋ฏธ ์ ๊ฒผ์ต๋๋ค. ์ด์ : %s" -#: builtin/worktree.c:500 +#: builtin/worktree.c:520 #, c-format msgid "'%s' is already locked" msgstr "'%s'์(๋) ์ด๋ฏธ ์ ๊ฒผ์ต๋๋ค" -#: builtin/worktree.c:528 +#: builtin/worktree.c:548 #, c-format msgid "'%s' is not locked" msgstr "'%s'์(๋) ์ ๊ธฐ์ง ์์์ต๋๋ค" @@ -13853,24 +14041,24 @@ msgstr "๋๋ฒ๊น
์ฉ๋๋ก๋ง ์ฌ์ฉ" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<์ต์
>] <๋๋ ํฐ๋ฆฌ>" -#: upload-pack.c:1041 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "ํ๋์ ์์ฒญ/์๋ต ๊ตํ ๋ค์ ๋๋ฉ๋๋ค" -#: upload-pack.c:1043 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "์ต์ด ๋ ํผ๋ฐ์ค ์๋ฆผ ๋ค์ ์ฆ์ ๋๋ฉ๋๋ค" -#: upload-pack.c:1045 +#: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "<๋๋ ํฐ๋ฆฌ>๊ฐ ๊น ๋๋ ํฐ๋ฆฌ๊ฐ ์๋๋ฉด <๋๋ ํฐ๋ฆฌ>/.git/ ํด๋๋ฅผ ์๋ํ์ง ์์ต๋๋ค." -#: upload-pack.c:1047 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "<n>์ด ๋์ ๋ฐ์์ด ์์ผ๋ฉด ์ ์ก์ ์ค์งํฉ๋๋ค" -#: credential-cache--daemon.c:224 +#: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13883,7 +14071,7 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:272 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "๋๋ฒ๊น
๋ฉ์์ง๋ฅผ ํ์ค์ค๋ฅ๋ก ์ถ๋ ฅํฉ๋๋ค" @@ -13897,21 +14085,21 @@ msgstr "" "๋ชฉ๋ก์ ๋ณผ ์ ์์ต๋๋ค. ํน์ ํ์ ๋ช
๋ น์ด๋ ๊ฐ๋
์ ๋ํด ์ฝ์ด ๋ณด๋ ค๋ฉด 'git help\n" "<๋ช
๋ น>' ๋๋ 'git help <๊ฐ๋
>' ๋ช
๋ น์ ์คํํ์ญ์์ค." -#: http.c:337 +#: http.c:338 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer์ด 0๋ณด๋ค ์์ ๊ฐ์
๋๋ค. ๊ธฐ๋ณธ๊ฐ %d" # HTTP delegation -#: http.c:358 +#: http.c:359 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "๋๋ฆฌ๊ฒ์ด์
์ปจํธ๋กค์ cURL 7.44.0 ์ ๋ฒ์ ์์๋ ์ง์ํ์ง ์์ต๋๋ค" -#: http.c:367 +#: http.c:368 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "๊ณต๊ฐ ํค ๊ณ ์ ์ cURL 7.44.0 ์ ๋ฒ์ ์์๋ ์ง์ํ์ง ์์ต๋๋ค" -#: http.c:1764 +#: http.c:1768 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14273,7 +14461,7 @@ msgstr "$pretty_name(์ผ)๋ก ๊ณตํต ์ปค๋ฐ์ ์ฐพ์ ์ ์์ต๋๋ค" #: git-merge-octopus.sh:77 #, sh-format -msgid "Already up-to-date with $pretty_name" +msgid "Already up to date with $pretty_name" msgstr "์ด๋ฏธ $pretty_name์ ์
๋ฐ์ดํธ ์ํ์
๋๋ค" #: git-merge-octopus.sh:89 @@ -14292,51 +14480,53 @@ msgstr "๊ฐ๋จํ ๋ณํฉ์ด ๋์ํ์ง ์์ต๋๋ค. ์๋ ๋ณํฉ์ ์๋ํ #: git-rebase.sh:58 msgid "" -"When you have resolved this problem, run \"git rebase --continue\".\n" -"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort" -"\"." +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" -"์ด ๋ฌธ์ ๋ฅผ ํด๊ฒฐํ๋ฉด, \"\"git rebase --continue\"๋ฅผ ์คํํ์ญ์์ค.\n" -"์ด ํจ์น๋ฅผ ๊ฑด๋๋ฐ๋ ค๋ฉด, ๋์ ์ \"git rebase --skip\"์ ์คํํ์ญ์์ค.\n" -"์๋ ๋ธ๋์น๋ฅผ ์ฒดํฌ์์ํ๊ณ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ์ค์งํ๋ ค๋ฉด, \"git rebase --abort\"๋ฅผ ์ค" -"ํํ์ญ์์ค." +"๋ชจ๋ ์ถฉ๋์ ์๋์ผ๋ก ํด๊ฒฐํ๊ณ , ๋ชจ๋ \"git add/rm <์ถฉ๋_ํ์ผ>\" ๋ช
๋ น์ผ๋ก\n" +"ํด๊ฒฐํ๋ค๊ณ ํ์ํ๊ณ , \"git rebase --continue\" ๋ช
๋ น์ ์คํํ์ญ์์ค. ์ด ํจ์น๋ฅผ\n" +"๊ฑด๋๋ฐ๋ ค๋ฉด, ๋์ ์ \"git rebase --skip\" ๋ช
๋ น์ ์คํํ์ญ์์ค. ๋ฆฌ๋ฒ ์ด์ค๋ฅผ\n" +"์ค์งํ๊ณ \"git rebase\" ๋ช
๋ น ์ ์ ์๋ ์ํ๋ก ๋์๊ฐ๋ ค๋ฉด, \"git rebase --abort\"\n" +"๋ช
๋ น์ ์คํํ์ญ์์ค." -#: git-rebase.sh:158 git-rebase.sh:397 +#: git-rebase.sh:160 git-rebase.sh:402 #, sh-format msgid "Could not move back to $head_name" msgstr "'$head_name' ์์น๋ก ๋์๊ฐ ์ ์์ต๋๋ค" -#: git-rebase.sh:169 +#: git-rebase.sh:171 msgid "Applied autostash." msgstr "์๋์คํ์ ์ ์ฉ." -#: git-rebase.sh:172 +#: git-rebase.sh:174 #, sh-format msgid "Cannot store $stash_sha1" msgstr "\"$stash_sha1\"์(๋ฅผ) ์ ์ฅํ ์ ์์ต๋๋ค" -#: git-rebase.sh:212 +#: git-rebase.sh:214 msgid "The pre-rebase hook refused to rebase." msgstr "๋ฆฌ๋ฒ ์ด์ค ์ ํํฌ์์ ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ๊ฑฐ๋ถํ์ต๋๋ค." -#: git-rebase.sh:217 +#: git-rebase.sh:219 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "git-am์ด ์งํ ์ค์ธ ๊ฒ์ฒ๋ผ ๋ณด์
๋๋ค. ๋ฆฌ๋ฒ ์ด์คํ ์ ์์ต๋๋ค." -#: git-rebase.sh:358 +#: git-rebase.sh:363 msgid "No rebase in progress?" msgstr "๋ฆฌ๋ฒ ์ด์ค๊ฐ ์งํ ์ค์ด์ง ์์ต๋๋ค" -#: git-rebase.sh:369 +#: git-rebase.sh:374 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "--edit-todo ๋์์ ๋ํํ ๋ฆฌ๋ฒ ์ด์ค์์๋ง ์ฌ์ฉํ ์ ์์ต๋๋ค." -#: git-rebase.sh:376 +#: git-rebase.sh:381 msgid "Cannot read HEAD" msgstr "HEAD๋ฅผ ์ฝ์ ์ ์์ต๋๋ค" -#: git-rebase.sh:379 +#: git-rebase.sh:384 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14344,7 +14534,7 @@ msgstr "" "๋ชจ๋ ๋ณํฉ ์ถฉ๋์ ํธ์งํ๊ณ git add\n" "๋ช
๋ น์ผ๋ก ํด๊ฒฐ๋์๋ค๊ณ ํ์ํด์ผ ํฉ๋๋ค" -#: git-rebase.sh:419 +#: git-rebase.sh:424 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14365,101 +14555,101 @@ msgstr "" "์ด ๋ช
๋ น์ ๋ค์ ์คํํ์ญ์์ค. ์ค์ํ ์ฌํญ์ด ๋จ์ ์์ ๊ฒฝ์ฐ๋ฅผ\n" "๋๋นํด ์ฌ๊ธฐ์ ๋ฉ์ถฅ๋๋ค." -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "invalid upstream $upstream_name" msgstr "์๋ชป๋ ์
์คํธ๋ฆผ $upstream_name" -#: git-rebase.sh:494 +#: git-rebase.sh:504 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ์ฌ๋ฌ ๊ฐ์ ๋ณํฉ ๋ฒ ์ด์ค๊ฐ ์์ต๋๋ค" -#: git-rebase.sh:497 git-rebase.sh:501 +#: git-rebase.sh:507 git-rebase.sh:511 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ๋ณํฉ ๋ฒ ์ด์ค๊ฐ ์์ต๋๋ค" -#: git-rebase.sh:506 +#: git-rebase.sh:516 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "์ฌ๋ฐ๋ฅธ ์ปค๋ฐ์ ๊ฐ๋ฆฌํค์ง ์์ต๋๋ค: $onto_name" -#: git-rebase.sh:529 +#: git-rebase.sh:539 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "์น๋ช
์ ์ด์: ๊ทธ๋ฐ ๋ธ๋์น๊ฐ ์์ต๋๋ค: $branch_name" -#: git-rebase.sh:562 +#: git-rebase.sh:572 msgid "Cannot autostash" msgstr "์๋ ์คํ์๋ฅผ ํ ์ ์์ต๋๋ค" -#: git-rebase.sh:567 +#: git-rebase.sh:577 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "์๋ ์คํ์๋ฅผ ๋ง๋ค์์ต๋๋ค: $stash_abbrev" -#: git-rebase.sh:571 +#: git-rebase.sh:581 msgid "Please commit or stash them." msgstr "์ปค๋ฐํ๊ฑฐ๋ ์คํ์์ ๋ฃ์ผ์ญ์์ค." -#: git-rebase.sh:591 +#: git-rebase.sh:601 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "ํ์ฌ ๋ธ๋์น๊ฐ ($branch_name) ์ต์ ์ํ์
๋๋ค." -#: git-rebase.sh:595 +#: git-rebase.sh:605 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "ํ์ฌ ๋ธ๋์น๊ฐ ($branch_name) ์ต์ ์ํ์
๋๋ค. ๊ฐ์ ๋ฆฌ๋ฒ ์ด์คํฉ๋๋ค." -#: git-rebase.sh:606 +#: git-rebase.sh:616 #, sh-format msgid "Changes from $mb to $onto:" msgstr "๋ณ๊ฒฝ ์ฌํญ '$mb'์์ '$onto'(์ผ)๋ก:" -#: git-rebase.sh:615 +#: git-rebase.sh:625 msgid "First, rewinding head to replay your work on top of it..." msgstr "์์
์ฌํญ์ ๋ค์ ๋ฃ๊ธฐ ์ํด ๋จผ์ ํค๋๋ฅผ ๋ค๋ก ๋๋ฆฝ๋๋ค..." -#: git-rebase.sh:625 +#: git-rebase.sh:635 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name ๋ธ๋์น๋ฅผ $onto_name ์์น๋ก ์ ๋ฐฉํฅ ์งํํฉ๋๋ค." -#: git-stash.sh:54 +#: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear ๋ช
๋ น์ ํ๋ผ๋ฏธํฐ์ ๊ฐ์ด ์ฐ๊ธฐ๋ ๊ตฌํ๋์ง ์์์ต๋๋ค" -#: git-stash.sh:95 +#: git-stash.sh:102 msgid "You do not have the initial commit yet" msgstr "์์ง ์ต์ด ์ปค๋ฐ์ด ์์ต๋๋ค" -#: git-stash.sh:110 +#: git-stash.sh:117 msgid "Cannot save the current index state" msgstr "ํ์ฌ ์ธ๋ฑ์ค ์ํ๋ฅผ ์ ์ฅํ ์ ์์ต๋๋ค" -#: git-stash.sh:125 +#: git-stash.sh:132 msgid "Cannot save the untracked files" msgstr "์ถ์ ํ์ง ์๋ ํ์ผ์ ์ ์ฅํ ์ ์์ต๋๋ค" -#: git-stash.sh:145 git-stash.sh:158 +#: git-stash.sh:152 git-stash.sh:165 msgid "Cannot save the current worktree state" msgstr "ํ์ฌ ์์
ํด๋ ์ํ๋ฅผ ์ ์ฅํ ์ ์์ต๋๋ค" -#: git-stash.sh:162 +#: git-stash.sh:169 msgid "No changes selected" msgstr "๋ณ๊ฒฝ ์ฌํญ์ ์ ํํ์ง ์์์ต๋๋ค" -#: git-stash.sh:165 +#: git-stash.sh:172 msgid "Cannot remove temporary index (can't happen)" msgstr "์์ ์ธ๋ฑ์ค๋ฅผ ์ ๊ฑฐํ ์ ์์ต๋๋ค (์ผ์ด๋ ์ ์๋ ์ํฉ)" -#: git-stash.sh:178 +#: git-stash.sh:185 msgid "Cannot record working tree state" msgstr "์์
ํด๋ ์ํ๋ฅผ ๊ธฐ๋กํ ์ ์์ต๋๋ค" -#: git-stash.sh:210 +#: git-stash.sh:217 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "$ref_stash์(๋ฅผ) $w_commit(์ผ)๋ก ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค" @@ -14474,7 +14664,7 @@ msgstr "$ref_stash์(๋ฅผ) $w_commit(์ผ)๋ก ์
๋ฐ์ดํธํ ์ ์์ต๋๋ค" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:266 +#: git-stash.sh:273 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14483,108 +14673,108 @@ msgstr "" "์ค๋ฅ: 'stash save'์ ๋ํด ์ ์ ์๋ ์ต์
: $option\n" " ๋ฉ์์ง๋ฅผ ๋๊ธฐ๋ ค๋ฉด, ๋ค์๊ณผ ๊ฐ์ด ์ฐ์ญ์์ค: git stash save -- '$option'" -#: git-stash.sh:281 +#: git-stash.sh:288 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "--patch ์ต์
๊ณผ --include-untracked ๋๋ --all ์ต์
์ ๋์์ ์ธ ์ ์์ต๋๋ค" -#: git-stash.sh:289 +#: git-stash.sh:296 msgid "No local changes to save" msgstr "์ ์ฅํ ๋ก์ปฌ ๋ณ๊ฒฝ ์ฌํญ์ด ์์ต๋๋ค" -#: git-stash.sh:294 +#: git-stash.sh:301 msgid "Cannot initialize stash" msgstr "์คํ์๋ฅผ ์ด๊ธฐํํ ์ ์์ต๋๋ค" -#: git-stash.sh:298 +#: git-stash.sh:305 msgid "Cannot save the current status" msgstr "ํ์ฌ ์ํ๋ฅผ ์ ์ฅํ ์ ์์ต๋๋ค" -#: git-stash.sh:299 +#: git-stash.sh:306 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "์์
ํด๋์ $stash_msg ์ธ๋ฑ์ค ์ํ๋ฅผ ์ ์ฅํ์ต๋๋ค" -#: git-stash.sh:326 +#: git-stash.sh:334 msgid "Cannot remove worktree changes" msgstr "์์
ํด๋ ๋ณ๊ฒฝ ์ฌํญ์ ์ ๊ฑฐํ ์ ์์ต๋๋ค" -#: git-stash.sh:474 +#: git-stash.sh:482 #, sh-format msgid "unknown option: $opt" msgstr "์ ์ ์๋ ์ต์
: $opt" -#: git-stash.sh:487 +#: git-stash.sh:495 msgid "No stash entries found." msgstr "์คํ์ ํญ๋ชฉ์ด ์์ต๋๋ค." -#: git-stash.sh:494 +#: git-stash.sh:502 #, sh-format msgid "Too many revisions specified: $REV" msgstr "๋๋ฌด ๋ง์ ๋ฆฌ๋น์ ์ ์ง์ ํ์ต๋๋ค: $REV" -#: git-stash.sh:509 +#: git-stash.sh:517 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference์(๋) ์ฌ๋ฐ๋ฅธ ๋ ํผ๋ฐ์ค๊ฐ ์๋๋๋ค" -#: git-stash.sh:537 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args'์(๋) ์คํ์ ์ปค๋ฐ์ด ์๋๋๋ค" -#: git-stash.sh:548 +#: git-stash.sh:556 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args'์(๋) ์คํ์ ๋ ํผ๋ฐ์ค๊ฐ ์๋๋๋ค" -#: git-stash.sh:556 +#: git-stash.sh:564 msgid "unable to refresh index" msgstr "์ธ๋ฑ์ค๋ฅผ ์๋ก ๊ณ ์น ์ ์์ต๋๋ค" -#: git-stash.sh:560 +#: git-stash.sh:568 msgid "Cannot apply a stash in the middle of a merge" msgstr "๋ณํฉ ๋์ค์ ์คํ์๋ฅผ ์ ์ฉํ ์ ์์ต๋๋ค" -#: git-stash.sh:568 +#: git-stash.sh:576 msgid "Conflicts in index. Try without --index." msgstr "์ธ๋ฑ์ค์ ์ถฉ๋. --index ์์ด ์๋ํด ๋ณด์ญ์์ค." -#: git-stash.sh:570 +#: git-stash.sh:578 msgid "Could not save index tree" msgstr "์ธ๋ฑ์ค ํธ๋ฆฌ๋ฅผ ์ ์ฅํ ์ ์์ต๋๋ค" -#: git-stash.sh:579 +#: git-stash.sh:587 msgid "Could not restore untracked files from stash entry" msgstr "์คํ์ ํญ๋ชฉ์์ ์ถ์ ํ์ง ์๋ ํ์ผ์ ๋ณต๊ตฌํ ์ ์์ต๋๋ค" -#: git-stash.sh:604 +#: git-stash.sh:612 msgid "Cannot unstage modified files" msgstr "์์ ํ ํ์ผ์ ์คํ
์ด์ง์์ ๋บ ์ ์์ต๋๋ค" -#: git-stash.sh:619 +#: git-stash.sh:627 msgid "Index was not unstashed." msgstr "์ธ๋ฑ์ค๊ฐ ์คํ์์์ ๋น ์ก์ต๋๋ค." -#: git-stash.sh:633 +#: git-stash.sh:641 msgid "The stash entry is kept in case you need it again." msgstr "๋ค์ ํ์ํ ๋๋ฅผ ๋๋นํด ์คํ์ ํญ๋ชฉ์ ๋ณด๊ดํฉ๋๋ค." -#: git-stash.sh:642 +#: git-stash.sh:650 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} ์ง์ ($s)" -#: git-stash.sh:643 +#: git-stash.sh:651 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: ์คํ์ ํญ๋ชฉ์ ์ง์ธ ์ ์์ต๋๋ค" -#: git-stash.sh:651 +#: git-stash.sh:659 msgid "No branch name specified" msgstr "๋ธ๋์น ์ด๋ฆ์ ์ง์ ํ์ง ์์์ต๋๋ค" -#: git-stash.sh:730 +#: git-stash.sh:738 msgid "(To restore them type \"git stash apply\")" msgstr "(๋ณต๊ตฌํ๋ ค๋ฉด \"git stash apply\"๋ฅผ ์คํํ์ญ์์ค)" @@ -14727,17 +14917,17 @@ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "'$name' ํ์ ๋ชจ๋์ด ($url) '$displaypath' ๊ฒฝ๋ก์ ๋ํด ๋ฑ๋ก๋์ง ์์์ต๋๋ค" -#: git-submodule.sh:638 +#: git-submodule.sh:637 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก์์ ('$displaypath') ํ์ฌ ๋ฆฌ๋น์ ์ ์ฐพ์ ์ ์์ต๋๋ค" -#: git-submodule.sh:648 +#: git-submodule.sh:647 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$sm_path'์์ ๊ฐ์ ธ์ฌ ์ ์์ต๋๋ค" -#: git-submodule.sh:653 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14746,12 +14936,12 @@ msgstr "" "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$sm_path'์์ ํ์ฌ ${remote_name}/${branch} ๋ฆฌ๋น์ ์ ์ฐพ์ ์ " "์์ต๋๋ค" -#: git-submodule.sh:671 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath'์์ ๊ฐ์ ธ์ฌ ์ ์์ต๋๋ค" -#: git-submodule.sh:677 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14760,82 +14950,82 @@ msgstr "" "'$displaypath' ํ์ ๋ชจ๋ ๊ฒฝ๋ก์์ ๊ฐ์ ธ์์ง๋ง, $sha1 ์ปค๋ฐ์ด ๋ค์ด์์ง ์์ต๋" "๋ค. ์ด ์ปค๋ฐ์ ์ง์ ๊ฐ์ ธ์ค๋๋ฐ ์คํจํ์ต๋๋ค." -#: git-submodule.sh:684 +#: git-submodule.sh:683 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath'์์ '$sha1'์(๋ฅผ) ์ฒดํฌ์์ํ ์ ์์ต๋๋ค" -#: git-submodule.sh:685 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath': '$sha1' ์ฒดํฌ์์" -#: git-submodule.sh:689 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath'์์ '$sha1'์(๋ฅผ) ๋ฆฌ๋ฒ ์ด์คํ ์ ์์ต๋๋ค" -#: git-submodule.sh:690 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath': '$sha1'(์ผ)๋ก ๋ฆฌ๋ฒ ์ด์ค" -#: git-submodule.sh:695 +#: git-submodule.sh:694 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath'์์ '$sha1' ๋ณํฉํ ์ ์์ต๋๋ค" -#: git-submodule.sh:696 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath': '$sha1'์์ ๋ณํฉ" -#: git-submodule.sh:701 +#: git-submodule.sh:700 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "'$command $sha1' ์คํ์ด ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath'์์ ์คํจํ์ต๋๋ค" -#: git-submodule.sh:702 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath': '$command $sha1'" -#: git-submodule.sh:733 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "์ฌ๊ท์ ์ผ๋ก ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$displaypath'์ ๋ค์ด๊ฐ๋๋ฐ ์คํจํ์ต๋๋ค" -#: git-submodule.sh:841 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "--cached ์ต์
์ --files ์ต์
๊ณผ ๊ฐ์ด ์ธ ์ ์์ต๋๋ค" -#: git-submodule.sh:893 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "์์์น ๋ชปํ ๋ชจ๋ $mod_dst" -#: git-submodule.sh:913 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " ๊ฒฝ๊ณ : '$display_name'์ '$sha1_src' ์ปค๋ฐ์ด ๋ค์ด์์ง ์์ต๋๋ค" -#: git-submodule.sh:916 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " ๊ฒฝ๊ณ : '$display_name'์ '$sha1_dst' ์ปค๋ฐ์ด ๋ค์ด์์ง ์์ต๋๋ค" -#: git-submodule.sh:919 +#: git-submodule.sh:918 #, 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:1065 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "์ฌ๊ท์ ์ผ๋ก ํ์ ๋ชจ๋ ๊ฒฝ๋ก '$sm_path'์ ๋ค์ด๊ฐ๋๋ฐ ์คํจํ์ต๋๋ค" -#: git-submodule.sh:1137 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "ํ์ ๋ชจ๋ URL์ '$displaypath'์ ๋ํด ๋๊ธฐํ" @@ -14854,13 +15044,13 @@ msgstr "๋ฆฌ๋ฒ ์ด์ค์ค ($new_count/$total)" msgid "" "\n" "Commands:\n" -" p, pick = use commit\n" -" r, reword = use commit, but edit the commit message\n" -" e, edit = use commit, but stop for amending\n" -" s, squash = use commit, but meld into previous commit\n" -" f, fixup = like \"squash\", but discard this commit's log message\n" -" x, exec = run command (the rest of the line) using shell\n" -" d, drop = remove commit\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"d, drop = remove commit\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -14945,48 +15135,48 @@ msgstr "HEAD๋ฅผ $first_parent ์์น๋ก ์ฎ๊ธธ ์ ์์ต๋๋ค" msgid "Refusing to squash a merge: $sha1" msgstr "๋ณํฉ squash ๊ฑฐ๋ถ: $sha1" -#: git-rebase--interactive.sh:399 +#: git-rebase--interactive.sh:400 #, sh-format msgid "Error redoing merge $sha1" msgstr "$sha1 ๋ณํฉ์ ๋ค์ ํ๋๋ฐ ์ค๋ฅ" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:408 #, sh-format msgid "Could not pick $sha1" msgstr "$sha1์ ๋นผ์ค๊ธฐ ํ ์ ์์ต๋๋ค" -#: git-rebase--interactive.sh:416 +#: git-rebase--interactive.sh:417 #, sh-format msgid "This is the commit message #${n}:" msgstr "์ปค๋ฐ ๋ฉ์์ง #${n}๋ฒ์
๋๋ค:" -#: git-rebase--interactive.sh:421 +#: git-rebase--interactive.sh:422 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "#${n}๋ฒ์งธ ์ปค๋ฐ ๋ฉ์์ง๋ฅผ ๊ฑด๋๋๋๋ค:" -#: git-rebase--interactive.sh:432 +#: git-rebase--interactive.sh:433 #, 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:441 +#: git-rebase--interactive.sh:442 #, sh-format msgid "Cannot write $fixup_msg" msgstr "$fixup_msg๋ฅผ ์ธ ์ ์์ต๋๋ค" -#: git-rebase--interactive.sh:444 +#: git-rebase--interactive.sh:445 msgid "This is a combination of 2 commits." msgstr "์ปค๋ฐ 2๊ฐ๊ฐ ์์ธ ๊ฒฐ๊ณผ์
๋๋ค." -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 -#: git-rebase--interactive.sh:531 +#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 +#: git-rebase--interactive.sh:532 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "๋ค์์ ์ ์ฉํ (apply) ์ ์์ต๋๋ค: $sha1... $rest" -#: git-rebase--interactive.sh:559 +#: git-rebase--interactive.sh:560 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14999,31 +15189,31 @@ msgstr "" "๋๋ถ๋ถ์ ๊ฒฝ์ฐ ๋น ์ปค๋ฐ ๋ฉ์์ง ๋๋ฌธ์ด๊ฑฐ๋, ๋๋ ์ปค๋ฐ ์ ํํฌ๊ฐ ์คํจํ๊ธฐ\n" "๋๋ฌธ์
๋๋ค. ์ปค๋ฐ ๋ฉ์์ง๋ฅผ ์์ ํ๊ธฐ ์ ์ ์ด ๋ฌธ์ ๋ฅผ ๋จผ์ ํด๊ฒฐํด์ผ ํฉ๋๋ค." -#: git-rebase--interactive.sh:574 +#: git-rebase--interactive.sh:575 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "๋ค์์์ ๋ฉ์ถฅ๋๋ค: $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:589 +#: git-rebase--interactive.sh:590 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "์ด์ ์ปค๋ฐ ์์ด '$squash_style' ์ํํ ์ ์์ต๋๋ค" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:632 #, sh-format msgid "Executing: $rest" msgstr "์คํ ์ค: $rest" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:640 #, sh-format msgid "Execution failed: $rest" msgstr "์คํ ์คํจ: $rest" -#: git-rebase--interactive.sh:641 +#: git-rebase--interactive.sh:642 msgid "and made changes to the index and/or the working tree" msgstr "๊ทธ๋ฆฌ๊ณ ์ธ๋ฑ์ค ๊ทธ๋ฆฌ๊ณ /๋๋ ์์
ํด๋์ ๋ณ๊ฒฝ ์ฌํญ์ด ์์ต๋๋ค" -#: git-rebase--interactive.sh:643 +#: git-rebase--interactive.sh:644 msgid "" "You can fix the problem, and then run\n" "\n" @@ -15034,7 +15224,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:656 +#: git-rebase--interactive.sh:657 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -15049,95 +15239,29 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "์ ์ ์๋ ๋ช
๋ น: $command $sha1 $rest" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:669 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "'git rebase --edit-todo' ๋ช
๋ น์ผ๋ก ๋ฐ๋ก์ก์ผ์ญ์์ค." -#: git-rebase--interactive.sh:703 +#: git-rebase--interactive.sh:704 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "์ฑ๊ณต์ ์ผ๋ก ๋ฆฌ๋ฒ ์ด์คํ๊ณ $head_name ์
๋ฐ์ดํธํ์ต๋๋ค." -#: git-rebase--interactive.sh:750 -msgid "Could not skip unnecessary pick commands" -msgstr "๋ถํ์ํ ๋นผ์ค๊ธฐ ๋ช
๋ น์ ๊ฑด๋๋ธ ์ ์์ต๋๋ค" - -#: git-rebase--interactive.sh:908 -#, sh-format -msgid "" -"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -" - $line" -msgstr "" -"๊ฒฝ๊ณ : ๋ค์ ์ค์์ ํด๋น SHA-1์ด ์๊ฑฐ๋ ์ปค๋ฐ์ด ์๋๋๋ค:\n" -" - $line" - -#: git-rebase--interactive.sh:941 -#, sh-format -msgid "" -"Warning: the command isn't recognized in the following line:\n" -" - $line" -msgstr "" -"๊ฒฝ๊ณ : ๋ค์ ์ค์์ ๋ช
๋ น์ด๊ฐ ๋ฌด์์ธ์ง ์ ์ ์์ต๋๋ค:\n" -" - $line" - -#: git-rebase--interactive.sh:980 +#: git-rebase--interactive.sh:749 msgid "could not detach HEAD" msgstr "HEAD๋ ๋ถ๋ฆฌํ ์ ์์ต๋๋ค" -#: git-rebase--interactive.sh:1018 -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):" -msgstr "" -"๊ฒฝ๊ณ : ์ผ๋ถ ์ปค๋ฐ์ด ์๋์น ์๊ฒ ๋ฒ๋ ค์ก์ ์๋ ์์ต๋๋ค.\n" -"๋ฒ๋ ค์ง ์ปค๋ฐ (์ต๊ทผ์์ ๊ณผ๊ฑฐ ์์):" - -#: git-rebase--interactive.sh:1026 -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error." -msgstr "" -"์ด ๋ฉ์์ง๋ฅผ ๋ณด์ง ์์ผ๋ ค๋ฉด, \"drop\"์ ์ฌ์ฉํด ๋ช
์์ ์ผ๋ก ์ปค๋ฐ์ ์ ๊ฑฐํ์ญ์" -"์ค.\n" -"\n" -"'git config rebase.missingCommitsCheck' ๋ช
๋ น์ผ๋ก ๊ฒฝ๊ณ ๋จ๊ณ๋ฅผ ๋ฐ๊ฟ ์ ์์ต๋" -"๋ค.\n" -"๊ฐ๋ฅํ ๋์์: ignore, warn, error" - -#: git-rebase--interactive.sh:1037 -#, sh-format -msgid "" -"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " -"Ignoring." -msgstr "" -"rebase.missingCommitsCheck ์ต์
์ ๋ํด ์ธ์ํ ์ ์๋ $check_level ์ค์ . ๋ฌด์" -"ํฉ๋๋ค." - -#: git-rebase--interactive.sh:1054 -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:1055 -msgid "Or you can abort the rebase with 'git rebase --abort'." -msgstr "์๋๋ฉด 'git rebase --abort' ๋ช
๋ น์ผ๋ก ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ์ค์งํ ์๋ ์์ต๋๋ค." - -#: git-rebase--interactive.sh:1083 +#: git-rebase--interactive.sh:784 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "CHERRY_PICK_HEAD๋ฅผ ์ ๊ฑฐํ ์ ์์ต๋๋ค" -#: git-rebase--interactive.sh:1088 +#: git-rebase--interactive.sh:789 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15168,11 +15292,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:806 msgid "Error trying to find the author identity to amend commit" msgstr "์ปค๋ฐ์ ์์ ํ ์์ฑ์ ์ ์์ ์ฐพ๋๋ฐ ์ค๋ฅ" -#: git-rebase--interactive.sh:1110 +#: git-rebase--interactive.sh:811 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15180,11 +15304,11 @@ msgstr "" "์์
ํด๋์ ์ปค๋ฐํ์ง ์์ ๋ณ๊ฒฝ ์ฌํญ์ด ์์ต๋๋ค. ์ด ์ฌํญ์ ๋จผ์ \n" "์ปค๋ฐํ๊ณ 'git rebase --continue' ๋ช
๋ น์ ๋ค์ ์คํํ์ญ์์ค." -#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 +#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 msgid "Could not commit staged changes." msgstr "์คํ
์ด์งํ ๋ณ๊ฒฝ ์ฌํญ์ ์ปค๋ฐํ ์ ์์ต๋๋ค." -#: git-rebase--interactive.sh:1147 +#: git-rebase--interactive.sh:848 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15198,39 +15322,39 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 +#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 msgid "Could not execute editor" msgstr "ํธ์ง๊ธฐ๋ฅผ ์คํํ ์ ์์ต๋๋ค" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:869 #, sh-format msgid "Could not checkout $switch_to" msgstr "$switch_to๋ฅผ ์ฒดํฌ์์ํ ์ ์์ต๋๋ค" -#: git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:874 msgid "No HEAD?" msgstr "HEAD๊ฐ ์์ต๋๋ค?" -#: git-rebase--interactive.sh:1174 +#: git-rebase--interactive.sh:875 #, sh-format msgid "Could not create temporary $state_dir" msgstr "์์๋ก $state_dir ๋๋ ํฐ๋ฆฌ๋ฅผ ๋ง๋ค ์ ์์ต๋๋ค" -#: git-rebase--interactive.sh:1176 +#: git-rebase--interactive.sh:877 msgid "Could not mark as interactive" msgstr "๋ํํ์ผ๋ก ํ์ํ ์ ์์ต๋๋ค." -#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 +#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 msgid "Could not init rewritten commits" msgstr "๋ค์ ์์ฑ๋ ์ปค๋ฐ์ ์ด๊ธฐํํ ์ ์์ต๋๋ค" -#: git-rebase--interactive.sh:1291 +#: git-rebase--interactive.sh:993 #, 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:1296 +#: git-rebase--interactive.sh:998 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15240,7 +15364,7 @@ msgstr "" "ํ์ง๋ง ๋ชจ๋ ์ ๊ฑฐํ ๊ฒฝ์ฐ, ๋ฆฌ๋ฒ ์ด์ค๋ฅผ ์ค์งํฉ๋๋ค.\n" "\n" -#: git-rebase--interactive.sh:1303 +#: git-rebase--interactive.sh:1005 msgid "Note that empty commits are commented out" msgstr "๋จ ๋น ์ปค๋ฐ์ ์ฃผ์ ์ฒ๋ฆฌ๋์์ต๋๋ค." @@ -15814,60 +15938,60 @@ msgstr "์ง์ญ ์๊ฐ๋์ GMT์ ์ฐจ์ด๊ฐ ๋ถ ๋จ์๊ฐ ์๋๋๋ค\n" msgid "local time offset greater than or equal to 24 hours\n" msgstr "์ง์ญ ์๊ฐ ์คํ์
์ด 24์๊ฐ๋ณด๋ค ํฌ๊ฑฐ๋ ์์ต๋๋ค\n" -#: git-send-email.perl:208 git-send-email.perl:214 +#: git-send-email.perl:207 git-send-email.perl:213 msgid "the editor exited uncleanly, aborting everything" msgstr "ํธ์ง๊ธฐ๊ฐ ๋น์ ์์ ์ผ๋ก ๋๋์, ๋ชจ๋ ์ค์งํฉ๋๋ค" -#: git-send-email.perl:291 +#: git-send-email.perl:290 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' ์์ ์์ฑ ์ค์ด์๋ ์ค๊ฐ ๋ฒ์ ์ ์ ์๋ฉ์ผ์ด ๋ค์ด ์์ต๋๋ค.\n" -#: git-send-email.perl:296 +#: git-send-email.perl:295 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' ์์ ์์ฑํ ์ ์๋ฉ์ผ์ด ๋ค์ด ์์ต๋๋ค.\n" -#: git-send-email.perl:314 +#: git-send-email.perl:313 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases ์ต์
์ ๋ค๋ฅธ ์ต์
๊ณผ ํธํ๋์ง ์์ต๋๋ค\n" -#: git-send-email.perl:379 git-send-email.perl:634 +#: git-send-email.perl:378 git-send-email.perl:629 msgid "Cannot run git format-patch from outside a repository\n" msgstr "์ ์ฅ์ ๋ฐ์์ git format-patch ๋ช
๋ น์ ์คํํ ์ ์์ต๋๋ค\n" -#: git-send-email.perl:448 +#: git-send-email.perl:447 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "์ ์ ์๋ --suppress-cc ํ๋: '%s'\n" -#: git-send-email.perl:477 +#: git-send-email.perl:476 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "์ ์ ์๋ --confirm ์ค์ : '%s'\n" -#: git-send-email.perl:509 +#: git-send-email.perl:504 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "๊ฒฝ๊ณ : ๋ฐ์ดํ๊ฐ ์๋ sendmail ๋ณ์นญ์ ์ง์ํ์ง ์์ต๋๋ค: %s\n" -#: git-send-email.perl:511 +#: git-send-email.perl:506 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "๊ฒฝ๊ณ : `:include:`๋ ์ง์ํ์ง ์์ต๋๋ค: %s\n" -#: git-send-email.perl:513 +#: git-send-email.perl:508 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "๊ฒฝ๊ณ : `/file` ๋๋ `|pipe` ๋ฆฌ๋ค์ด๋ ์
์ ์ง์ํ์ง ์์ต๋๋ค: %s\n" -#: git-send-email.perl:518 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "๊ฒฝ๊ณ : sendmail ์ค์ด ์ธ์๋์ง ์์ต๋๋ค: %s\n" -#: git-send-email.perl:600 +#: git-send-email.perl:595 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -15882,12 +16006,12 @@ msgstr "" " * ํ์ผ์ ์๋ํ๋ค๋ฉด \"./%s\"(์ด)๋ผ๊ณ ์ฐ๊ณ , ์๋๋ฉด\n" " * ๋ฒ์๋ฅผ ์๋ํ๋ค๋ฉด --format-patch ์ต์
์ฌ์ฉ\n" -#: git-send-email.perl:621 +#: git-send-email.perl:616 #, perl-format msgid "Failed to opendir %s: %s" msgstr "%s์ opendir ์คํจ: %s" -#: git-send-email.perl:645 +#: git-send-email.perl:640 #, perl-format msgid "" "fatal: %s: %s\n" @@ -15896,7 +16020,7 @@ msgstr "" "์น๋ช
์ ์ค๋ฅ: %s: %s\n" "๊ฒฝ๊ณ : ํจ์น๋ฅผ ๋ณด๋ด์ง ์์์ต๋๋ค\n" -#: git-send-email.perl:656 +#: git-send-email.perl:651 msgid "" "\n" "No patch files specified!\n" @@ -15906,17 +16030,17 @@ msgstr "" "ํจ์น ํ์ผ์ ์ง์ ํ์ง ์์์ต๋๋ค\n" "\n" -#: git-send-email.perl:669 +#: git-send-email.perl:664 #, perl-format msgid "No subject line in %s?" msgstr "%s ์์ ์ ๋ชฉ ์ค์ด ์์ต๋๋ค?" -#: git-send-email.perl:679 +#: git-send-email.perl:674 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "%s์ ์ฐ๋ ค๊ณ ์ฌ๋๋ฐ ์คํจ: %s" -#: git-send-email.perl:689 +#: git-send-email.perl:684 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15930,32 +16054,32 @@ msgstr "" "\n" "์์ฝ์ ๋ณด๋ด๋ ๊ฒ ์๋๋ผ๋ฉด ๋ณธ๋ฌธ ๋ด์ฉ์ ์ง์ฐ์ญ์์ค.\n" -#: git-send-email.perl:712 +#: git-send-email.perl:707 #, perl-format msgid "Failed to open %s.final: %s" msgstr "%s.final์ ์ฌ๋๋ฐ ์คํจ: %s" -#: git-send-email.perl:715 +#: git-send-email.perl:710 #, perl-format msgid "Failed to open %s: %s" msgstr "%s์(๋ฅผ) ์ฌ๋๋ฐ ์คํจ: %s" -#: git-send-email.perl:750 +#: git-send-email.perl:745 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "To/Cc/Bcc ํ๋๊ฐ ํด์๋์ง ์์์, ๋ฌด์ํฉ๋๋ค\n" -#: git-send-email.perl:759 +#: git-send-email.perl:754 msgid "Summary email is empty, skipping it\n" msgstr "์์ฝ ์ ์๋ฉ์ผ์ด ๋น์ด ์์ด์ ๋์ด๊ฐ๋๋ค.\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:791 +#: git-send-email.perl:786 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "์ ๋ง๋ก <%s>์(๋ฅผ) ์ฌ์ฉํ์๊ฒ ์ต๋๊น [y/N]? " # ์ฃผ์: '8bit'์ด๋ผ๊ณ ๊ทธ๋๋ก ์ด๋ค. ๋ฉ์ผ encoding ํค๋์ ์ธ literal์ ๊ฐ๋ฆฌํด -#: git-send-email.perl:820 +#: git-send-email.perl:815 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -15963,11 +16087,11 @@ msgstr "" "๋ค์ ํ์ผ์ด 8bit์ด์ง๋ง, Content-Transfer-Encoding์ ์ค์ ํ์ง ์์์ต๋๋ค.\n" # ์ฃผ์: '8bit'์ด๋ผ๊ณ ๊ทธ๋๋ก ์ด๋ค. ๋ฉ์ผ encoding ํค๋์ ์ธ literal์ ๊ฐ๋ฆฌํด -#: git-send-email.perl:825 +#: git-send-email.perl:820 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "์ด๋ค 8bit ์ธ์ฝ๋ฉ์ ์ ์ธํฉ๋๊น [UTF-8]? " -#: git-send-email.perl:833 +#: git-send-email.perl:828 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -15980,20 +16104,20 @@ msgstr "" "์ ๋ชฉ ์์์ธ '*** SUBJECT HERE ***'๊ฐ ๋ค์ด ์์ต๋๋ค. ์ ๋ง๋ก ๋ณด๋ด๋ ค๋ฉด --force " "์ต์
์ ์ฌ์ฉํ์ญ์์ค.\n" -#: git-send-email.perl:852 +#: git-send-email.perl:847 msgid "To whom should the emails be sent (if anyone)?" msgstr "๋๊ตฌ์๊ฒ ์ ์๋ฉ์ผ์ ๋ณด๋ด์ผ ํฉ๋๊น (๋ณด๋ผ ๋์์ด ์๋ค๋ฉด)?" -#: git-send-email.perl:870 +#: git-send-email.perl:865 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "์น๋ช
์ ์ค๋ฅ: '%s' ๋ณ์นญ์ ์๊ธฐ ์์ ์ ๊ฐ๋ฆฌํต๋๋ค\n" -#: git-send-email.perl:882 +#: git-send-email.perl:877 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "์ฒซ ๋ฉ์ผ์ ๋ํด (์๋ค๋ฉด) Message-ID๊ฐ In-Reply-To์ ์ฌ์ฉ๋์์ต๋๋ค? " -#: git-send-email.perl:932 git-send-email.perl:940 +#: git-send-email.perl:927 git-send-email.perl:935 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "์ค๋ฅ: ๋ค์์์ ์ฌ๋ฐ๋ฅธ ์ฃผ์๋ฅผ ์ถ์ถํ ์ ์์ต๋๋ค: %s\n" @@ -16001,16 +16125,16 @@ msgstr "์ค๋ฅ: ๋ค์์์ ์ฌ๋ฐ๋ฅธ ์ฃผ์๋ฅผ ์ถ์ถํ ์ ์์ต๋๋ค: %s\ #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:944 +#: git-send-email.perl:939 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "์ด ์ฃผ์๋ก ๋ฌด์์ ํ์๊ฒ ์ต๋๊น? ([q]๋๋ด๊ธฐ|[d]๋ฒ๋ฆฌ๊ธฐ|[e]ํธ์ง): " -#: git-send-email.perl:1245 +#: git-send-email.perl:1260 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "\"%s\" CA ๊ฒฝ๋ก๊ฐ ์์ต๋๋ค" -#: git-send-email.perl:1320 +#: git-send-email.perl:1335 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16037,130 +16161,130 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1335 +#: git-send-email.perl:1350 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "์ด ์ ์๋ฉ์ผ์ ๋ณด๋ด์๊ฒ ์ต๋๊น? ([y]์|[n]์๋์ค|[q]๋๋ด๊ธฐ|[a]๋ชจ๋): " -#: git-send-email.perl:1338 +#: git-send-email.perl:1353 msgid "Send this email reply required" msgstr "ํ์ํ ์ ์๋ฉ์ผ ๋ต์ฅ ๋ณด๋
๋๋ค" -#: git-send-email.perl:1364 +#: git-send-email.perl:1379 msgid "The required SMTP server is not properly defined." msgstr "ํ์ํ SMTP ์๋ฒ๋ฅผ ์ ๋๋ก ์ง์ ํ์ง ์์์ต๋๋ค." -#: git-send-email.perl:1411 +#: git-send-email.perl:1426 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "์๋ฒ์์ STARTTLS๋ฅผ ์ง์ํ์ง ์์ต๋๋ค! %s" -#: git-send-email.perl:1416 git-send-email.perl:1420 +#: git-send-email.perl:1431 git-send-email.perl:1435 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS ์คํจ! %s" -#: git-send-email.perl:1430 +#: git-send-email.perl:1445 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "SMTP๋ฅผ ์ ๋๋ก ์ด๊ธฐํํ ์ ์์ต๋๋ค. ์ค์ ์ ํ์ธํ๊ณ --smtp-debug ์ต์
์ ์ฌ์ฉ" "ํ์ญ์์ค." -#: git-send-email.perl:1448 +#: git-send-email.perl:1463 #, perl-format msgid "Failed to send %s\n" msgstr "%s์(๋ฅผ) ๋ณด๋ด๋๋ฐ ์คํจํ์ต๋๋ค\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Dry-Sent %s\n" msgstr "%s ๋ณด๋ด๋ ํ๋ด\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Sent %s\n" msgstr "%s ๋ณด๋\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "Dry-OK. Log says:\n" msgstr "์ฑ๊ณต ํ๋ด. ๊ธฐ๋ก์:\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "OK. Log says:\n" msgstr "์ฑ๊ณต. ๊ธฐ๋ก์:\n" -#: git-send-email.perl:1465 +#: git-send-email.perl:1480 msgid "Result: " msgstr "๊ฒฐ๊ณผ: " -#: git-send-email.perl:1468 +#: git-send-email.perl:1483 msgid "Result: OK\n" msgstr "๊ฒฐ๊ณผ: ์ ์\n" -#: git-send-email.perl:1481 +#: git-send-email.perl:1496 #, perl-format msgid "can't open file %s" msgstr "%s ํ์ผ์ ์ด ์ ์์ต๋๋ค" -#: git-send-email.perl:1528 git-send-email.perl:1548 +#: git-send-email.perl:1543 git-send-email.perl:1563 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) cc: %s ์ถ๊ฐ, '%s' ์ค์์\n" -#: git-send-email.perl:1534 +#: git-send-email.perl:1549 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) to: %s ์ถ๊ฐ, '%s' ์ค์์\n" -#: git-send-email.perl:1582 +#: git-send-email.perl:1597 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox์๋) cc: %s ์ถ๊ฐ, '%s' ์ค์์\n" -#: git-send-email.perl:1605 +#: git-send-email.perl:1622 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(๋ณธ๋ฌธ) cc: %s ์ถ๊ฐ, '%s' ์ค์์\n" -#: git-send-email.perl:1711 +#: git-send-email.perl:1728 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) '%s'์ ์คํํ ์ ์์ต๋๋ค" -#: git-send-email.perl:1718 +#: git-send-email.perl:1735 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) %s: %s ์ถ๊ฐ, '%s' ์ค์์\n" -#: git-send-email.perl:1722 +#: git-send-email.perl:1739 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) '%s'(์)๋ฅผ ํฅํ ํ์ดํ๋ฅผ ๋ซ๋๋ฐ ์คํจํ์ต๋๋ค" -#: git-send-email.perl:1749 +#: git-send-email.perl:1766 msgid "cannot send message as 7bit" msgstr "๋ฉ์์ง๋ฅผ 7๋นํธ๋ก ๋ณด๋ผ ์ ์์ต๋๋ค" -#: git-send-email.perl:1757 +#: git-send-email.perl:1774 msgid "invalid transfer encoding" msgstr "์๋ชป๋ ์ ์ก ์ธ์ฝ๋ฉ" -#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 +#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 #, perl-format msgid "unable to open %s: %s\n" msgstr "%s์(๋ฅผ) ์ด ์ ์์ต๋๋ค: %s\n" -#: git-send-email.perl:1798 +#: git-send-email.perl:1815 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: ํจ์น์ 998์๋ณด๋ค ๋ ๊ธด ์ค์ด ๋ค์ด ์์ต๋๋ค" -#: git-send-email.perl:1814 +#: git-send-email.perl:1831 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s ๋์ด๊ฐ, ์๋น ํ์ฅ์ '%s' ์์.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1818 +#: git-send-email.perl:1835 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "์ ๋ง๋ก %s ํ์ผ์ ๋ณด๋ด์๊ฒ ์ต๋๊น? [y|N]: " |