mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
l10n-2.5.0-rnd2
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVrYWdAAoJEMek6Rt1RHooJR8QAIC+KLoZ7pSgOzira17zWXms aNY4crxis0ABFa/cuklh6mV45dkbYlxyRwmsjR8Aewppo8QNp5qd9o9pvz2U8u72 DfoIMBwXPRahP0OP+Wv2/s5TmTHYH0b3PpAsiyrcH5S3MbwYiybT4cKtnCOuaag6 AwwS3/iEaUPc6t1ioRwbhIxHUZ5pjWI3qVcD6Vq0+hvFOoQmK/faWN3bR9WSqZu+ Yn/tLmpay8TTNX6sPlHGjERFx3nmdWI8MpxkI0L7ydIcTvErgUCxY5r9Y4bdCYN4 ibBIIQRdkQR54PFpui/CYuvsDtL3UFxhk6SB928FmehwGc29HK5/+wpAeRYm35oC XJcm/c1En2gQhqU4EtHsJxPZii+hAy2v/w8sRCp2Ruvc4aRZ3B5ffSyHfQ1mcn89 dsWqB5cX4rMjxAv/n8QITLVBp1YRCoKbn5IwfUnQx4EaCiHP4hQvPQHxsPSJqTC/ /dBXwFhDIC+nmITZCJVJXNfzWh1VfJrUS06O8twhYAxdhCGttEHbJ7OC1kZqV+W0 tbKoZz260OjWiXW5g3U0Os+dTq5BanqAPf7uwuTsIuMv8og0frZ/TevwlqnmHw5E +yr+tJ9evUn4a2AiIGGESlrxmd+EL72E0Q/2SNEpd/qtSrZSiknubwD3B//a+zGv xyHyukC8t5C9k2B3SMng =uYzi -----END PGP SIGNATURE----- Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.5.0-rnd2 * tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po: l10n: ca.po: update translation l10n: de.po: translate 9 new messages l10n: Updated Bulgarian translation of git (2359t,0f,0u) l10n: zh_CN: for git v2.5.0 l10n round 2 l10n: sv.po: Update Swedish translation (2359t0f0u) l10n: fr v2.5.0 round 2 (2359t) l10n: ru.po: update Russian translation l10n: Updated Vietnamese translation (2359t) l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)
This commit is contained in:
Junio C Hamano
commit
83d3330dec
398
po/bg.po
398
po/bg.po
|
|
@ -22,7 +22,7 @@
|
|||
# bisect двоично търсене
|
||||
# am прилагам поредица от кръпки
|
||||
# working directory/tree — винаги работно дърво, git следи цялото дърво, а не директории, работна директория за cwd
|
||||
# switch to branch прехвърлям се/преминавам към клон
|
||||
# switch to branch преминавам към клон
|
||||
# sparse entry частично изтеглена директория/път
|
||||
# revision range диапазон на версиите
|
||||
# cover letter придружаващо писмо
|
||||
|
|
@ -59,6 +59,7 @@
|
|||
# cwd текуща работна директория
|
||||
# untracked cache кеш за неследените файлове
|
||||
# broken/corrupt повреден
|
||||
# restore възстановявам
|
||||
# ----
|
||||
# FAILED to parse неуспешен анализ на... -> неразпозната стойност на
|
||||
# blob обект BLOB
|
||||
|
|
@ -107,8 +108,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git master\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2015-06-27 19:17+0800\n"
|
||||
"PO-Revision-Date: 2015-06-28 22:46+0300\n"
|
||||
"POT-Creation-Date: 2015-07-14 07:19+0800\n"
|
||||
"PO-Revision-Date: 2015-07-14 19:05+0300\n"
|
||||
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
|
||||
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
|
||||
"Language: bg\n"
|
||||
|
|
@ -764,8 +765,8 @@ msgstr "ГРЕШКА В GIT: преотваряне на файл-ключалк
|
|||
msgid "failed to read the cache"
|
||||
msgstr "кешът не може да бъде прочетен"
|
||||
|
||||
#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
|
||||
#: builtin/clone.c:654
|
||||
#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
|
||||
#: builtin/clone.c:647
|
||||
msgid "unable to write new index file"
|
||||
msgstr "неуспешно записване на новия индекс"
|
||||
|
||||
|
|
@ -814,7 +815,7 @@ msgstr "обектът „%s“ (%s) не може да бъде прочете
|
|||
msgid "blob expected for %s '%s'"
|
||||
msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
|
||||
|
||||
#: merge-recursive.c:788 builtin/clone.c:313
|
||||
#: merge-recursive.c:788 builtin/clone.c:306
|
||||
#, c-format
|
||||
msgid "failed to open '%s'"
|
||||
msgstr "директорията „%s“ не може да бъде отворена"
|
||||
|
|
@ -2176,7 +2177,7 @@ msgstr "изтрит"
|
|||
msgid "behind "
|
||||
msgstr "назад с "
|
||||
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:352
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:345
|
||||
#, c-format
|
||||
msgid "failed to unlink '%s'"
|
||||
msgstr "неуспешно изтриване на „%s“"
|
||||
|
|
@ -2255,7 +2256,7 @@ msgstr "повече подробности"
|
|||
msgid "interactive picking"
|
||||
msgstr "интерактивно отбиране на промени"
|
||||
|
||||
#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
|
||||
#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
|
||||
msgid "select hunks interactively"
|
||||
msgstr "интерактивен избор на парчета код"
|
||||
|
||||
|
|
@ -2613,7 +2614,7 @@ msgstr "Кръпката „%s“ не може да бъде приложена
|
|||
msgid "Checking patch %s..."
|
||||
msgstr "Проверяване на кръпката „%s“…"
|
||||
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
|
||||
#, c-format
|
||||
msgid "make_cache_entry failed for path '%s'"
|
||||
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
|
||||
|
|
@ -3336,7 +3337,7 @@ msgstr "извеждане по колони"
|
|||
msgid "Failed to resolve HEAD as a valid ref."
|
||||
msgstr "Не може да се открие към какво сочи указателят „HEAD“"
|
||||
|
||||
#: builtin/branch.c:878 builtin/clone.c:629
|
||||
#: builtin/branch.c:878 builtin/clone.c:622
|
||||
msgid "HEAD not found below refs/heads!"
|
||||
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
|
||||
|
||||
|
|
@ -3543,7 +3544,7 @@ msgstr "изчитане на имената на файловете от ста
|
|||
msgid "terminate input and output records by a NUL character"
|
||||
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
|
||||
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
|
||||
msgid "suppress progress reporting"
|
||||
msgstr "без показване на напредъка"
|
||||
|
||||
|
|
@ -3643,117 +3644,116 @@ msgstr "при създаването на нови файлове да се д
|
|||
msgid "copy out the files from named stage"
|
||||
msgstr "копиране на файловете от това състояние на сливане"
|
||||
|
||||
#: builtin/checkout.c:26
|
||||
#: builtin/checkout.c:24
|
||||
msgid "git checkout [<options>] <branch>"
|
||||
msgstr "git checkout [ОПЦИЯ…] КЛОН"
|
||||
|
||||
#: builtin/checkout.c:27
|
||||
#: builtin/checkout.c:25
|
||||
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
||||
msgstr "git checkout [ОПЦИЯ…] [КЛОН] -- ФАЙЛ…"
|
||||
|
||||
#: builtin/checkout.c:138 builtin/checkout.c:171
|
||||
#: builtin/checkout.c:134 builtin/checkout.c:167
|
||||
#, c-format
|
||||
msgid "path '%s' does not have our version"
|
||||
msgstr "вашата версия липсва в пътя „%s“"
|
||||
|
||||
#: builtin/checkout.c:140 builtin/checkout.c:173
|
||||
#: builtin/checkout.c:136 builtin/checkout.c:169
|
||||
#, c-format
|
||||
msgid "path '%s' does not have their version"
|
||||
msgstr "чуждата версия липсва в пътя „%s“"
|
||||
|
||||
# FIXME SAME AS [1]
|
||||
#: builtin/checkout.c:156
|
||||
#: builtin/checkout.c:152
|
||||
#, c-format
|
||||
msgid "path '%s' does not have all necessary versions"
|
||||
msgstr "някоя от необходимите версии липсва в пътя „%s“"
|
||||
|
||||
# FIXME SAME AS [1]
|
||||
#: builtin/checkout.c:200
|
||||
#: builtin/checkout.c:196
|
||||
#, c-format
|
||||
msgid "path '%s' does not have necessary versions"
|
||||
msgstr "някоя от необходимите версии липсва в пътя „%s“"
|
||||
|
||||
#: builtin/checkout.c:217
|
||||
#: builtin/checkout.c:213
|
||||
#, c-format
|
||||
msgid "path '%s': cannot merge"
|
||||
msgstr "пътят „%s“ не може да бъде слян"
|
||||
|
||||
#: builtin/checkout.c:234
|
||||
#: builtin/checkout.c:230
|
||||
#, c-format
|
||||
msgid "Unable to add merge result for '%s'"
|
||||
msgstr "Резултатът за „%s“ не може да бъде слян"
|
||||
|
||||
#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
|
||||
#: builtin/checkout.c:264 builtin/checkout.c:277
|
||||
#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
|
||||
#: builtin/checkout.c:260
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with updating paths"
|
||||
msgstr "Опцията „%s“ е несъвместима с обновяването на пътища"
|
||||
|
||||
#: builtin/checkout.c:267 builtin/checkout.c:270
|
||||
#: builtin/checkout.c:263 builtin/checkout.c:266
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with %s"
|
||||
msgstr "Опцията „%s“ е несъвместима с „%s“"
|
||||
|
||||
#: builtin/checkout.c:273
|
||||
#: builtin/checkout.c:269
|
||||
#, c-format
|
||||
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
||||
msgstr ""
|
||||
"Невъзможно е едновременно да обновявате пътища и да се прехвърлите към клона "
|
||||
"„%s“."
|
||||
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
|
||||
|
||||
#: builtin/checkout.c:287 builtin/checkout.c:481
|
||||
#: builtin/checkout.c:280 builtin/checkout.c:474
|
||||
msgid "corrupt index file"
|
||||
msgstr "повреден файл на индекса"
|
||||
|
||||
#: builtin/checkout.c:347 builtin/checkout.c:354
|
||||
#: builtin/checkout.c:340 builtin/checkout.c:347
|
||||
#, c-format
|
||||
msgid "path '%s' is unmerged"
|
||||
msgstr "пътят „%s“ не е слят"
|
||||
|
||||
#: builtin/checkout.c:503
|
||||
#: builtin/checkout.c:496
|
||||
msgid "you need to resolve your current index first"
|
||||
msgstr "първо трябва да коригирате индекса си"
|
||||
|
||||
#: builtin/checkout.c:634
|
||||
#: builtin/checkout.c:627
|
||||
#, c-format
|
||||
msgid "Can not do reflog for '%s'\n"
|
||||
msgstr "Журналът на указателите за „%s“ не може да бъде създаден\n"
|
||||
|
||||
#: builtin/checkout.c:670
|
||||
#: builtin/checkout.c:663
|
||||
msgid "HEAD is now at"
|
||||
msgstr "Указателят „HEAD“ в момента сочи към"
|
||||
|
||||
#: builtin/checkout.c:677
|
||||
#: builtin/checkout.c:670
|
||||
#, c-format
|
||||
msgid "Reset branch '%s'\n"
|
||||
msgstr "Зануляване на клона „%s“\n"
|
||||
|
||||
#: builtin/checkout.c:680
|
||||
#: builtin/checkout.c:673
|
||||
#, c-format
|
||||
msgid "Already on '%s'\n"
|
||||
msgstr "Вече сте на „%s“\n"
|
||||
|
||||
#: builtin/checkout.c:684
|
||||
#: builtin/checkout.c:677
|
||||
#, c-format
|
||||
msgid "Switched to and reset branch '%s'\n"
|
||||
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
|
||||
|
||||
#: builtin/checkout.c:686 builtin/checkout.c:1285
|
||||
#: builtin/checkout.c:679 builtin/checkout.c:1134
|
||||
#, c-format
|
||||
msgid "Switched to a new branch '%s'\n"
|
||||
msgstr "Преминахте към новия клон „%s“\n"
|
||||
|
||||
#: builtin/checkout.c:688
|
||||
#: builtin/checkout.c:681
|
||||
#, c-format
|
||||
msgid "Switched to branch '%s'\n"
|
||||
msgstr "Преминахте към клона „%s“\n"
|
||||
|
||||
#: builtin/checkout.c:740
|
||||
#: builtin/checkout.c:733
|
||||
#, c-format
|
||||
msgid " ... and %d more.\n"
|
||||
msgstr "… и още %d.\n"
|
||||
|
||||
#: builtin/checkout.c:746
|
||||
#: builtin/checkout.c:739
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Warning: you are leaving %d commit behind, not connected to\n"
|
||||
|
|
@ -3775,7 +3775,7 @@ msgstr[1] ""
|
|||
"\n"
|
||||
"%s\n"
|
||||
|
||||
#: builtin/checkout.c:765
|
||||
#: builtin/checkout.c:758
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you want to keep it by creating a new branch, this may be a good time\n"
|
||||
|
|
@ -3802,181 +3802,153 @@ msgstr[1] ""
|
|||
" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/checkout.c:801
|
||||
#: builtin/checkout.c:794
|
||||
msgid "internal error in revision walk"
|
||||
msgstr "вътрешна грешка при обхождането на версиите"
|
||||
|
||||
#: builtin/checkout.c:805
|
||||
#: builtin/checkout.c:798
|
||||
msgid "Previous HEAD position was"
|
||||
msgstr "Преди това „HEAD“ сочеше към"
|
||||
|
||||
#: builtin/checkout.c:832 builtin/checkout.c:1280
|
||||
#: builtin/checkout.c:825 builtin/checkout.c:1129
|
||||
msgid "You are on a branch yet to be born"
|
||||
msgstr "В момента сте на клон, който предстои да бъде създаден"
|
||||
|
||||
#: builtin/checkout.c:893
|
||||
msgid "no branch specified"
|
||||
msgstr "не е указано име на клон"
|
||||
|
||||
#: builtin/checkout.c:895
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "„%s“ вече съществува"
|
||||
|
||||
#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
|
||||
#: builtin/clone.c:853
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
|
||||
|
||||
#: builtin/checkout.c:924
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "директорията „%s“ не може да бъде създадена"
|
||||
|
||||
#: builtin/checkout.c:960
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Въведете %s (идентификатор %s)"
|
||||
|
||||
#: builtin/checkout.c:1070
|
||||
#: builtin/checkout.c:931
|
||||
#, c-format
|
||||
msgid "'%s' is already checked out at '%s'"
|
||||
msgstr "„%s“ вече е изтеглен в „%s“"
|
||||
|
||||
#: builtin/checkout.c:1176
|
||||
#: builtin/checkout.c:1036
|
||||
#, c-format
|
||||
msgid "only one reference expected, %d given."
|
||||
msgstr "очакваше се един указател, а сте подали %d."
|
||||
|
||||
#: builtin/checkout.c:1215
|
||||
#: builtin/checkout.c:1075
|
||||
#, c-format
|
||||
msgid "invalid reference: %s"
|
||||
msgstr "неправилен указател: %s"
|
||||
|
||||
#: builtin/checkout.c:1255
|
||||
#: builtin/checkout.c:1104
|
||||
#, c-format
|
||||
msgid "reference is not a tree: %s"
|
||||
msgstr "указателят не сочи към обект-дърво: %s"
|
||||
|
||||
#: builtin/checkout.c:1294
|
||||
#: builtin/checkout.c:1143
|
||||
msgid "paths cannot be used with switching branches"
|
||||
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
|
||||
|
||||
#: builtin/checkout.c:1297 builtin/checkout.c:1301
|
||||
#: builtin/checkout.c:1146 builtin/checkout.c:1150
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with switching branches"
|
||||
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
|
||||
|
||||
#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
|
||||
#: builtin/checkout.c:1316
|
||||
#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
|
||||
#: builtin/checkout.c:1165
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with '%s'"
|
||||
msgstr "опцията „%s“ е несъвместима с „%s“"
|
||||
|
||||
#: builtin/checkout.c:1321
|
||||
#: builtin/checkout.c:1170
|
||||
#, c-format
|
||||
msgid "Cannot switch branch to a non-commit '%s'"
|
||||
msgstr ""
|
||||
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ не "
|
||||
"е такъв"
|
||||
|
||||
#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161
|
||||
#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
|
||||
#: builtin/worktree.c:284
|
||||
msgid "branch"
|
||||
msgstr "клон"
|
||||
|
||||
#: builtin/checkout.c:1347
|
||||
#: builtin/checkout.c:1204
|
||||
msgid "create and checkout a new branch"
|
||||
msgstr "създаване и преминаване към нов клон"
|
||||
|
||||
#: builtin/checkout.c:1349
|
||||
#: builtin/checkout.c:1206
|
||||
msgid "create/reset and checkout a branch"
|
||||
msgstr "създаване/зануляване на клон и преминаване към него"
|
||||
|
||||
#: builtin/checkout.c:1350
|
||||
#: builtin/checkout.c:1207
|
||||
msgid "create reflog for new branch"
|
||||
msgstr "създаване на журнал на указателите за нов клон"
|
||||
|
||||
#: builtin/checkout.c:1351
|
||||
#: builtin/checkout.c:1208
|
||||
msgid "detach the HEAD at named commit"
|
||||
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
|
||||
|
||||
#: builtin/checkout.c:1352
|
||||
#: builtin/checkout.c:1209
|
||||
msgid "set upstream info for new branch"
|
||||
msgstr "задаване на кой клон бива следен при създаването на новия клон"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new-branch"
|
||||
msgstr "НОВ_КЛОН"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new unparented branch"
|
||||
msgstr "нов клон без родител"
|
||||
|
||||
#: builtin/checkout.c:1355
|
||||
#: builtin/checkout.c:1212
|
||||
msgid "checkout our version for unmerged files"
|
||||
msgstr "изтегляне на вашата версия на неслетите файлове"
|
||||
|
||||
#: builtin/checkout.c:1357
|
||||
#: builtin/checkout.c:1214
|
||||
msgid "checkout their version for unmerged files"
|
||||
msgstr "изтегляне на чуждата версия на неслетите файлове"
|
||||
|
||||
#: builtin/checkout.c:1359
|
||||
#: builtin/checkout.c:1216
|
||||
msgid "force checkout (throw away local modifications)"
|
||||
msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
|
||||
|
||||
#: builtin/checkout.c:1360
|
||||
#: builtin/checkout.c:1217
|
||||
msgid "perform a 3-way merge with the new branch"
|
||||
msgstr "извършване на тройно сливане с новия клон"
|
||||
|
||||
#: builtin/checkout.c:1361 builtin/merge.c:227
|
||||
#: builtin/checkout.c:1218 builtin/merge.c:227
|
||||
msgid "update ignored files (default)"
|
||||
msgstr "обновяване на игнорираните файлове (стандартно)"
|
||||
|
||||
#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
|
||||
#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
|
||||
msgid "style"
|
||||
msgstr "стил"
|
||||
|
||||
#: builtin/checkout.c:1363
|
||||
#: builtin/checkout.c:1220
|
||||
msgid "conflict style (merge or diff3)"
|
||||
msgstr "действие при конфликт (сливане или тройна разлика)"
|
||||
|
||||
#: builtin/checkout.c:1366
|
||||
#: builtin/checkout.c:1223
|
||||
msgid "do not limit pathspecs to sparse entries only"
|
||||
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
|
||||
|
||||
#: builtin/checkout.c:1368
|
||||
#: builtin/checkout.c:1225
|
||||
msgid "second guess 'git checkout <no-such-branch>'"
|
||||
msgstr ""
|
||||
"опит за отгатване на име на клон след неуспешен опит с „git checkout "
|
||||
"НЕСЪЩЕСТВУВАЩ_КЛОН“"
|
||||
|
||||
#: builtin/checkout.c:1370
|
||||
msgid "check a branch out in a separate working directory"
|
||||
msgstr "изтегляне на клон в отделно работно дърво"
|
||||
|
||||
#: builtin/checkout.c:1372
|
||||
#: builtin/checkout.c:1227
|
||||
msgid "do not check if another worktree is holding the given ref"
|
||||
msgstr "без проверка дали друго работно дърво държи указателя"
|
||||
|
||||
#: builtin/checkout.c:1406
|
||||
#: builtin/checkout.c:1252
|
||||
msgid "-b, -B and --orphan are mutually exclusive"
|
||||
msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга"
|
||||
|
||||
#: builtin/checkout.c:1423
|
||||
#: builtin/checkout.c:1269
|
||||
msgid "--track needs a branch name"
|
||||
msgstr "опцията „--track“ изисква име на клон"
|
||||
|
||||
#: builtin/checkout.c:1428
|
||||
#: builtin/checkout.c:1274
|
||||
msgid "Missing branch name; try -b"
|
||||
msgstr "Липсва име на клон, използвайте опцията „-b“"
|
||||
|
||||
#: builtin/checkout.c:1464
|
||||
#: builtin/checkout.c:1310
|
||||
msgid "invalid path specification"
|
||||
msgstr "указан е неправилен път"
|
||||
|
||||
#: builtin/checkout.c:1471
|
||||
#: builtin/checkout.c:1317
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot update paths and switch to branch '%s' at the same time.\n"
|
||||
|
|
@ -3985,12 +3957,12 @@ msgstr ""
|
|||
"Не можете едновременно да обновявате пътища и да преминете към клона „%s“.\n"
|
||||
"Дали не искате да изтеглите „%s“, който не сочи към подаване?"
|
||||
|
||||
#: builtin/checkout.c:1476
|
||||
#: builtin/checkout.c:1322
|
||||
#, c-format
|
||||
msgid "git checkout: --detach does not take a path argument '%s'"
|
||||
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
|
||||
|
||||
#: builtin/checkout.c:1480
|
||||
#: builtin/checkout.c:1326
|
||||
msgid ""
|
||||
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
||||
"checking out of the index."
|
||||
|
|
@ -4284,57 +4256,57 @@ msgstr "КЛЮЧ=СТОЙНОСТ"
|
|||
msgid "set config inside the new repository"
|
||||
msgstr "задаване на настройките на новото хранилище"
|
||||
|
||||
#: builtin/clone.c:247
|
||||
#: builtin/clone.c:240
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is not a local repository."
|
||||
msgstr "еталонното хранилище „%s“ не е локално"
|
||||
|
||||
#: builtin/clone.c:251
|
||||
#: builtin/clone.c:244
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is shallow"
|
||||
msgstr "еталонното хранилище „%s“ е плитко"
|
||||
|
||||
#: builtin/clone.c:254
|
||||
#: builtin/clone.c:247
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is grafted"
|
||||
msgstr "еталонното хранилище „%s“ е с присаждане"
|
||||
|
||||
#: builtin/clone.c:317
|
||||
#: builtin/clone.c:310
|
||||
#, c-format
|
||||
msgid "failed to create directory '%s'"
|
||||
msgstr "директорията „%s“ не може да бъде създадена"
|
||||
|
||||
#: builtin/clone.c:319 builtin/diff.c:84
|
||||
#: builtin/clone.c:312 builtin/diff.c:84
|
||||
#, c-format
|
||||
msgid "failed to stat '%s'"
|
||||
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
|
||||
|
||||
#: builtin/clone.c:321
|
||||
#: builtin/clone.c:314
|
||||
#, c-format
|
||||
msgid "%s exists and is not a directory"
|
||||
msgstr "„%s“ съществува и не е директория"
|
||||
|
||||
#: builtin/clone.c:335
|
||||
#: builtin/clone.c:328
|
||||
#, c-format
|
||||
msgid "failed to stat %s\n"
|
||||
msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n"
|
||||
|
||||
#: builtin/clone.c:357
|
||||
#: builtin/clone.c:350
|
||||
#, c-format
|
||||
msgid "failed to create link '%s'"
|
||||
msgstr "връзката „%s“ не може да бъде създадена"
|
||||
|
||||
#: builtin/clone.c:361
|
||||
#: builtin/clone.c:354
|
||||
#, c-format
|
||||
msgid "failed to copy file to '%s'"
|
||||
msgstr "файлът не може да бъде копиран като „%s“"
|
||||
|
||||
#: builtin/clone.c:384 builtin/clone.c:558
|
||||
#: builtin/clone.c:377 builtin/clone.c:551
|
||||
#, c-format
|
||||
msgid "done.\n"
|
||||
msgstr "действието завърши.\n"
|
||||
|
||||
#: builtin/clone.c:396
|
||||
#: builtin/clone.c:389
|
||||
msgid ""
|
||||
"Clone succeeded, but checkout failed.\n"
|
||||
"You can inspect what was checked out with 'git status'\n"
|
||||
|
|
@ -4345,7 +4317,7 @@ msgstr ""
|
|||
"клон в момента са изтеглени с командата „git status“. Можете да\n"
|
||||
"завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n"
|
||||
|
||||
#: builtin/clone.c:473
|
||||
#: builtin/clone.c:466
|
||||
#, c-format
|
||||
msgid "Could not find remote branch %s to clone."
|
||||
msgstr ""
|
||||
|
|
@ -4353,114 +4325,120 @@ msgstr ""
|
|||
"и който следва да бъде изтеглен, не съществува."
|
||||
|
||||
# FIXME translator note that the space at end is necesssary
|
||||
#: builtin/clone.c:553
|
||||
#: builtin/clone.c:546
|
||||
#, c-format
|
||||
msgid "Checking connectivity... "
|
||||
msgstr "Проверка на връзката… "
|
||||
|
||||
#: builtin/clone.c:556
|
||||
#: builtin/clone.c:549
|
||||
msgid "remote did not send all necessary objects"
|
||||
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
|
||||
|
||||
#: builtin/clone.c:620
|
||||
#: builtin/clone.c:613
|
||||
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
||||
msgstr ""
|
||||
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
|
||||
"което не съществува. Не може да се изтегли определен клон.\n"
|
||||
|
||||
#: builtin/clone.c:651
|
||||
#: builtin/clone.c:644
|
||||
msgid "unable to checkout working tree"
|
||||
msgstr "работното дърво не може да бъде подготвено"
|
||||
|
||||
#: builtin/clone.c:738
|
||||
#: builtin/clone.c:731
|
||||
msgid "cannot repack to clean up"
|
||||
msgstr "не може да се извърши пакетиране за изчистване на файловете"
|
||||
|
||||
#: builtin/clone.c:740
|
||||
#: builtin/clone.c:733
|
||||
msgid "cannot unlink temporary alternates file"
|
||||
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
|
||||
|
||||
#: builtin/clone.c:770
|
||||
#: builtin/clone.c:763
|
||||
msgid "Too many arguments."
|
||||
msgstr "Прекалено много аргументи."
|
||||
|
||||
#: builtin/clone.c:774
|
||||
#: builtin/clone.c:767
|
||||
msgid "You must specify a repository to clone."
|
||||
msgstr "Трябва да укажете кое хранилище искате да клонирате."
|
||||
|
||||
#: builtin/clone.c:785
|
||||
#: builtin/clone.c:778
|
||||
#, c-format
|
||||
msgid "--bare and --origin %s options are incompatible."
|
||||
msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
|
||||
|
||||
#: builtin/clone.c:788
|
||||
#: builtin/clone.c:781
|
||||
msgid "--bare and --separate-git-dir are incompatible."
|
||||
msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
|
||||
|
||||
#: builtin/clone.c:801
|
||||
#: builtin/clone.c:794
|
||||
#, c-format
|
||||
msgid "repository '%s' does not exist"
|
||||
msgstr "не съществува хранилище „%s“"
|
||||
|
||||
#: builtin/clone.c:807 builtin/fetch.c:1160
|
||||
#: builtin/clone.c:800 builtin/fetch.c:1160
|
||||
#, c-format
|
||||
msgid "depth %s is not a positive number"
|
||||
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
|
||||
|
||||
#: builtin/clone.c:817
|
||||
#: builtin/clone.c:810
|
||||
#, c-format
|
||||
msgid "destination path '%s' already exists and is not an empty directory."
|
||||
msgstr "целевият път „%s“ съществува и не е празна директория."
|
||||
|
||||
#: builtin/clone.c:827
|
||||
#: builtin/clone.c:820
|
||||
#, c-format
|
||||
msgid "working tree '%s' already exists."
|
||||
msgstr "в „%s“ вече съществува работно дърво."
|
||||
|
||||
#: builtin/clone.c:845
|
||||
#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
|
||||
#: builtin/worktree.c:220
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
|
||||
|
||||
#: builtin/clone.c:838
|
||||
#, c-format
|
||||
msgid "could not create work tree dir '%s'"
|
||||
msgstr "работното дърво в „%s“ не може да бъде създадено."
|
||||
|
||||
#: builtin/clone.c:863
|
||||
#: builtin/clone.c:856
|
||||
#, c-format
|
||||
msgid "Cloning into bare repository '%s'...\n"
|
||||
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
|
||||
|
||||
#: builtin/clone.c:865
|
||||
#: builtin/clone.c:858
|
||||
#, c-format
|
||||
msgid "Cloning into '%s'...\n"
|
||||
msgstr "Клониране и създаване на хранилище в „%s“…\n"
|
||||
|
||||
#: builtin/clone.c:890
|
||||
#: builtin/clone.c:883
|
||||
msgid "--dissociate given, but there is no --reference"
|
||||
msgstr "Опцията „--dissociate“ е несъвместима с „--reference“"
|
||||
|
||||
#: builtin/clone.c:907
|
||||
#: builtin/clone.c:900
|
||||
msgid "--depth is ignored in local clones; use file:// instead."
|
||||
msgstr ""
|
||||
"При локално клониране опцията „--depth“ се игнорира. Ползвайте схемата "
|
||||
"„file://“."
|
||||
|
||||
#: builtin/clone.c:910
|
||||
#: builtin/clone.c:903
|
||||
msgid "source repository is shallow, ignoring --local"
|
||||
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се игнорира"
|
||||
|
||||
#: builtin/clone.c:915
|
||||
#: builtin/clone.c:908
|
||||
msgid "--local is ignored"
|
||||
msgstr "опцията „--local“ се игнорира"
|
||||
|
||||
#: builtin/clone.c:919
|
||||
#: builtin/clone.c:912
|
||||
#, c-format
|
||||
msgid "Don't know how to clone %s"
|
||||
msgstr "Не се поддържа клониране на връзки от вида „%s“ "
|
||||
|
||||
#: builtin/clone.c:968 builtin/clone.c:976
|
||||
#: builtin/clone.c:961 builtin/clone.c:969
|
||||
#, c-format
|
||||
msgid "Remote branch %s not found in upstream %s"
|
||||
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
|
||||
|
||||
#: builtin/clone.c:979
|
||||
#: builtin/clone.c:972
|
||||
msgid "You appear to have cloned an empty repository."
|
||||
msgstr "Изглежда клонирахте празно хранилище."
|
||||
|
||||
|
|
@ -5877,7 +5855,7 @@ msgstr "ключ"
|
|||
msgid "field name to sort on"
|
||||
msgstr "име на полето, по което да е подредбата"
|
||||
|
||||
#: builtin/fsck.c:147 builtin/prune.c:236
|
||||
#: builtin/fsck.c:147 builtin/prune.c:137
|
||||
msgid "Checking connectivity"
|
||||
msgstr "Проверка на връзката"
|
||||
|
||||
|
|
@ -5926,7 +5904,7 @@ msgstr "по-строги проверки"
|
|||
msgid "write dangling objects in .git/lost-found"
|
||||
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
|
||||
|
||||
#: builtin/fsck.c:627 builtin/prune.c:198
|
||||
#: builtin/fsck.c:627 builtin/prune.c:107
|
||||
msgid "show progress"
|
||||
msgstr "показване на напредъка"
|
||||
|
||||
|
|
@ -8501,63 +8479,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|||
msgid "Removing duplicate objects"
|
||||
msgstr "Изтриване на повтарящите се обекти"
|
||||
|
||||
#: builtin/prune.c:12
|
||||
#: builtin/prune.c:11
|
||||
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
||||
msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
|
||||
|
||||
#: builtin/prune.c:86
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория"
|
||||
|
||||
#: builtin/prune.c:92
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува"
|
||||
|
||||
#: builtin/prune.c:97
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr ""
|
||||
"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
|
||||
|
||||
#: builtin/prune.c:108
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
|
||||
|
||||
#: builtin/prune.c:124
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr ""
|
||||
"Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо "
|
||||
"местоположение"
|
||||
|
||||
#: builtin/prune.c:159
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "„%s“ не може да се изтрие"
|
||||
|
||||
#: builtin/prune.c:196
|
||||
#: builtin/prune.c:105 builtin/worktree.c:112
|
||||
msgid "do not remove, show only"
|
||||
msgstr "само извеждане без действително окастряне"
|
||||
|
||||
#: builtin/prune.c:197
|
||||
#: builtin/prune.c:106 builtin/worktree.c:113
|
||||
msgid "report pruned objects"
|
||||
msgstr "информация за окастрените обекти"
|
||||
|
||||
#: builtin/prune.c:199
|
||||
msgid "prune .git/worktrees"
|
||||
msgstr "окастряне на „.git/worktrees“"
|
||||
|
||||
#: builtin/prune.c:201
|
||||
#: builtin/prune.c:109 builtin/worktree.c:115
|
||||
msgid "expire objects older than <time>"
|
||||
msgstr "окастряне на обектите по-стари от това ВРЕМЕ"
|
||||
|
||||
#: builtin/prune.c:216
|
||||
msgid "--worktrees does not take extra arguments"
|
||||
msgstr "опцията „--worktrees“ не приема допълнителни аргументи"
|
||||
|
||||
#: builtin/push.c:14
|
||||
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
||||
msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
|
||||
|
|
@ -10743,6 +10680,86 @@ msgstr "git verify-tag [-v | --verbose] ЕТИКЕТ…"
|
|||
msgid "print tag contents"
|
||||
msgstr "извеждане на съдържанието на ЕТИКЕТи"
|
||||
|
||||
#: builtin/worktree.c:11
|
||||
msgid "git worktree add [<options>] <path> <branch>"
|
||||
msgstr "git worktree add [ОПЦИЯ…] ПЪТ КЛОН"
|
||||
|
||||
#: builtin/worktree.c:12
|
||||
msgid "git worktree prune [<options>]"
|
||||
msgstr "git worktree prune [ОПЦИЯ…]"
|
||||
|
||||
#: builtin/worktree.c:27
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория"
|
||||
|
||||
#: builtin/worktree.c:33
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува"
|
||||
|
||||
#: builtin/worktree.c:38
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr ""
|
||||
"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
|
||||
|
||||
#: builtin/worktree.c:49
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
|
||||
|
||||
#: builtin/worktree.c:65
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr ""
|
||||
"Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо "
|
||||
"местоположение"
|
||||
|
||||
#: builtin/worktree.c:100
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "„%s“ не може да се изтрие"
|
||||
|
||||
#: builtin/worktree.c:186
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "„%s“ вече съществува"
|
||||
|
||||
#: builtin/worktree.c:207
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "директорията „%s“ не може да бъде създадена"
|
||||
|
||||
#: builtin/worktree.c:241
|
||||
msgid "unable to resolve HEAD"
|
||||
msgstr "соченото от указателя „HEAD“ не може да бъде открито"
|
||||
|
||||
#: builtin/worktree.c:249
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Въведете %s (идентификатор %s)"
|
||||
|
||||
#: builtin/worktree.c:281
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
|
||||
|
||||
#: builtin/worktree.c:283
|
||||
msgid "create a new branch"
|
||||
msgstr "създаване на нов клон"
|
||||
|
||||
#: builtin/worktree.c:285
|
||||
msgid "create or reset a branch"
|
||||
msgstr "създаване или зануляване на клони"
|
||||
|
||||
#: builtin/worktree.c:286
|
||||
msgid "detach HEAD at named commit"
|
||||
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
|
||||
|
||||
#: builtin/worktree.c:292
|
||||
msgid "-b and -B are mutually exclusive"
|
||||
msgstr "опциите „-b“ и „-B“ са несъвместими"
|
||||
|
||||
#: builtin/write-tree.c:13
|
||||
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
||||
msgstr "git write-tree [--missing-ok] [--prefix=ПРЕФИКС/]"
|
||||
|
|
@ -10809,8 +10826,9 @@ msgid "List, create, or delete branches"
|
|||
msgstr "Извеждане, създаване, изтриване на клони"
|
||||
|
||||
#: common-cmds.h:21
|
||||
msgid "Checkout a branch or paths to the working tree"
|
||||
msgstr "Изтегляне на цял клон или файлове/директории в работното дърво"
|
||||
msgid "Switch branches or restore working tree files"
|
||||
msgstr ""
|
||||
"Преминаване към друг клон или възстановяване на файловете в работното дърво"
|
||||
|
||||
#: common-cmds.h:22
|
||||
msgid "Clone a repository into a new directory"
|
||||
|
|
|
|||
391
po/ca.po
391
po/ca.po
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2015-06-27 19:17+0800\n"
|
||||
"PO-Revision-Date: 2015-07-01 22:21-0700\n"
|
||||
"POT-Creation-Date: 2015-07-14 07:19+0800\n"
|
||||
"PO-Revision-Date: 2015-07-20 11:54-0600\n"
|
||||
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
|
||||
"Language-Team: Catalan\n"
|
||||
"Language: ca\n"
|
||||
|
|
@ -16,7 +16,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"X-Generator: Poedit 1.8.1\n"
|
||||
"X-Generator: Poedit 1.8.2\n"
|
||||
|
||||
#: advice.c:55
|
||||
#, c-format
|
||||
|
|
@ -662,8 +662,8 @@ msgstr "BUG: reobrir un fitxer de bloqueig que s'ha comès"
|
|||
msgid "failed to read the cache"
|
||||
msgstr "s'ha fallat en llegir la memòria cau"
|
||||
|
||||
#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
|
||||
#: builtin/clone.c:654
|
||||
#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
|
||||
#: builtin/clone.c:647
|
||||
msgid "unable to write new index file"
|
||||
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
|
||||
|
||||
|
|
@ -710,7 +710,7 @@ msgstr "no es pot llegir l'objecte %s '%s'"
|
|||
msgid "blob expected for %s '%s'"
|
||||
msgstr "blob esperat per a %s '%s'"
|
||||
|
||||
#: merge-recursive.c:788 builtin/clone.c:313
|
||||
#: merge-recursive.c:788 builtin/clone.c:306
|
||||
#, c-format
|
||||
msgid "failed to open '%s'"
|
||||
msgstr "s'ha fallat en obrir '%s'"
|
||||
|
|
@ -2047,7 +2047,7 @@ msgstr "no hi és"
|
|||
msgid "behind "
|
||||
msgstr "darrere "
|
||||
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:352
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:345
|
||||
#, c-format
|
||||
msgid "failed to unlink '%s'"
|
||||
msgstr "s'ha fallat en desenllaçar '%s'"
|
||||
|
|
@ -2126,7 +2126,7 @@ msgstr "sigues detallat"
|
|||
msgid "interactive picking"
|
||||
msgstr "recull interactiu"
|
||||
|
||||
#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
|
||||
#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
|
||||
msgid "select hunks interactively"
|
||||
msgstr "selecciona els trossos interactivament"
|
||||
|
||||
|
|
@ -2470,7 +2470,7 @@ msgstr "%s: el pedaç no aplica"
|
|||
msgid "Checking patch %s..."
|
||||
msgstr "Comprovant el pedaç %s..."
|
||||
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
|
||||
#, c-format
|
||||
msgid "make_cache_entry failed for path '%s'"
|
||||
msgstr "make_cache_entry ha fallat per al camí '%s'"
|
||||
|
|
@ -3179,7 +3179,7 @@ msgstr "llista les branques en columnes"
|
|||
msgid "Failed to resolve HEAD as a valid ref."
|
||||
msgstr "S'ha fallat en resoldre HEAD com a referència vàlida."
|
||||
|
||||
#: builtin/branch.c:878 builtin/clone.c:629
|
||||
#: builtin/branch.c:878 builtin/clone.c:622
|
||||
msgid "HEAD not found below refs/heads!"
|
||||
msgstr "HEAD no trobat sota refs/heads!"
|
||||
|
||||
|
|
@ -3383,7 +3383,7 @@ msgstr "llegeix els noms de fitxer d'stdin"
|
|||
msgid "terminate input and output records by a NUL character"
|
||||
msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
|
||||
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
|
||||
msgid "suppress progress reporting"
|
||||
msgstr "omet el reportatge de progrés"
|
||||
|
||||
|
|
@ -3480,114 +3480,114 @@ msgstr "en crear fitxers, anteposa <cadena>"
|
|||
msgid "copy out the files from named stage"
|
||||
msgstr "copia els fitxers des de l'etapa anomenada"
|
||||
|
||||
#: builtin/checkout.c:26
|
||||
#: builtin/checkout.c:24
|
||||
msgid "git checkout [<options>] <branch>"
|
||||
msgstr "git checkout [<opcions>] <branca>"
|
||||
|
||||
#: builtin/checkout.c:27
|
||||
#: builtin/checkout.c:25
|
||||
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
||||
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
|
||||
|
||||
#: builtin/checkout.c:138 builtin/checkout.c:171
|
||||
#: builtin/checkout.c:134 builtin/checkout.c:167
|
||||
#, c-format
|
||||
msgid "path '%s' does not have our version"
|
||||
msgstr "el camí '%s' no té la versió nostra"
|
||||
|
||||
#: builtin/checkout.c:140 builtin/checkout.c:173
|
||||
#: builtin/checkout.c:136 builtin/checkout.c:169
|
||||
#, c-format
|
||||
msgid "path '%s' does not have their version"
|
||||
msgstr "el camí '%s' no té la versió seva"
|
||||
|
||||
#: builtin/checkout.c:156
|
||||
#: builtin/checkout.c:152
|
||||
#, c-format
|
||||
msgid "path '%s' does not have all necessary versions"
|
||||
msgstr "el camí '%s' no té totes les versions necessàries"
|
||||
|
||||
#: builtin/checkout.c:200
|
||||
#: builtin/checkout.c:196
|
||||
#, c-format
|
||||
msgid "path '%s' does not have necessary versions"
|
||||
msgstr "el camí '%s' no té les versions necessàries"
|
||||
|
||||
#: builtin/checkout.c:217
|
||||
#: builtin/checkout.c:213
|
||||
#, c-format
|
||||
msgid "path '%s': cannot merge"
|
||||
msgstr "camí '%s': no es pot fusionar"
|
||||
|
||||
#: builtin/checkout.c:234
|
||||
#: builtin/checkout.c:230
|
||||
#, c-format
|
||||
msgid "Unable to add merge result for '%s'"
|
||||
msgstr "no s'ha pogut afegir el resultat de fusió per a '%s'"
|
||||
|
||||
#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
|
||||
#: builtin/checkout.c:264 builtin/checkout.c:277
|
||||
#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
|
||||
#: builtin/checkout.c:260
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with updating paths"
|
||||
msgstr "'%s' no es pot usar amb actualització de camins"
|
||||
|
||||
#: builtin/checkout.c:267 builtin/checkout.c:270
|
||||
#: builtin/checkout.c:263 builtin/checkout.c:266
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with %s"
|
||||
msgstr "'%s' no es pot usar amb %s"
|
||||
|
||||
#: builtin/checkout.c:273
|
||||
#: builtin/checkout.c:269
|
||||
#, c-format
|
||||
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
||||
msgstr ""
|
||||
"No es pot actualitzar els camins i canviar a la branca '%s' a la vegada."
|
||||
|
||||
#: builtin/checkout.c:287 builtin/checkout.c:481
|
||||
#: builtin/checkout.c:280 builtin/checkout.c:474
|
||||
msgid "corrupt index file"
|
||||
msgstr "fitxer d'índex corrupte"
|
||||
|
||||
#: builtin/checkout.c:347 builtin/checkout.c:354
|
||||
#: builtin/checkout.c:340 builtin/checkout.c:347
|
||||
#, c-format
|
||||
msgid "path '%s' is unmerged"
|
||||
msgstr "el camí '%s' està sense fusionar"
|
||||
|
||||
#: builtin/checkout.c:503
|
||||
#: builtin/checkout.c:496
|
||||
msgid "you need to resolve your current index first"
|
||||
msgstr "heu de resoldre el vostre índex actual primer"
|
||||
|
||||
#: builtin/checkout.c:634
|
||||
#: builtin/checkout.c:627
|
||||
#, c-format
|
||||
msgid "Can not do reflog for '%s'\n"
|
||||
msgstr "No es pot fer reflog per a '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:670
|
||||
#: builtin/checkout.c:663
|
||||
msgid "HEAD is now at"
|
||||
msgstr "HEAD ara és a"
|
||||
|
||||
#: builtin/checkout.c:677
|
||||
#: builtin/checkout.c:670
|
||||
#, c-format
|
||||
msgid "Reset branch '%s'\n"
|
||||
msgstr "Restableix la branca '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:680
|
||||
#: builtin/checkout.c:673
|
||||
#, c-format
|
||||
msgid "Already on '%s'\n"
|
||||
msgstr "Ja en '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:684
|
||||
#: builtin/checkout.c:677
|
||||
#, c-format
|
||||
msgid "Switched to and reset branch '%s'\n"
|
||||
msgstr "S'ha agafat i restablert la branca '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:686 builtin/checkout.c:1285
|
||||
#: builtin/checkout.c:679 builtin/checkout.c:1134
|
||||
#, c-format
|
||||
msgid "Switched to a new branch '%s'\n"
|
||||
msgstr "S'ha agafat la branca nova '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:688
|
||||
#: builtin/checkout.c:681
|
||||
#, c-format
|
||||
msgid "Switched to branch '%s'\n"
|
||||
msgstr "S'ha agafat la branca '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:740
|
||||
#: builtin/checkout.c:733
|
||||
#, c-format
|
||||
msgid " ... and %d more.\n"
|
||||
msgstr " ... i %d més.\n"
|
||||
|
||||
#: builtin/checkout.c:746
|
||||
#: builtin/checkout.c:739
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Warning: you are leaving %d commit behind, not connected to\n"
|
||||
|
|
@ -3610,7 +3610,7 @@ msgstr[1] ""
|
|||
"\n"
|
||||
"%s\n"
|
||||
|
||||
#: builtin/checkout.c:765
|
||||
#: builtin/checkout.c:758
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you want to keep it by creating a new branch, this may be a good time\n"
|
||||
|
|
@ -3637,177 +3637,149 @@ msgstr[1] ""
|
|||
" git branch <nom-de-branca-nova> %s\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/checkout.c:801
|
||||
#: builtin/checkout.c:794
|
||||
msgid "internal error in revision walk"
|
||||
msgstr "error intern en el passeig per revisions"
|
||||
|
||||
#: builtin/checkout.c:805
|
||||
#: builtin/checkout.c:798
|
||||
msgid "Previous HEAD position was"
|
||||
msgstr "La posició de HEAD anterior era"
|
||||
|
||||
#: builtin/checkout.c:832 builtin/checkout.c:1280
|
||||
#: builtin/checkout.c:825 builtin/checkout.c:1129
|
||||
msgid "You are on a branch yet to be born"
|
||||
msgstr "Sou en una branca que encara ha de nàixer"
|
||||
|
||||
#: builtin/checkout.c:893
|
||||
msgid "no branch specified"
|
||||
msgstr "cap branca especificada"
|
||||
|
||||
#: builtin/checkout.c:895
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "'%s' ja existeix"
|
||||
|
||||
#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
|
||||
#: builtin/clone.c:853
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "no s'ha pogut crear els directoris inicials de '%s'"
|
||||
|
||||
#: builtin/checkout.c:924
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "no s'ha pogut crear directori de '%s'"
|
||||
|
||||
#: builtin/checkout.c:960
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Introduïu %s (identificador %s)"
|
||||
|
||||
#: builtin/checkout.c:1070
|
||||
#: builtin/checkout.c:931
|
||||
#, c-format
|
||||
msgid "'%s' is already checked out at '%s'"
|
||||
msgstr "'%s' ja s'ha agafat a '%s'"
|
||||
|
||||
#: builtin/checkout.c:1176
|
||||
#: builtin/checkout.c:1036
|
||||
#, c-format
|
||||
msgid "only one reference expected, %d given."
|
||||
msgstr "només una referència esperada, %d donades."
|
||||
|
||||
#: builtin/checkout.c:1215
|
||||
#: builtin/checkout.c:1075
|
||||
#, c-format
|
||||
msgid "invalid reference: %s"
|
||||
msgstr "referència no vàlida: %s"
|
||||
|
||||
#: builtin/checkout.c:1255
|
||||
#: builtin/checkout.c:1104
|
||||
#, c-format
|
||||
msgid "reference is not a tree: %s"
|
||||
msgstr "la referència no és un arbre: %s"
|
||||
|
||||
#: builtin/checkout.c:1294
|
||||
#: builtin/checkout.c:1143
|
||||
msgid "paths cannot be used with switching branches"
|
||||
msgstr "els camins no es poden usar amb canvi de branca"
|
||||
|
||||
#: builtin/checkout.c:1297 builtin/checkout.c:1301
|
||||
#: builtin/checkout.c:1146 builtin/checkout.c:1150
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with switching branches"
|
||||
msgstr "'%s' no es pot usar amb canvi de branca"
|
||||
|
||||
#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
|
||||
#: builtin/checkout.c:1316
|
||||
#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
|
||||
#: builtin/checkout.c:1165
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with '%s'"
|
||||
msgstr "'%s' no es pot usar amb '%s'"
|
||||
|
||||
#: builtin/checkout.c:1321
|
||||
#: builtin/checkout.c:1170
|
||||
#, c-format
|
||||
msgid "Cannot switch branch to a non-commit '%s'"
|
||||
msgstr "No es pot canviar la branca a una no comissió '%s'"
|
||||
|
||||
#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161
|
||||
#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
|
||||
#: builtin/worktree.c:284
|
||||
msgid "branch"
|
||||
msgstr "branca"
|
||||
|
||||
#: builtin/checkout.c:1347
|
||||
#: builtin/checkout.c:1204
|
||||
msgid "create and checkout a new branch"
|
||||
msgstr "crea i agafa una branca nova"
|
||||
|
||||
#: builtin/checkout.c:1349
|
||||
#: builtin/checkout.c:1206
|
||||
msgid "create/reset and checkout a branch"
|
||||
msgstr "crea/restableix i agafa una branca"
|
||||
|
||||
#: builtin/checkout.c:1350
|
||||
#: builtin/checkout.c:1207
|
||||
msgid "create reflog for new branch"
|
||||
msgstr "crea un registre de referència per a la branca nova"
|
||||
|
||||
#: builtin/checkout.c:1351
|
||||
#: builtin/checkout.c:1208
|
||||
msgid "detach the HEAD at named commit"
|
||||
msgstr "separa el HEAD a la comissió anomenada"
|
||||
|
||||
#: builtin/checkout.c:1352
|
||||
#: builtin/checkout.c:1209
|
||||
msgid "set upstream info for new branch"
|
||||
msgstr "estableix la informació de font de la branca nova"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new-branch"
|
||||
msgstr "branca-nova"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new unparented branch"
|
||||
msgstr "branca nova sense mare"
|
||||
|
||||
#: builtin/checkout.c:1355
|
||||
#: builtin/checkout.c:1212
|
||||
msgid "checkout our version for unmerged files"
|
||||
msgstr "agafa la versió nostra dels fitxers sense fusionar"
|
||||
|
||||
#: builtin/checkout.c:1357
|
||||
#: builtin/checkout.c:1214
|
||||
msgid "checkout their version for unmerged files"
|
||||
msgstr "agafa la versió seva dels fitxers sense fusionar"
|
||||
|
||||
#: builtin/checkout.c:1359
|
||||
#: builtin/checkout.c:1216
|
||||
msgid "force checkout (throw away local modifications)"
|
||||
msgstr "agafa a la força (descarta qualsevulles modificacions locals)"
|
||||
|
||||
#: builtin/checkout.c:1360
|
||||
#: builtin/checkout.c:1217
|
||||
msgid "perform a 3-way merge with the new branch"
|
||||
msgstr "realitza una fusió de 3 vies amb la branca nova"
|
||||
|
||||
#: builtin/checkout.c:1361 builtin/merge.c:227
|
||||
#: builtin/checkout.c:1218 builtin/merge.c:227
|
||||
msgid "update ignored files (default)"
|
||||
msgstr "actualitza els fitxers ignorats (per defecte)"
|
||||
|
||||
#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
|
||||
#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
|
||||
msgid "style"
|
||||
msgstr "estil"
|
||||
|
||||
#: builtin/checkout.c:1363
|
||||
#: builtin/checkout.c:1220
|
||||
msgid "conflict style (merge or diff3)"
|
||||
msgstr "estil de conflicte (fusió o diff3)"
|
||||
|
||||
#: builtin/checkout.c:1366
|
||||
#: builtin/checkout.c:1223
|
||||
msgid "do not limit pathspecs to sparse entries only"
|
||||
msgstr "no limitis les especificacions de camí només a entrades escasses"
|
||||
|
||||
#: builtin/checkout.c:1368
|
||||
#: builtin/checkout.c:1225
|
||||
msgid "second guess 'git checkout <no-such-branch>'"
|
||||
msgstr "dubta 'git checkout <cap-branca-així>'"
|
||||
|
||||
#: builtin/checkout.c:1370
|
||||
msgid "check a branch out in a separate working directory"
|
||||
msgstr "agafa una branca en un directori de treball separat"
|
||||
|
||||
#: builtin/checkout.c:1372
|
||||
#: builtin/checkout.c:1227
|
||||
msgid "do not check if another worktree is holding the given ref"
|
||||
msgstr "no comprovis si altre arbre de treball té la referència donada"
|
||||
|
||||
#: builtin/checkout.c:1406
|
||||
#: builtin/checkout.c:1252
|
||||
msgid "-b, -B and --orphan are mutually exclusive"
|
||||
msgstr "-b, -B i --orphan són mutualment exclusius"
|
||||
|
||||
#: builtin/checkout.c:1423
|
||||
#: builtin/checkout.c:1269
|
||||
msgid "--track needs a branch name"
|
||||
msgstr "--track necessita un nom de branca"
|
||||
|
||||
#: builtin/checkout.c:1428
|
||||
#: builtin/checkout.c:1274
|
||||
msgid "Missing branch name; try -b"
|
||||
msgstr "Manca el nom de branca; proveu -b"
|
||||
|
||||
#: builtin/checkout.c:1464
|
||||
#: builtin/checkout.c:1310
|
||||
msgid "invalid path specification"
|
||||
msgstr "especificació de camí no vàlida"
|
||||
|
||||
#: builtin/checkout.c:1471
|
||||
#: builtin/checkout.c:1317
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot update paths and switch to branch '%s' at the same time.\n"
|
||||
|
|
@ -3816,12 +3788,12 @@ msgstr ""
|
|||
"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n"
|
||||
"Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"
|
||||
|
||||
#: builtin/checkout.c:1476
|
||||
#: builtin/checkout.c:1322
|
||||
#, c-format
|
||||
msgid "git checkout: --detach does not take a path argument '%s'"
|
||||
msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'"
|
||||
|
||||
#: builtin/checkout.c:1480
|
||||
#: builtin/checkout.c:1326
|
||||
msgid ""
|
||||
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
||||
"checking out of the index."
|
||||
|
|
@ -4107,57 +4079,57 @@ msgstr "calu=valor"
|
|||
msgid "set config inside the new repository"
|
||||
msgstr "estableix la configuració dins del dipòsit nou"
|
||||
|
||||
#: builtin/clone.c:247
|
||||
#: builtin/clone.c:240
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is not a local repository."
|
||||
msgstr "el dipòsit de referència '%s' no és un dipòsit local."
|
||||
|
||||
#: builtin/clone.c:251
|
||||
#: builtin/clone.c:244
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is shallow"
|
||||
msgstr "el dipòsit de referència '%s' és superficial"
|
||||
|
||||
#: builtin/clone.c:254
|
||||
#: builtin/clone.c:247
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is grafted"
|
||||
msgstr "el dipòsit de referència '%s' és empeltat"
|
||||
|
||||
#: builtin/clone.c:317
|
||||
#: builtin/clone.c:310
|
||||
#, c-format
|
||||
msgid "failed to create directory '%s'"
|
||||
msgstr "s'ha fallat en crear el directori '%s'"
|
||||
|
||||
#: builtin/clone.c:319 builtin/diff.c:84
|
||||
#: builtin/clone.c:312 builtin/diff.c:84
|
||||
#, c-format
|
||||
msgid "failed to stat '%s'"
|
||||
msgstr "s'ha fallat en fer stat a '%s'"
|
||||
|
||||
#: builtin/clone.c:321
|
||||
#: builtin/clone.c:314
|
||||
#, c-format
|
||||
msgid "%s exists and is not a directory"
|
||||
msgstr "%s existeix i no és un directori"
|
||||
|
||||
#: builtin/clone.c:335
|
||||
#: builtin/clone.c:328
|
||||
#, c-format
|
||||
msgid "failed to stat %s\n"
|
||||
msgstr "s'ha fallat en fer stat a '%s'\n"
|
||||
|
||||
#: builtin/clone.c:357
|
||||
#: builtin/clone.c:350
|
||||
#, c-format
|
||||
msgid "failed to create link '%s'"
|
||||
msgstr "s'ha fallat en crear l'enllaç '%s'"
|
||||
|
||||
#: builtin/clone.c:361
|
||||
#: builtin/clone.c:354
|
||||
#, c-format
|
||||
msgid "failed to copy file to '%s'"
|
||||
msgstr "s'ha fallat en copiar el fitxer a '%s'"
|
||||
|
||||
#: builtin/clone.c:384 builtin/clone.c:558
|
||||
#: builtin/clone.c:377 builtin/clone.c:551
|
||||
#, c-format
|
||||
msgid "done.\n"
|
||||
msgstr "fet.\n"
|
||||
|
||||
#: builtin/clone.c:396
|
||||
#: builtin/clone.c:389
|
||||
msgid ""
|
||||
"Clone succeeded, but checkout failed.\n"
|
||||
"You can inspect what was checked out with 'git status'\n"
|
||||
|
|
@ -4167,117 +4139,123 @@ msgstr ""
|
|||
"Podeu inspeccionar què s'ha agafat amb 'git status' i\n"
|
||||
"tornar a intentar l'agafada amb 'git checkout -f HEAD'\n"
|
||||
|
||||
#: builtin/clone.c:473
|
||||
#: builtin/clone.c:466
|
||||
#, c-format
|
||||
msgid "Could not find remote branch %s to clone."
|
||||
msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
|
||||
|
||||
#: builtin/clone.c:553
|
||||
#: builtin/clone.c:546
|
||||
#, c-format
|
||||
msgid "Checking connectivity... "
|
||||
msgstr "Provant connectivitat... "
|
||||
|
||||
#: builtin/clone.c:556
|
||||
#: builtin/clone.c:549
|
||||
msgid "remote did not send all necessary objects"
|
||||
msgstr "el remot no ha enviat tots els objectes necessaris"
|
||||
|
||||
#: builtin/clone.c:620
|
||||
#: builtin/clone.c:613
|
||||
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
||||
msgstr ""
|
||||
"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
|
||||
"agafar.\n"
|
||||
|
||||
#: builtin/clone.c:651
|
||||
#: builtin/clone.c:644
|
||||
msgid "unable to checkout working tree"
|
||||
msgstr "no s'ha pogut agafar l'arbre de treball"
|
||||
|
||||
#: builtin/clone.c:738
|
||||
#: builtin/clone.c:731
|
||||
msgid "cannot repack to clean up"
|
||||
msgstr "no es pot reempaquetar per a netejar"
|
||||
|
||||
#: builtin/clone.c:740
|
||||
#: builtin/clone.c:733
|
||||
msgid "cannot unlink temporary alternates file"
|
||||
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
|
||||
|
||||
#: builtin/clone.c:770
|
||||
#: builtin/clone.c:763
|
||||
msgid "Too many arguments."
|
||||
msgstr "Hi ha massa paràmetres."
|
||||
|
||||
#: builtin/clone.c:774
|
||||
#: builtin/clone.c:767
|
||||
msgid "You must specify a repository to clone."
|
||||
msgstr "Heu d'especificar un dipòsit per a clonar."
|
||||
|
||||
#: builtin/clone.c:785
|
||||
#: builtin/clone.c:778
|
||||
#, c-format
|
||||
msgid "--bare and --origin %s options are incompatible."
|
||||
msgstr "les opcions --bare i --origin %s són incompatibles."
|
||||
|
||||
#: builtin/clone.c:788
|
||||
#: builtin/clone.c:781
|
||||
msgid "--bare and --separate-git-dir are incompatible."
|
||||
msgstr "--bare i --separate-git-dir són incompatibles."
|
||||
|
||||
#: builtin/clone.c:801
|
||||
#: builtin/clone.c:794
|
||||
#, c-format
|
||||
msgid "repository '%s' does not exist"
|
||||
msgstr "el dipòsit '%s' no existeix"
|
||||
|
||||
#: builtin/clone.c:807 builtin/fetch.c:1160
|
||||
#: builtin/clone.c:800 builtin/fetch.c:1160
|
||||
#, c-format
|
||||
msgid "depth %s is not a positive number"
|
||||
msgstr "la profunditat %s no és nombre positiu"
|
||||
|
||||
#: builtin/clone.c:817
|
||||
#: builtin/clone.c:810
|
||||
#, c-format
|
||||
msgid "destination path '%s' already exists and is not an empty directory."
|
||||
msgstr "el camí destí '%s' ja existeix i no és un directori buit."
|
||||
|
||||
#: builtin/clone.c:827
|
||||
#: builtin/clone.c:820
|
||||
#, c-format
|
||||
msgid "working tree '%s' already exists."
|
||||
msgstr "l'arbre de treball '%s' ja existeix."
|
||||
|
||||
#: builtin/clone.c:845
|
||||
#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
|
||||
#: builtin/worktree.c:220
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "no s'ha pogut crear els directoris inicials de '%s'"
|
||||
|
||||
#: builtin/clone.c:838
|
||||
#, c-format
|
||||
msgid "could not create work tree dir '%s'"
|
||||
msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'"
|
||||
|
||||
#: builtin/clone.c:863
|
||||
#: builtin/clone.c:856
|
||||
#, c-format
|
||||
msgid "Cloning into bare repository '%s'...\n"
|
||||
msgstr "Clonant al dipòsit nu '%s'...\n"
|
||||
|
||||
#: builtin/clone.c:865
|
||||
#: builtin/clone.c:858
|
||||
#, c-format
|
||||
msgid "Cloning into '%s'...\n"
|
||||
msgstr "Clonant a '%s'...\n"
|
||||
|
||||
#: builtin/clone.c:890
|
||||
#: builtin/clone.c:883
|
||||
msgid "--dissociate given, but there is no --reference"
|
||||
msgstr "s'ha donat --dissociate, però no hi ha --reference"
|
||||
|
||||
#: builtin/clone.c:907
|
||||
#: builtin/clone.c:900
|
||||
msgid "--depth is ignored in local clones; use file:// instead."
|
||||
msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
|
||||
|
||||
#: builtin/clone.c:910
|
||||
#: builtin/clone.c:903
|
||||
msgid "source repository is shallow, ignoring --local"
|
||||
msgstr "el dipòsit font és superficial, ignorant --local"
|
||||
|
||||
#: builtin/clone.c:915
|
||||
#: builtin/clone.c:908
|
||||
msgid "--local is ignored"
|
||||
msgstr "--local s'ignora"
|
||||
|
||||
#: builtin/clone.c:919
|
||||
#: builtin/clone.c:912
|
||||
#, c-format
|
||||
msgid "Don't know how to clone %s"
|
||||
msgstr "No es sap com clonar %s"
|
||||
|
||||
#: builtin/clone.c:968 builtin/clone.c:976
|
||||
#: builtin/clone.c:961 builtin/clone.c:969
|
||||
#, c-format
|
||||
msgid "Remote branch %s not found in upstream %s"
|
||||
msgstr "La branca remota %s no es troba en la font %s"
|
||||
|
||||
#: builtin/clone.c:979
|
||||
#: builtin/clone.c:972
|
||||
msgid "You appear to have cloned an empty repository."
|
||||
msgstr "Sembla que heu clonat un dipòsit buit."
|
||||
|
||||
|
|
@ -5662,7 +5640,7 @@ msgstr "clau"
|
|||
msgid "field name to sort on"
|
||||
msgstr "nom de camp en el qual ordenar"
|
||||
|
||||
#: builtin/fsck.c:147 builtin/prune.c:236
|
||||
#: builtin/fsck.c:147 builtin/prune.c:137
|
||||
msgid "Checking connectivity"
|
||||
msgstr "Comprovant connectivitat"
|
||||
|
||||
|
|
@ -5710,7 +5688,7 @@ msgstr "habilita la comprovació més estricta"
|
|||
msgid "write dangling objects in .git/lost-found"
|
||||
msgstr "escriu objectes penjants a .git/lost-found"
|
||||
|
||||
#: builtin/fsck.c:627 builtin/prune.c:198
|
||||
#: builtin/fsck.c:627 builtin/prune.c:107
|
||||
msgid "show progress"
|
||||
msgstr "mostra el progrés"
|
||||
|
||||
|
|
@ -8196,62 +8174,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|||
msgid "Removing duplicate objects"
|
||||
msgstr "Eliminant objectes duplicats"
|
||||
|
||||
#: builtin/prune.c:12
|
||||
#: builtin/prune.c:11
|
||||
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
||||
msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<cap>...]"
|
||||
|
||||
#: builtin/prune.c:86
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
|
||||
|
||||
#: builtin/prune.c:92
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
|
||||
|
||||
#: builtin/prune.c:97
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
|
||||
|
||||
#: builtin/prune.c:108
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
|
||||
|
||||
#: builtin/prune.c:124
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr ""
|
||||
"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
|
||||
"existent"
|
||||
|
||||
#: builtin/prune.c:159
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "s'ha fallat en eliminar: %s"
|
||||
|
||||
#: builtin/prune.c:196
|
||||
#: builtin/prune.c:105 builtin/worktree.c:112
|
||||
msgid "do not remove, show only"
|
||||
msgstr "no eliminis, només mostra"
|
||||
|
||||
#: builtin/prune.c:197
|
||||
#: builtin/prune.c:106 builtin/worktree.c:113
|
||||
msgid "report pruned objects"
|
||||
msgstr "informa d'objectes podats"
|
||||
|
||||
#: builtin/prune.c:199
|
||||
msgid "prune .git/worktrees"
|
||||
msgstr "poda .git/worktrees"
|
||||
|
||||
#: builtin/prune.c:201
|
||||
#: builtin/prune.c:109 builtin/worktree.c:115
|
||||
msgid "expire objects older than <time>"
|
||||
msgstr "fes caducar els objectes més vells que <hora>"
|
||||
|
||||
#: builtin/prune.c:216
|
||||
msgid "--worktrees does not take extra arguments"
|
||||
msgstr "--worktrees no accepta paràmetres extres"
|
||||
|
||||
#: builtin/push.c:14
|
||||
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
||||
msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
|
||||
|
|
@ -10362,6 +10300,85 @@ msgstr "git verify-tag [-v | --verbose] <etiqueta>..."
|
|||
msgid "print tag contents"
|
||||
msgstr "imprimeix els continguts de l'etiqueta"
|
||||
|
||||
#: builtin/worktree.c:11
|
||||
msgid "git worktree add [<options>] <path> <branch>"
|
||||
msgstr "git worktree add [<opcions>] <camí> <branca>"
|
||||
|
||||
#: builtin/worktree.c:12
|
||||
msgid "git worktree prune [<options>]"
|
||||
msgstr "git worktree prune [<opcions>]"
|
||||
|
||||
#: builtin/worktree.c:27
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
|
||||
|
||||
#: builtin/worktree.c:33
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
|
||||
|
||||
#: builtin/worktree.c:38
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
|
||||
|
||||
#: builtin/worktree.c:49
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
|
||||
|
||||
#: builtin/worktree.c:65
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr ""
|
||||
"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
|
||||
"existent"
|
||||
|
||||
#: builtin/worktree.c:100
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "s'ha fallat en eliminar: %s"
|
||||
|
||||
#: builtin/worktree.c:186
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "'%s' ja existeix"
|
||||
|
||||
#: builtin/worktree.c:207
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "no s'ha pogut crear directori de '%s'"
|
||||
|
||||
#: builtin/worktree.c:241
|
||||
msgid "unable to resolve HEAD"
|
||||
msgstr "no es pot resoldre HEAD"
|
||||
|
||||
#: builtin/worktree.c:249
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Introduïu %s (identificador %s)"
|
||||
|
||||
#: builtin/worktree.c:281
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
|
||||
|
||||
#: builtin/worktree.c:283
|
||||
msgid "create a new branch"
|
||||
msgstr "crea una branca nova"
|
||||
|
||||
#: builtin/worktree.c:285
|
||||
msgid "create or reset a branch"
|
||||
msgstr "crea o restableix una branca"
|
||||
|
||||
#: builtin/worktree.c:286
|
||||
msgid "detach HEAD at named commit"
|
||||
msgstr "separa el HEAD a la comissió anomenada"
|
||||
|
||||
#: builtin/worktree.c:292
|
||||
msgid "-b and -B are mutually exclusive"
|
||||
msgstr "-b i -B són mutualment exclusius"
|
||||
|
||||
#: builtin/write-tree.c:13
|
||||
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
||||
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
||||
|
|
@ -10426,8 +10443,8 @@ msgid "List, create, or delete branches"
|
|||
msgstr "Llista, crea o suprimeix branques"
|
||||
|
||||
#: common-cmds.h:21
|
||||
msgid "Checkout a branch or paths to the working tree"
|
||||
msgstr "Agafa una branca o uns camins a l'arbre de treball"
|
||||
msgid "Switch branches or restore working tree files"
|
||||
msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball"
|
||||
|
||||
#: common-cmds.h:22
|
||||
msgid "Clone a repository into a new directory"
|
||||
|
|
|
|||
440
po/de.po
440
po/de.po
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2015-06-27 19:17+0800\n"
|
||||
"POT-Creation-Date: 2015-07-14 07:19+0800\n"
|
||||
"PO-Revision-Date: 2015-01-21 15:01+0800\n"
|
||||
"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
|
||||
"Language-Team: German <>\n"
|
||||
|
|
@ -662,8 +662,8 @@ msgstr "FEHLER: Wiederöffnen einer bereits committeten Lock-Datei"
|
|||
msgid "failed to read the cache"
|
||||
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
|
||||
|
||||
#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
|
||||
#: builtin/clone.c:654
|
||||
#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
|
||||
#: builtin/clone.c:647
|
||||
msgid "unable to write new index file"
|
||||
msgstr "Konnte neue Index-Datei nicht schreiben."
|
||||
|
||||
|
|
@ -710,7 +710,7 @@ msgstr "kann Objekt %s '%s' nicht lesen"
|
|||
msgid "blob expected for %s '%s'"
|
||||
msgstr "Blob erwartet für %s '%s'"
|
||||
|
||||
#: merge-recursive.c:788 builtin/clone.c:313
|
||||
#: merge-recursive.c:788 builtin/clone.c:306
|
||||
#, c-format
|
||||
msgid "failed to open '%s'"
|
||||
msgstr "Fehler beim Öffnen von '%s'"
|
||||
|
|
@ -1110,8 +1110,9 @@ msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
|
|||
#: remote.c:1756
|
||||
#, c-format
|
||||
msgid "push destination '%s' on remote '%s' has no local tracking branch"
|
||||
msgstr "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal "
|
||||
"gefolgten Branch"
|
||||
msgstr ""
|
||||
"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
|
||||
"Branch"
|
||||
|
||||
#: remote.c:1771
|
||||
#, c-format
|
||||
|
|
@ -1134,7 +1135,8 @@ msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
|
|||
#: remote.c:2124
|
||||
#, c-format
|
||||
msgid "Your branch is based on '%s', but the upstream is gone.\n"
|
||||
msgstr "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
|
||||
msgstr ""
|
||||
"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
|
||||
|
||||
#: remote.c:2128
|
||||
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
|
||||
|
|
@ -2083,7 +2085,7 @@ msgstr "entfernt"
|
|||
msgid "behind "
|
||||
msgstr "hinterher "
|
||||
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:352
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:345
|
||||
#, c-format
|
||||
msgid "failed to unlink '%s'"
|
||||
msgstr "Konnte '%s' nicht entfernen."
|
||||
|
|
@ -2164,7 +2166,7 @@ msgstr "erweiterte Ausgaben"
|
|||
msgid "interactive picking"
|
||||
msgstr "interaktives Auswählen"
|
||||
|
||||
#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
|
||||
#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
|
||||
msgid "select hunks interactively"
|
||||
msgstr "Blöcke interaktiv auswählen"
|
||||
|
||||
|
|
@ -2512,7 +2514,7 @@ msgstr "%s: Patch konnte nicht angewendet werden"
|
|||
msgid "Checking patch %s..."
|
||||
msgstr "Prüfe Patch %s ..."
|
||||
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
|
||||
#, c-format
|
||||
msgid "make_cache_entry failed for path '%s'"
|
||||
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
|
||||
|
|
@ -3231,7 +3233,7 @@ msgstr "Branches in Spalten auflisten"
|
|||
msgid "Failed to resolve HEAD as a valid ref."
|
||||
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
|
||||
|
||||
#: builtin/branch.c:878 builtin/clone.c:629
|
||||
#: builtin/branch.c:878 builtin/clone.c:622
|
||||
msgid "HEAD not found below refs/heads!"
|
||||
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
|
||||
|
||||
|
|
@ -3413,8 +3415,9 @@ msgstr ""
|
|||
|
||||
#: builtin/cat-file.c:424
|
||||
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
|
||||
msgstr "symbolischen Verknüpfungen innerhalb des Repositories folgen "
|
||||
"(verwendet mit --batch oder --batch-check)"
|
||||
msgstr ""
|
||||
"symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
|
||||
"--batch oder --batch-check)"
|
||||
|
||||
#: builtin/check-attr.c:11
|
||||
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
|
||||
|
|
@ -3441,7 +3444,7 @@ msgstr "Dateinamen von der Standard-Eingabe lesen"
|
|||
msgid "terminate input and output records by a NUL character"
|
||||
msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
|
||||
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
|
||||
msgid "suppress progress reporting"
|
||||
msgstr "Fortschrittsanzeige unterdrücken"
|
||||
|
||||
|
|
@ -3542,114 +3545,114 @@ msgstr ""
|
|||
msgid "copy out the files from named stage"
|
||||
msgstr "Dateien von dem benannten Stand kopieren"
|
||||
|
||||
#: builtin/checkout.c:26
|
||||
#: builtin/checkout.c:24
|
||||
msgid "git checkout [<options>] <branch>"
|
||||
msgstr "git checkout [<Optionen>] <Branch>"
|
||||
|
||||
#: builtin/checkout.c:27
|
||||
#: builtin/checkout.c:25
|
||||
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
||||
msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
|
||||
|
||||
#: builtin/checkout.c:138 builtin/checkout.c:171
|
||||
#: builtin/checkout.c:134 builtin/checkout.c:167
|
||||
#, c-format
|
||||
msgid "path '%s' does not have our version"
|
||||
msgstr "Pfad '%s' hat nicht unsere Version."
|
||||
|
||||
#: builtin/checkout.c:140 builtin/checkout.c:173
|
||||
#: builtin/checkout.c:136 builtin/checkout.c:169
|
||||
#, c-format
|
||||
msgid "path '%s' does not have their version"
|
||||
msgstr "Pfad '%s' hat nicht deren Version."
|
||||
|
||||
#: builtin/checkout.c:156
|
||||
#: builtin/checkout.c:152
|
||||
#, c-format
|
||||
msgid "path '%s' does not have all necessary versions"
|
||||
msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
|
||||
|
||||
#: builtin/checkout.c:200
|
||||
#: builtin/checkout.c:196
|
||||
#, c-format
|
||||
msgid "path '%s' does not have necessary versions"
|
||||
msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
|
||||
|
||||
#: builtin/checkout.c:217
|
||||
#: builtin/checkout.c:213
|
||||
#, c-format
|
||||
msgid "path '%s': cannot merge"
|
||||
msgstr "Pfad '%s': kann nicht zusammenführen"
|
||||
|
||||
#: builtin/checkout.c:234
|
||||
#: builtin/checkout.c:230
|
||||
#, c-format
|
||||
msgid "Unable to add merge result for '%s'"
|
||||
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
|
||||
|
||||
#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
|
||||
#: builtin/checkout.c:264 builtin/checkout.c:277
|
||||
#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
|
||||
#: builtin/checkout.c:260
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with updating paths"
|
||||
msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
|
||||
|
||||
#: builtin/checkout.c:267 builtin/checkout.c:270
|
||||
#: builtin/checkout.c:263 builtin/checkout.c:266
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with %s"
|
||||
msgstr "'%s' kann nicht mit '%s' verwendet werden"
|
||||
|
||||
#: builtin/checkout.c:273
|
||||
#: builtin/checkout.c:269
|
||||
#, c-format
|
||||
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
||||
msgstr ""
|
||||
"Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
|
||||
|
||||
#: builtin/checkout.c:287 builtin/checkout.c:481
|
||||
#: builtin/checkout.c:280 builtin/checkout.c:474
|
||||
msgid "corrupt index file"
|
||||
msgstr "beschädigte Index-Datei"
|
||||
|
||||
#: builtin/checkout.c:347 builtin/checkout.c:354
|
||||
#: builtin/checkout.c:340 builtin/checkout.c:347
|
||||
#, c-format
|
||||
msgid "path '%s' is unmerged"
|
||||
msgstr "Pfad '%s' ist nicht zusammengeführt."
|
||||
|
||||
#: builtin/checkout.c:503
|
||||
#: builtin/checkout.c:496
|
||||
msgid "you need to resolve your current index first"
|
||||
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
|
||||
|
||||
#: builtin/checkout.c:634
|
||||
#: builtin/checkout.c:627
|
||||
#, c-format
|
||||
msgid "Can not do reflog for '%s'\n"
|
||||
msgstr "Konnte \"reflog\" für '%s' nicht durchführen\n"
|
||||
|
||||
#: builtin/checkout.c:670
|
||||
#: builtin/checkout.c:663
|
||||
msgid "HEAD is now at"
|
||||
msgstr "HEAD ist jetzt bei"
|
||||
|
||||
#: builtin/checkout.c:677
|
||||
#: builtin/checkout.c:670
|
||||
#, c-format
|
||||
msgid "Reset branch '%s'\n"
|
||||
msgstr "Setze Branch '%s' neu\n"
|
||||
|
||||
#: builtin/checkout.c:680
|
||||
#: builtin/checkout.c:673
|
||||
#, c-format
|
||||
msgid "Already on '%s'\n"
|
||||
msgstr "Bereits auf '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:684
|
||||
#: builtin/checkout.c:677
|
||||
#, c-format
|
||||
msgid "Switched to and reset branch '%s'\n"
|
||||
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
|
||||
|
||||
#: builtin/checkout.c:686 builtin/checkout.c:1285
|
||||
#: builtin/checkout.c:679 builtin/checkout.c:1134
|
||||
#, c-format
|
||||
msgid "Switched to a new branch '%s'\n"
|
||||
msgstr "Zu neuem Branch '%s' gewechselt\n"
|
||||
|
||||
#: builtin/checkout.c:688
|
||||
#: builtin/checkout.c:681
|
||||
#, c-format
|
||||
msgid "Switched to branch '%s'\n"
|
||||
msgstr "Zu Branch '%s' gewechselt\n"
|
||||
|
||||
#: builtin/checkout.c:740
|
||||
#: builtin/checkout.c:733
|
||||
#, c-format
|
||||
msgid " ... and %d more.\n"
|
||||
msgstr " ... und %d weitere.\n"
|
||||
|
||||
#: builtin/checkout.c:746
|
||||
#: builtin/checkout.c:739
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Warning: you are leaving %d commit behind, not connected to\n"
|
||||
|
|
@ -3672,7 +3675,7 @@ msgstr[1] ""
|
|||
"\n"
|
||||
"%s\n"
|
||||
|
||||
#: builtin/checkout.c:765
|
||||
#: builtin/checkout.c:758
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you want to keep it by creating a new branch, this may be a good time\n"
|
||||
|
|
@ -3699,178 +3702,151 @@ msgstr[1] ""
|
|||
" git branch <neuer-Branchname> %s\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/checkout.c:801
|
||||
#: builtin/checkout.c:794
|
||||
msgid "internal error in revision walk"
|
||||
msgstr "interner Fehler im Revisionsgang"
|
||||
|
||||
#: builtin/checkout.c:805
|
||||
#: builtin/checkout.c:798
|
||||
msgid "Previous HEAD position was"
|
||||
msgstr "Vorherige Position von HEAD war"
|
||||
|
||||
#: builtin/checkout.c:832 builtin/checkout.c:1280
|
||||
#: builtin/checkout.c:825 builtin/checkout.c:1129
|
||||
msgid "You are on a branch yet to be born"
|
||||
msgstr "Sie sind auf einem Branch, der noch geboren wird"
|
||||
|
||||
#: builtin/checkout.c:893
|
||||
msgid "no branch specified"
|
||||
msgstr "Kein Branch spezifiziert"
|
||||
|
||||
#: builtin/checkout.c:895
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "'%s' existiert bereits"
|
||||
|
||||
#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
|
||||
#: builtin/clone.c:853
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
|
||||
|
||||
#: builtin/checkout.c:924
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
|
||||
|
||||
#: builtin/checkout.c:960
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Betrete %s (Identifikation %s)"
|
||||
|
||||
#: builtin/checkout.c:1070
|
||||
#: builtin/checkout.c:931
|
||||
#, c-format
|
||||
msgid "'%s' is already checked out at '%s'"
|
||||
msgstr "'%s' ist bereits in '%s' ausgecheckt"
|
||||
|
||||
#: builtin/checkout.c:1176
|
||||
#: builtin/checkout.c:1036
|
||||
#, c-format
|
||||
msgid "only one reference expected, %d given."
|
||||
msgstr "nur eine Referenz erwartet, %d gegeben."
|
||||
|
||||
#: builtin/checkout.c:1215
|
||||
#: builtin/checkout.c:1075
|
||||
#, c-format
|
||||
msgid "invalid reference: %s"
|
||||
msgstr "Ungültige Referenz: %s"
|
||||
|
||||
#: builtin/checkout.c:1255
|
||||
#: builtin/checkout.c:1104
|
||||
#, c-format
|
||||
msgid "reference is not a tree: %s"
|
||||
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
|
||||
|
||||
#: builtin/checkout.c:1294
|
||||
#: builtin/checkout.c:1143
|
||||
msgid "paths cannot be used with switching branches"
|
||||
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
|
||||
|
||||
#: builtin/checkout.c:1297 builtin/checkout.c:1301
|
||||
#: builtin/checkout.c:1146 builtin/checkout.c:1150
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with switching branches"
|
||||
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
|
||||
|
||||
#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
|
||||
#: builtin/checkout.c:1316
|
||||
#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
|
||||
#: builtin/checkout.c:1165
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with '%s'"
|
||||
msgstr "'%s' kann nicht mit '%s' verwendet werden"
|
||||
|
||||
#: builtin/checkout.c:1321
|
||||
#: builtin/checkout.c:1170
|
||||
#, c-format
|
||||
msgid "Cannot switch branch to a non-commit '%s'"
|
||||
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
|
||||
|
||||
#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161
|
||||
#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
|
||||
#: builtin/worktree.c:284
|
||||
msgid "branch"
|
||||
msgstr "Branch"
|
||||
|
||||
#: builtin/checkout.c:1347
|
||||
#: builtin/checkout.c:1204
|
||||
msgid "create and checkout a new branch"
|
||||
msgstr "einen neuen Branch erzeugen und auschecken"
|
||||
|
||||
#: builtin/checkout.c:1349
|
||||
#: builtin/checkout.c:1206
|
||||
msgid "create/reset and checkout a branch"
|
||||
msgstr "einen Branch erstellen/umsetzen und auschecken"
|
||||
|
||||
#: builtin/checkout.c:1350
|
||||
#: builtin/checkout.c:1207
|
||||
msgid "create reflog for new branch"
|
||||
msgstr "das Reflog für den neuen Branch erzeugen"
|
||||
|
||||
#: builtin/checkout.c:1351
|
||||
#: builtin/checkout.c:1208
|
||||
msgid "detach the HEAD at named commit"
|
||||
msgstr "HEAD zu benanntem Commit setzen"
|
||||
|
||||
#: builtin/checkout.c:1352
|
||||
#: builtin/checkout.c:1209
|
||||
msgid "set upstream info for new branch"
|
||||
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new-branch"
|
||||
msgstr "neuer Branch"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new unparented branch"
|
||||
msgstr "neuer Branch ohne Eltern-Commit"
|
||||
|
||||
#: builtin/checkout.c:1355
|
||||
#: builtin/checkout.c:1212
|
||||
msgid "checkout our version for unmerged files"
|
||||
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
|
||||
|
||||
#: builtin/checkout.c:1357
|
||||
#: builtin/checkout.c:1214
|
||||
msgid "checkout their version for unmerged files"
|
||||
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
|
||||
|
||||
#: builtin/checkout.c:1359
|
||||
#: builtin/checkout.c:1216
|
||||
msgid "force checkout (throw away local modifications)"
|
||||
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
|
||||
|
||||
#: builtin/checkout.c:1360
|
||||
#: builtin/checkout.c:1217
|
||||
msgid "perform a 3-way merge with the new branch"
|
||||
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
|
||||
|
||||
#: builtin/checkout.c:1361 builtin/merge.c:227
|
||||
#: builtin/checkout.c:1218 builtin/merge.c:227
|
||||
msgid "update ignored files (default)"
|
||||
msgstr "ignorierte Dateien aktualisieren (Standard)"
|
||||
|
||||
#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
|
||||
#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
|
||||
msgid "style"
|
||||
msgstr "Stil"
|
||||
|
||||
#: builtin/checkout.c:1363
|
||||
#: builtin/checkout.c:1220
|
||||
msgid "conflict style (merge or diff3)"
|
||||
msgstr "Konfliktstil (merge oder diff3)"
|
||||
|
||||
#: builtin/checkout.c:1366
|
||||
#: builtin/checkout.c:1223
|
||||
msgid "do not limit pathspecs to sparse entries only"
|
||||
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
|
||||
|
||||
#: builtin/checkout.c:1368
|
||||
#: builtin/checkout.c:1225
|
||||
msgid "second guess 'git checkout <no-such-branch>'"
|
||||
msgstr "second guess 'git checkout <no-such-branch>'"
|
||||
|
||||
#: builtin/checkout.c:1370
|
||||
msgid "check a branch out in a separate working directory"
|
||||
msgstr "Branch in separatem Arbeitsverzeichnis auschecken"
|
||||
|
||||
#: builtin/checkout.c:1372
|
||||
#: builtin/checkout.c:1227
|
||||
msgid "do not check if another worktree is holding the given ref"
|
||||
msgstr "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
|
||||
msgstr ""
|
||||
"Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
|
||||
"ausgecheckt wurde, deaktivieren"
|
||||
|
||||
#: builtin/checkout.c:1406
|
||||
#: builtin/checkout.c:1252
|
||||
msgid "-b, -B and --orphan are mutually exclusive"
|
||||
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
|
||||
|
||||
#: builtin/checkout.c:1423
|
||||
#: builtin/checkout.c:1269
|
||||
msgid "--track needs a branch name"
|
||||
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
|
||||
|
||||
#: builtin/checkout.c:1428
|
||||
#: builtin/checkout.c:1274
|
||||
msgid "Missing branch name; try -b"
|
||||
msgstr "Vermisse Branchnamen; versuchen Sie -b"
|
||||
|
||||
#: builtin/checkout.c:1464
|
||||
#: builtin/checkout.c:1310
|
||||
msgid "invalid path specification"
|
||||
msgstr "ungültige Pfadspezifikation"
|
||||
|
||||
#: builtin/checkout.c:1471
|
||||
#: builtin/checkout.c:1317
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot update paths and switch to branch '%s' at the same time.\n"
|
||||
|
|
@ -3880,12 +3856,12 @@ msgstr ""
|
|||
"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst "
|
||||
"werden kann?"
|
||||
|
||||
#: builtin/checkout.c:1476
|
||||
#: builtin/checkout.c:1322
|
||||
#, c-format
|
||||
msgid "git checkout: --detach does not take a path argument '%s'"
|
||||
msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
|
||||
|
||||
#: builtin/checkout.c:1480
|
||||
#: builtin/checkout.c:1326
|
||||
msgid ""
|
||||
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
||||
"checking out of the index."
|
||||
|
|
@ -4172,60 +4148,60 @@ msgstr "Schlüssel=Wert"
|
|||
msgid "set config inside the new repository"
|
||||
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
|
||||
|
||||
#: builtin/clone.c:247
|
||||
#: builtin/clone.c:240
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is not a local repository."
|
||||
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
|
||||
|
||||
#: builtin/clone.c:251
|
||||
#: builtin/clone.c:244
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is shallow"
|
||||
msgstr ""
|
||||
"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
|
||||
|
||||
#: builtin/clone.c:254
|
||||
#: builtin/clone.c:247
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is grafted"
|
||||
msgstr ""
|
||||
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
|
||||
"eingehängt."
|
||||
|
||||
#: builtin/clone.c:317
|
||||
#: builtin/clone.c:310
|
||||
#, c-format
|
||||
msgid "failed to create directory '%s'"
|
||||
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
|
||||
|
||||
#: builtin/clone.c:319 builtin/diff.c:84
|
||||
#: builtin/clone.c:312 builtin/diff.c:84
|
||||
#, c-format
|
||||
msgid "failed to stat '%s'"
|
||||
msgstr "Konnte '%s' nicht lesen"
|
||||
|
||||
#: builtin/clone.c:321
|
||||
#: builtin/clone.c:314
|
||||
#, c-format
|
||||
msgid "%s exists and is not a directory"
|
||||
msgstr "%s existiert und ist kein Verzeichnis"
|
||||
|
||||
#: builtin/clone.c:335
|
||||
#: builtin/clone.c:328
|
||||
#, c-format
|
||||
msgid "failed to stat %s\n"
|
||||
msgstr "Konnte %s nicht lesen\n"
|
||||
|
||||
#: builtin/clone.c:357
|
||||
#: builtin/clone.c:350
|
||||
#, c-format
|
||||
msgid "failed to create link '%s'"
|
||||
msgstr "Konnte Verweis '%s' nicht erstellen"
|
||||
|
||||
#: builtin/clone.c:361
|
||||
#: builtin/clone.c:354
|
||||
#, c-format
|
||||
msgid "failed to copy file to '%s'"
|
||||
msgstr "Konnte Datei nicht nach '%s' kopieren"
|
||||
|
||||
#: builtin/clone.c:384 builtin/clone.c:558
|
||||
#: builtin/clone.c:377 builtin/clone.c:551
|
||||
#, c-format
|
||||
msgid "done.\n"
|
||||
msgstr "Fertig.\n"
|
||||
|
||||
#: builtin/clone.c:396
|
||||
#: builtin/clone.c:389
|
||||
msgid ""
|
||||
"Clone succeeded, but checkout failed.\n"
|
||||
"You can inspect what was checked out with 'git status'\n"
|
||||
|
|
@ -4235,121 +4211,127 @@ msgstr ""
|
|||
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
|
||||
"und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
|
||||
|
||||
#: builtin/clone.c:473
|
||||
#: builtin/clone.c:466
|
||||
#, c-format
|
||||
msgid "Could not find remote branch %s to clone."
|
||||
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
|
||||
|
||||
#: builtin/clone.c:553
|
||||
#: builtin/clone.c:546
|
||||
#, c-format
|
||||
msgid "Checking connectivity... "
|
||||
msgstr "Prüfe Konnektivität ... "
|
||||
|
||||
#: builtin/clone.c:556
|
||||
#: builtin/clone.c:549
|
||||
msgid "remote did not send all necessary objects"
|
||||
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
|
||||
|
||||
#: builtin/clone.c:620
|
||||
#: builtin/clone.c:613
|
||||
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
||||
msgstr ""
|
||||
"Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
|
||||
"nicht ausgecheckt werden.\n"
|
||||
|
||||
#: builtin/clone.c:651
|
||||
#: builtin/clone.c:644
|
||||
msgid "unable to checkout working tree"
|
||||
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
|
||||
|
||||
#: builtin/clone.c:738
|
||||
#: builtin/clone.c:731
|
||||
msgid "cannot repack to clean up"
|
||||
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
|
||||
|
||||
#: builtin/clone.c:740
|
||||
#: builtin/clone.c:733
|
||||
msgid "cannot unlink temporary alternates file"
|
||||
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
|
||||
|
||||
#: builtin/clone.c:770
|
||||
#: builtin/clone.c:763
|
||||
msgid "Too many arguments."
|
||||
msgstr "Zu viele Argumente."
|
||||
|
||||
#: builtin/clone.c:774
|
||||
#: builtin/clone.c:767
|
||||
msgid "You must specify a repository to clone."
|
||||
msgstr "Sie müssen ein Repository zum Klonen angeben."
|
||||
|
||||
#: builtin/clone.c:785
|
||||
#: builtin/clone.c:778
|
||||
#, c-format
|
||||
msgid "--bare and --origin %s options are incompatible."
|
||||
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
|
||||
|
||||
#: builtin/clone.c:788
|
||||
#: builtin/clone.c:781
|
||||
msgid "--bare and --separate-git-dir are incompatible."
|
||||
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
|
||||
|
||||
#: builtin/clone.c:801
|
||||
#: builtin/clone.c:794
|
||||
#, c-format
|
||||
msgid "repository '%s' does not exist"
|
||||
msgstr "Repository '%s' existiert nicht."
|
||||
|
||||
#: builtin/clone.c:807 builtin/fetch.c:1160
|
||||
#: builtin/clone.c:800 builtin/fetch.c:1160
|
||||
#, c-format
|
||||
msgid "depth %s is not a positive number"
|
||||
msgstr "Tiefe %s ist keine positive Zahl"
|
||||
|
||||
#: builtin/clone.c:817
|
||||
#: builtin/clone.c:810
|
||||
#, c-format
|
||||
msgid "destination path '%s' already exists and is not an empty directory."
|
||||
msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
|
||||
|
||||
#: builtin/clone.c:827
|
||||
#: builtin/clone.c:820
|
||||
#, c-format
|
||||
msgid "working tree '%s' already exists."
|
||||
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
|
||||
|
||||
#: builtin/clone.c:845
|
||||
#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
|
||||
#: builtin/worktree.c:220
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
|
||||
|
||||
#: builtin/clone.c:838
|
||||
#, c-format
|
||||
msgid "could not create work tree dir '%s'"
|
||||
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
|
||||
|
||||
#: builtin/clone.c:863
|
||||
#: builtin/clone.c:856
|
||||
#, c-format
|
||||
msgid "Cloning into bare repository '%s'...\n"
|
||||
msgstr "Klone in Bare-Repository '%s' ...\n"
|
||||
|
||||
#: builtin/clone.c:865
|
||||
#: builtin/clone.c:858
|
||||
#, c-format
|
||||
msgid "Cloning into '%s'...\n"
|
||||
msgstr "Klone nach '%s' ...\n"
|
||||
|
||||
#: builtin/clone.c:890
|
||||
#: builtin/clone.c:883
|
||||
msgid "--dissociate given, but there is no --reference"
|
||||
msgstr "--dissociate ohne --reference angegeben"
|
||||
|
||||
#: builtin/clone.c:907
|
||||
#: builtin/clone.c:900
|
||||
msgid "--depth is ignored in local clones; use file:// instead."
|
||||
msgstr ""
|
||||
"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
|
||||
"stattdessen file://"
|
||||
|
||||
#: builtin/clone.c:910
|
||||
#: builtin/clone.c:903
|
||||
msgid "source repository is shallow, ignoring --local"
|
||||
msgstr ""
|
||||
"Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --"
|
||||
"local"
|
||||
|
||||
#: builtin/clone.c:915
|
||||
#: builtin/clone.c:908
|
||||
msgid "--local is ignored"
|
||||
msgstr "--local wird ignoriert"
|
||||
|
||||
#: builtin/clone.c:919
|
||||
#: builtin/clone.c:912
|
||||
#, c-format
|
||||
msgid "Don't know how to clone %s"
|
||||
msgstr "Weiß nicht wie %s zu klonen ist."
|
||||
|
||||
#: builtin/clone.c:968 builtin/clone.c:976
|
||||
#: builtin/clone.c:961 builtin/clone.c:969
|
||||
#, c-format
|
||||
msgid "Remote branch %s not found in upstream %s"
|
||||
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
|
||||
|
||||
#: builtin/clone.c:979
|
||||
#: builtin/clone.c:972
|
||||
msgid "You appear to have cloned an empty repository."
|
||||
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
|
||||
|
||||
|
|
@ -5760,7 +5742,7 @@ msgstr "Schüssel"
|
|||
msgid "field name to sort on"
|
||||
msgstr "sortiere nach diesem Feld"
|
||||
|
||||
#: builtin/fsck.c:147 builtin/prune.c:236
|
||||
#: builtin/fsck.c:147 builtin/prune.c:137
|
||||
msgid "Checking connectivity"
|
||||
msgstr "Prüfe Konnektivität"
|
||||
|
||||
|
|
@ -5808,7 +5790,7 @@ msgstr "genauere Prüfung aktivieren"
|
|||
msgid "write dangling objects in .git/lost-found"
|
||||
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
|
||||
|
||||
#: builtin/fsck.c:627 builtin/prune.c:198
|
||||
#: builtin/fsck.c:627 builtin/prune.c:107
|
||||
msgid "show progress"
|
||||
msgstr "Fortschrittsanzeige anzeigen"
|
||||
|
||||
|
|
@ -8318,61 +8300,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|||
msgid "Removing duplicate objects"
|
||||
msgstr "Lösche doppelte Objekte"
|
||||
|
||||
#: builtin/prune.c:12
|
||||
#: builtin/prune.c:11
|
||||
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
||||
msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]"
|
||||
|
||||
#: builtin/prune.c:86
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
|
||||
|
||||
#: builtin/prune.c:92
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
|
||||
|
||||
#: builtin/prune.c:97
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
|
||||
|
||||
#: builtin/prune.c:108
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
|
||||
|
||||
#: builtin/prune.c:124
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
|
||||
|
||||
#: builtin/prune.c:159
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "Fehler beim Löschen: %s"
|
||||
|
||||
#: builtin/prune.c:196
|
||||
#: builtin/prune.c:105 builtin/worktree.c:112
|
||||
msgid "do not remove, show only"
|
||||
msgstr "nicht löschen, nur anzeigen"
|
||||
|
||||
#: builtin/prune.c:197
|
||||
#: builtin/prune.c:106 builtin/worktree.c:113
|
||||
msgid "report pruned objects"
|
||||
msgstr "gelöschte Objekte melden"
|
||||
|
||||
#: builtin/prune.c:199
|
||||
msgid "prune .git/worktrees"
|
||||
msgstr "Informationen zu nicht mehr existierenden Arbeitsverzeichnissen in "
|
||||
".git/worktrees entfernen"
|
||||
|
||||
#: builtin/prune.c:201
|
||||
#: builtin/prune.c:109 builtin/worktree.c:115
|
||||
msgid "expire objects older than <time>"
|
||||
msgstr "Objekte älter als <Zeit> verfallen lassen"
|
||||
|
||||
#: builtin/prune.c:216
|
||||
msgid "--worktrees does not take extra arguments"
|
||||
msgstr "--worktrees akzeptiert keine weiteren Argumente"
|
||||
|
||||
#: builtin/push.c:14
|
||||
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
||||
msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
|
||||
|
|
@ -10286,32 +10229,38 @@ msgstr "Prüfe "
|
|||
|
||||
#: builtin/update-index.c:136
|
||||
msgid "directory stat info does not change after adding a new file"
|
||||
msgstr "Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei "
|
||||
"nicht geändert"
|
||||
msgstr ""
|
||||
"Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht "
|
||||
"geändert"
|
||||
|
||||
#: builtin/update-index.c:149
|
||||
msgid "directory stat info does not change after adding a new directory"
|
||||
msgstr "Verzeichnisinformationen haben sich nach Hinzufügen eines neuen "
|
||||
msgstr ""
|
||||
"Verzeichnisinformationen haben sich nach Hinzufügen eines neuen "
|
||||
"Verzeichnisses nicht geändert"
|
||||
|
||||
#: builtin/update-index.c:162
|
||||
msgid "directory stat info changes after updating a file"
|
||||
msgstr "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
|
||||
msgstr ""
|
||||
"Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
|
||||
|
||||
#: builtin/update-index.c:173
|
||||
msgid "directory stat info changes after adding a file inside subdirectory"
|
||||
msgstr "Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein "
|
||||
msgstr ""
|
||||
"Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein "
|
||||
"Unterverzeichnis geändert"
|
||||
|
||||
#: builtin/update-index.c:184
|
||||
msgid "directory stat info does not change after deleting a file"
|
||||
msgstr "Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht "
|
||||
msgstr ""
|
||||
"Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht "
|
||||
"geändert"
|
||||
|
||||
#: builtin/update-index.c:197
|
||||
msgid "directory stat info does not change after deleting a directory"
|
||||
msgstr "Verzeichnisinformationen haben sich nach dem Löschen eines "
|
||||
"Verzeichnisses nicht geändert"
|
||||
msgstr ""
|
||||
"Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses "
|
||||
"nicht geändert"
|
||||
|
||||
#: builtin/update-index.c:204
|
||||
msgid " OK"
|
||||
|
|
@ -10445,7 +10394,8 @@ msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
|
|||
|
||||
#: builtin/update-index.c:1000
|
||||
msgid "enable untracked cache without testing the filesystem"
|
||||
msgstr "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
|
||||
msgstr ""
|
||||
"Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
|
||||
|
||||
#: builtin/update-ref.c:9
|
||||
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
|
||||
|
|
@ -10512,6 +10462,84 @@ msgstr "git verify-tag [-v | --verbose] <Tag>..."
|
|||
msgid "print tag contents"
|
||||
msgstr "Tag-Inhalte ausgeben"
|
||||
|
||||
#: builtin/worktree.c:11
|
||||
msgid "git worktree add [<options>] <path> <branch>"
|
||||
msgstr "git worktree add [<Optionen>] <Pfad> <Branch>"
|
||||
|
||||
#: builtin/worktree.c:12
|
||||
msgid "git worktree prune [<options>]"
|
||||
msgstr "git worktree prune [<Optionen>]"
|
||||
|
||||
#: builtin/worktree.c:27
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
|
||||
|
||||
#: builtin/worktree.c:33
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
|
||||
|
||||
#: builtin/worktree.c:38
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
|
||||
|
||||
#: builtin/worktree.c:49
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
|
||||
|
||||
#: builtin/worktree.c:65
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
|
||||
|
||||
#: builtin/worktree.c:100
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "Fehler beim Löschen: %s"
|
||||
|
||||
#: builtin/worktree.c:186
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "'%s' existiert bereits"
|
||||
|
||||
#: builtin/worktree.c:207
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
|
||||
|
||||
#: builtin/worktree.c:241
|
||||
msgid "unable to resolve HEAD"
|
||||
msgstr "Konnte HEAD nicht auflösen."
|
||||
|
||||
#: builtin/worktree.c:249
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Betrete %s (Identifikation %s)"
|
||||
|
||||
#: builtin/worktree.c:281
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr "<Branch> auschecken, auch wenn dieser bereits in einem anderen "
|
||||
"Arbeitsverzeichnis ausgecheckt ist"
|
||||
|
||||
#: builtin/worktree.c:283
|
||||
msgid "create a new branch"
|
||||
msgstr "neuen Branch erstellen"
|
||||
|
||||
#: builtin/worktree.c:285
|
||||
msgid "create or reset a branch"
|
||||
msgstr "Branch erstellen oder umsetzen"
|
||||
|
||||
#: builtin/worktree.c:286
|
||||
msgid "detach HEAD at named commit"
|
||||
msgstr "HEAD bei benanntem Commit loslösen"
|
||||
|
||||
#: builtin/worktree.c:292
|
||||
msgid "-b and -B are mutually exclusive"
|
||||
msgstr "-b und -B schließen sich gegenseitig aus"
|
||||
|
||||
#: builtin/write-tree.c:13
|
||||
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
||||
msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]"
|
||||
|
|
@ -10577,8 +10605,8 @@ msgid "List, create, or delete branches"
|
|||
msgstr "Branches anzeigen, erstellen oder entfernen"
|
||||
|
||||
#: common-cmds.h:21
|
||||
msgid "Checkout a branch or paths to the working tree"
|
||||
msgstr "Branches oder Pfade im Arbeitsverzeichnis auschecken"
|
||||
msgid "Switch branches or restore working tree files"
|
||||
msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen"
|
||||
|
||||
#: common-cmds.h:22
|
||||
msgid "Clone a repository into a new directory"
|
||||
|
|
@ -11684,6 +11712,20 @@ msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
|
|||
msgid "Synchronizing submodule url for '$displaypath'"
|
||||
msgstr "Synchronisiere Submodul-URL für '$displaypath'"
|
||||
|
||||
#~ msgid "no branch specified"
|
||||
#~ msgstr "Kein Branch spezifiziert"
|
||||
|
||||
#~ msgid "check a branch out in a separate working directory"
|
||||
#~ msgstr "Branch in separatem Arbeitsverzeichnis auschecken"
|
||||
|
||||
#~ msgid "prune .git/worktrees"
|
||||
#~ msgstr ""
|
||||
#~ "Informationen zu nicht mehr existierenden Arbeitsverzeichnissen in .git/"
|
||||
#~ "worktrees entfernen"
|
||||
|
||||
#~ msgid "--worktrees does not take extra arguments"
|
||||
#~ msgstr "--worktrees akzeptiert keine weiteren Argumente"
|
||||
|
||||
#~ msgid "The most commonly used git commands are:"
|
||||
#~ msgstr "Die allgemein verwendeten Git-Kommandos sind:"
|
||||
|
||||
|
|
|
|||
451
po/fr.po
451
po/fr.po
|
|
@ -73,8 +73,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2015-06-27 19:17+0800\n"
|
||||
"PO-Revision-Date: 2015-06-30 21:30+0200\n"
|
||||
"POT-Creation-Date: 2015-07-14 07:19+0800\n"
|
||||
"PO-Revision-Date: 2015-07-14 23:02+0200\n"
|
||||
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
|
||||
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
|
||||
"Language: fr\n"
|
||||
|
|
@ -730,8 +730,8 @@ msgstr "BUG: réouverture d'un fichier verrou validé"
|
|||
msgid "failed to read the cache"
|
||||
msgstr "impossible de lire le cache"
|
||||
|
||||
#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
|
||||
#: builtin/clone.c:654
|
||||
#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
|
||||
#: builtin/clone.c:647
|
||||
msgid "unable to write new index file"
|
||||
msgstr "impossible d'écrire le nouveau fichier d'index"
|
||||
|
||||
|
|
@ -778,7 +778,7 @@ msgstr "impossible de lire l'objet %s '%s'"
|
|||
msgid "blob expected for %s '%s'"
|
||||
msgstr "blob attendu pour %s '%s'"
|
||||
|
||||
#: merge-recursive.c:788 builtin/clone.c:313
|
||||
#: merge-recursive.c:788 builtin/clone.c:306
|
||||
#, c-format
|
||||
msgid "failed to open '%s'"
|
||||
msgstr "échec à l'ouverture de '%s'"
|
||||
|
|
@ -1175,7 +1175,9 @@ msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
|
|||
#: remote.c:1756
|
||||
#, c-format
|
||||
msgid "push destination '%s' on remote '%s' has no local tracking branch"
|
||||
msgstr "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de branche locale de suivi"
|
||||
msgstr ""
|
||||
"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
|
||||
"branche locale de suivi"
|
||||
|
||||
#: remote.c:1771
|
||||
#, c-format
|
||||
|
|
@ -1193,7 +1195,8 @@ msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
|
|||
|
||||
#: remote.c:1817
|
||||
msgid "cannot resolve 'simple' push to a single destination"
|
||||
msgstr "impossible de résoudre une poussée 'simple' pour une destination unique"
|
||||
msgstr ""
|
||||
"impossible de résoudre une poussée 'simple' pour une destination unique"
|
||||
|
||||
#: remote.c:2124
|
||||
#, c-format
|
||||
|
|
@ -2125,7 +2128,7 @@ msgstr "disparue"
|
|||
msgid "behind "
|
||||
msgstr "derrière "
|
||||
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:352
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:345
|
||||
#, c-format
|
||||
msgid "failed to unlink '%s'"
|
||||
msgstr "échec lors de l'unlink de '%s'"
|
||||
|
|
@ -2204,7 +2207,7 @@ msgstr "mode verbeux"
|
|||
msgid "interactive picking"
|
||||
msgstr "sélection interactive"
|
||||
|
||||
#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
|
||||
#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
|
||||
msgid "select hunks interactively"
|
||||
msgstr "sélection interactive des sections"
|
||||
|
||||
|
|
@ -2556,7 +2559,7 @@ msgstr "%s : le patch ne s'applique pas"
|
|||
msgid "Checking patch %s..."
|
||||
msgstr "Vérification du patch %s..."
|
||||
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
|
||||
#, c-format
|
||||
msgid "make_cache_entry failed for path '%s'"
|
||||
msgstr "échec de make_cache_entry pour le chemin '%s'"
|
||||
|
|
@ -3267,7 +3270,7 @@ msgstr "afficher les branches en colonnes"
|
|||
msgid "Failed to resolve HEAD as a valid ref."
|
||||
msgstr "Échec de résolution de HEAD comme référence valide."
|
||||
|
||||
#: builtin/branch.c:878 builtin/clone.c:629
|
||||
#: builtin/branch.c:878 builtin/clone.c:622
|
||||
msgid "HEAD not found below refs/heads!"
|
||||
msgstr "HEAD non trouvée sous refs/heads !"
|
||||
|
||||
|
|
@ -3394,13 +3397,16 @@ msgstr "Le dépaquetage d'un colis requiert un dépôt."
|
|||
msgid ""
|
||||
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
|
||||
"<type>|--textconv) <object>"
|
||||
msgstr "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p | <type> | --textconv) <objet>"
|
||||
msgstr ""
|
||||
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
|
||||
"| <type> | --textconv) <objet>"
|
||||
|
||||
#: builtin/cat-file.c:370
|
||||
msgid ""
|
||||
"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
|
||||
"objects>"
|
||||
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] < <liste-d-objets>"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check) [--follow-symlinks] < <liste-d-objets>"
|
||||
|
||||
#: builtin/cat-file.c:407
|
||||
msgid "<type> can be one of: blob, tree, commit, tag"
|
||||
|
|
@ -3441,7 +3447,9 @@ msgstr "afficher l'information des objets passés en entrée standard"
|
|||
|
||||
#: builtin/cat-file.c:424
|
||||
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
|
||||
msgstr "suivre les liens symbolique internes à la copie de travail (utilisé avec --batch ou --batch-check)"
|
||||
msgstr ""
|
||||
"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
|
||||
"batch ou --batch-check)"
|
||||
|
||||
#: builtin/check-attr.c:11
|
||||
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
|
||||
|
|
@ -3469,7 +3477,7 @@ msgid "terminate input and output records by a NUL character"
|
|||
msgstr ""
|
||||
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
|
||||
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
|
||||
msgid "suppress progress reporting"
|
||||
msgstr "supprimer l'état d'avancement"
|
||||
|
||||
|
|
@ -3568,115 +3576,115 @@ msgstr "lors de la création de fichiers, préfixer par <chaîne>"
|
|||
msgid "copy out the files from named stage"
|
||||
msgstr "copier les fichiers depuis l'index nommé"
|
||||
|
||||
#: builtin/checkout.c:26
|
||||
#: builtin/checkout.c:24
|
||||
msgid "git checkout [<options>] <branch>"
|
||||
msgstr "git checkout [<options>] <branche>"
|
||||
|
||||
#: builtin/checkout.c:27
|
||||
#: builtin/checkout.c:25
|
||||
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
||||
msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
|
||||
|
||||
#: builtin/checkout.c:138 builtin/checkout.c:171
|
||||
#: builtin/checkout.c:134 builtin/checkout.c:167
|
||||
#, c-format
|
||||
msgid "path '%s' does not have our version"
|
||||
msgstr "le chemin '%s' n'a pas notre version"
|
||||
|
||||
#: builtin/checkout.c:140 builtin/checkout.c:173
|
||||
#: builtin/checkout.c:136 builtin/checkout.c:169
|
||||
#, c-format
|
||||
msgid "path '%s' does not have their version"
|
||||
msgstr "le chemin '%s' n'a pas leur version"
|
||||
|
||||
#: builtin/checkout.c:156
|
||||
#: builtin/checkout.c:152
|
||||
#, c-format
|
||||
msgid "path '%s' does not have all necessary versions"
|
||||
msgstr "le chemin '%s' n'a aucune des versions nécessaires"
|
||||
|
||||
#: builtin/checkout.c:200
|
||||
#: builtin/checkout.c:196
|
||||
#, c-format
|
||||
msgid "path '%s' does not have necessary versions"
|
||||
msgstr "le chemin '%s' n'a pas les versions nécessaires"
|
||||
|
||||
#: builtin/checkout.c:217
|
||||
#: builtin/checkout.c:213
|
||||
#, c-format
|
||||
msgid "path '%s': cannot merge"
|
||||
msgstr "chemin '%s' : impossible de fusionner"
|
||||
|
||||
#: builtin/checkout.c:234
|
||||
#: builtin/checkout.c:230
|
||||
#, c-format
|
||||
msgid "Unable to add merge result for '%s'"
|
||||
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
|
||||
|
||||
#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
|
||||
#: builtin/checkout.c:264 builtin/checkout.c:277
|
||||
#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
|
||||
#: builtin/checkout.c:260
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with updating paths"
|
||||
msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
|
||||
|
||||
#: builtin/checkout.c:267 builtin/checkout.c:270
|
||||
#: builtin/checkout.c:263 builtin/checkout.c:266
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with %s"
|
||||
msgstr "'%s' ne peut pas être utilisé avec %s"
|
||||
|
||||
#: builtin/checkout.c:273
|
||||
#: builtin/checkout.c:269
|
||||
#, c-format
|
||||
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
||||
msgstr ""
|
||||
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
|
||||
"même temps."
|
||||
|
||||
#: builtin/checkout.c:287 builtin/checkout.c:481
|
||||
#: builtin/checkout.c:280 builtin/checkout.c:474
|
||||
msgid "corrupt index file"
|
||||
msgstr "fichier d'index corrompu"
|
||||
|
||||
#: builtin/checkout.c:347 builtin/checkout.c:354
|
||||
#: builtin/checkout.c:340 builtin/checkout.c:347
|
||||
#, c-format
|
||||
msgid "path '%s' is unmerged"
|
||||
msgstr "le chemin '%s' n'est pas fusionné"
|
||||
|
||||
#: builtin/checkout.c:503
|
||||
#: builtin/checkout.c:496
|
||||
msgid "you need to resolve your current index first"
|
||||
msgstr "vous devez d'abord résoudre votre index courant"
|
||||
|
||||
#: builtin/checkout.c:634
|
||||
#: builtin/checkout.c:627
|
||||
#, c-format
|
||||
msgid "Can not do reflog for '%s'\n"
|
||||
msgstr "Impossible de faire un reflog pour '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:670
|
||||
#: builtin/checkout.c:663
|
||||
msgid "HEAD is now at"
|
||||
msgstr "HEAD est maintenant sur"
|
||||
|
||||
#: builtin/checkout.c:677
|
||||
#: builtin/checkout.c:670
|
||||
#, c-format
|
||||
msgid "Reset branch '%s'\n"
|
||||
msgstr "Remise à zéro de la branche '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:680
|
||||
#: builtin/checkout.c:673
|
||||
#, c-format
|
||||
msgid "Already on '%s'\n"
|
||||
msgstr "Déjà sur '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:684
|
||||
#: builtin/checkout.c:677
|
||||
#, c-format
|
||||
msgid "Switched to and reset branch '%s'\n"
|
||||
msgstr "Basculement et remise à zéro de la branche '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:686 builtin/checkout.c:1285
|
||||
#: builtin/checkout.c:679 builtin/checkout.c:1134
|
||||
#, c-format
|
||||
msgid "Switched to a new branch '%s'\n"
|
||||
msgstr "Basculement sur la nouvelle branche '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:688
|
||||
#: builtin/checkout.c:681
|
||||
#, c-format
|
||||
msgid "Switched to branch '%s'\n"
|
||||
msgstr "Basculement sur la branche '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:740
|
||||
#: builtin/checkout.c:733
|
||||
#, c-format
|
||||
msgid " ... and %d more.\n"
|
||||
msgstr " ... et %d en plus.\n"
|
||||
|
||||
#: builtin/checkout.c:746
|
||||
#: builtin/checkout.c:739
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Warning: you are leaving %d commit behind, not connected to\n"
|
||||
|
|
@ -3699,7 +3707,7 @@ msgstr[1] ""
|
|||
"\n"
|
||||
"%s\n"
|
||||
|
||||
#: builtin/checkout.c:765
|
||||
#: builtin/checkout.c:758
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you want to keep it by creating a new branch, this may be a good time\n"
|
||||
|
|
@ -3714,189 +3722,164 @@ msgid_plural ""
|
|||
" git branch <new-branch-name> %s\n"
|
||||
"\n"
|
||||
msgstr[0] ""
|
||||
"Si vous souhaitez le garder en créant une nouvelle branche, c'est le bon moment\n"
|
||||
"Si vous souhaitez le garder en créant une nouvelle branche, c'est le bon "
|
||||
"moment\n"
|
||||
"pour le faire avec :\n"
|
||||
"\n"
|
||||
"git branch <nouvelle-branche> %s\n"
|
||||
"\n"
|
||||
msgstr[1] ""
|
||||
"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon moment\n"
|
||||
"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon "
|
||||
"moment\n"
|
||||
"pour le faire avec :\n"
|
||||
"\n"
|
||||
"git branch <nouvelle-branche> %s\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/checkout.c:801
|
||||
#: builtin/checkout.c:794
|
||||
msgid "internal error in revision walk"
|
||||
msgstr "erreur interne lors du parcours des révisions"
|
||||
|
||||
#: builtin/checkout.c:805
|
||||
#: builtin/checkout.c:798
|
||||
msgid "Previous HEAD position was"
|
||||
msgstr "La position précédente de HEAD était sur"
|
||||
|
||||
#: builtin/checkout.c:832 builtin/checkout.c:1280
|
||||
#: builtin/checkout.c:825 builtin/checkout.c:1129
|
||||
msgid "You are on a branch yet to be born"
|
||||
msgstr "Vous êtes sur une branche qui doit encore naître"
|
||||
|
||||
#: builtin/checkout.c:893
|
||||
msgid "no branch specified"
|
||||
msgstr "aucune branche spécifiée"
|
||||
|
||||
#: builtin/checkout.c:895
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "'%s' existe déjà"
|
||||
|
||||
#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
|
||||
#: builtin/clone.c:853
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
|
||||
|
||||
#: builtin/checkout.c:924
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "impossible de créer le répertoire de '%s'"
|
||||
|
||||
#: builtin/checkout.c:960
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Saisir %s (identifiant %s)"
|
||||
|
||||
#: builtin/checkout.c:1070
|
||||
#: builtin/checkout.c:931
|
||||
#, c-format
|
||||
msgid "'%s' is already checked out at '%s'"
|
||||
msgstr "'%s' est déjà extrait dans '%s'"
|
||||
|
||||
#: builtin/checkout.c:1176
|
||||
#: builtin/checkout.c:1036
|
||||
#, c-format
|
||||
msgid "only one reference expected, %d given."
|
||||
msgstr "une seule référence attendue, %d fournies."
|
||||
|
||||
#: builtin/checkout.c:1215
|
||||
#: builtin/checkout.c:1075
|
||||
#, c-format
|
||||
msgid "invalid reference: %s"
|
||||
msgstr "référence invalide : %s"
|
||||
|
||||
#: builtin/checkout.c:1255
|
||||
#: builtin/checkout.c:1104
|
||||
#, c-format
|
||||
msgid "reference is not a tree: %s"
|
||||
msgstr "la référence n'est pas un arbre : %s"
|
||||
|
||||
#: builtin/checkout.c:1294
|
||||
#: builtin/checkout.c:1143
|
||||
msgid "paths cannot be used with switching branches"
|
||||
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
|
||||
|
||||
#: builtin/checkout.c:1297 builtin/checkout.c:1301
|
||||
#: builtin/checkout.c:1146 builtin/checkout.c:1150
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with switching branches"
|
||||
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
|
||||
|
||||
#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
|
||||
#: builtin/checkout.c:1316
|
||||
#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
|
||||
#: builtin/checkout.c:1165
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with '%s'"
|
||||
msgstr "'%s' ne peut pas être utilisé avec '%s'"
|
||||
|
||||
#: builtin/checkout.c:1321
|
||||
#: builtin/checkout.c:1170
|
||||
#, c-format
|
||||
msgid "Cannot switch branch to a non-commit '%s'"
|
||||
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
|
||||
|
||||
#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161
|
||||
#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
|
||||
#: builtin/worktree.c:284
|
||||
msgid "branch"
|
||||
msgstr "branche"
|
||||
|
||||
#: builtin/checkout.c:1347
|
||||
#: builtin/checkout.c:1204
|
||||
msgid "create and checkout a new branch"
|
||||
msgstr "créer et extraire une nouvelle branche"
|
||||
|
||||
#: builtin/checkout.c:1349
|
||||
#: builtin/checkout.c:1206
|
||||
msgid "create/reset and checkout a branch"
|
||||
msgstr "créer/réinitialiser et extraire une branche"
|
||||
|
||||
#: builtin/checkout.c:1350
|
||||
#: builtin/checkout.c:1207
|
||||
msgid "create reflog for new branch"
|
||||
msgstr "créer un reflog pour une nouvelle branche"
|
||||
|
||||
#: builtin/checkout.c:1351
|
||||
#: builtin/checkout.c:1208
|
||||
msgid "detach the HEAD at named commit"
|
||||
msgstr "détacher la HEAD à la validation nommée"
|
||||
|
||||
#: builtin/checkout.c:1352
|
||||
#: builtin/checkout.c:1209
|
||||
msgid "set upstream info for new branch"
|
||||
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new-branch"
|
||||
msgstr "nouvelle branche"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new unparented branch"
|
||||
msgstr "nouvelle branche sans parent"
|
||||
|
||||
#: builtin/checkout.c:1355
|
||||
#: builtin/checkout.c:1212
|
||||
msgid "checkout our version for unmerged files"
|
||||
msgstr "extraire notre version pour les fichiers non fusionnés"
|
||||
|
||||
#: builtin/checkout.c:1357
|
||||
#: builtin/checkout.c:1214
|
||||
msgid "checkout their version for unmerged files"
|
||||
msgstr "extraire leur version pour les fichiers non fusionnés"
|
||||
|
||||
#: builtin/checkout.c:1359
|
||||
#: builtin/checkout.c:1216
|
||||
msgid "force checkout (throw away local modifications)"
|
||||
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
|
||||
|
||||
#: builtin/checkout.c:1360
|
||||
#: builtin/checkout.c:1217
|
||||
msgid "perform a 3-way merge with the new branch"
|
||||
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
|
||||
|
||||
#: builtin/checkout.c:1361 builtin/merge.c:227
|
||||
#: builtin/checkout.c:1218 builtin/merge.c:227
|
||||
msgid "update ignored files (default)"
|
||||
msgstr "mettre à jour les fichiers ignorés (par défaut)"
|
||||
|
||||
#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
|
||||
#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
|
||||
msgid "style"
|
||||
msgstr "style"
|
||||
|
||||
#: builtin/checkout.c:1363
|
||||
#: builtin/checkout.c:1220
|
||||
msgid "conflict style (merge or diff3)"
|
||||
msgstr "style de conflit (fusion ou diff3)"
|
||||
|
||||
#: builtin/checkout.c:1366
|
||||
#: builtin/checkout.c:1223
|
||||
msgid "do not limit pathspecs to sparse entries only"
|
||||
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
|
||||
|
||||
#: builtin/checkout.c:1368
|
||||
#: builtin/checkout.c:1225
|
||||
msgid "second guess 'git checkout <no-such-branch>'"
|
||||
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
|
||||
|
||||
#: builtin/checkout.c:1370
|
||||
msgid "check a branch out in a separate working directory"
|
||||
msgstr "extraire une branche dans un répertoire de travail séparé"
|
||||
|
||||
#: builtin/checkout.c:1372
|
||||
#: builtin/checkout.c:1227
|
||||
msgid "do not check if another worktree is holding the given ref"
|
||||
msgstr "ne pas vérifier si une autre copie de travail contient le référence fournie"
|
||||
msgstr ""
|
||||
"ne pas vérifier si une autre copie de travail contient le référence fournie"
|
||||
|
||||
#: builtin/checkout.c:1406
|
||||
#: builtin/checkout.c:1252
|
||||
msgid "-b, -B and --orphan are mutually exclusive"
|
||||
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
|
||||
|
||||
#: builtin/checkout.c:1423
|
||||
#: builtin/checkout.c:1269
|
||||
msgid "--track needs a branch name"
|
||||
msgstr "--track requiert un nom de branche"
|
||||
|
||||
#: builtin/checkout.c:1428
|
||||
#: builtin/checkout.c:1274
|
||||
msgid "Missing branch name; try -b"
|
||||
msgstr "Nom de branche manquant ; essayez -b"
|
||||
|
||||
#: builtin/checkout.c:1464
|
||||
#: builtin/checkout.c:1310
|
||||
msgid "invalid path specification"
|
||||
msgstr "spécification de chemin invalide"
|
||||
|
||||
#: builtin/checkout.c:1471
|
||||
#: builtin/checkout.c:1317
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot update paths and switch to branch '%s' at the same time.\n"
|
||||
|
|
@ -3906,12 +3889,12 @@ msgstr ""
|
|||
"en même temps.\n"
|
||||
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
|
||||
|
||||
#: builtin/checkout.c:1476
|
||||
#: builtin/checkout.c:1322
|
||||
#, c-format
|
||||
msgid "git checkout: --detach does not take a path argument '%s'"
|
||||
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
|
||||
|
||||
#: builtin/checkout.c:1480
|
||||
#: builtin/checkout.c:1326
|
||||
msgid ""
|
||||
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
||||
"checking out of the index."
|
||||
|
|
@ -4197,57 +4180,57 @@ msgstr "clé=valeur"
|
|||
msgid "set config inside the new repository"
|
||||
msgstr "régler la configuration dans le nouveau dépôt"
|
||||
|
||||
#: builtin/clone.c:247
|
||||
#: builtin/clone.c:240
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is not a local repository."
|
||||
msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
|
||||
|
||||
#: builtin/clone.c:251
|
||||
#: builtin/clone.c:244
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is shallow"
|
||||
msgstr "le dépôt de référence '%s' est superficiel"
|
||||
|
||||
#: builtin/clone.c:254
|
||||
#: builtin/clone.c:247
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is grafted"
|
||||
msgstr "le dépôt de référence '%s' est greffé"
|
||||
|
||||
#: builtin/clone.c:317
|
||||
#: builtin/clone.c:310
|
||||
#, c-format
|
||||
msgid "failed to create directory '%s'"
|
||||
msgstr "échec de la création du répertoire '%s'"
|
||||
|
||||
#: builtin/clone.c:319 builtin/diff.c:84
|
||||
#: builtin/clone.c:312 builtin/diff.c:84
|
||||
#, c-format
|
||||
msgid "failed to stat '%s'"
|
||||
msgstr "échec du stat de '%s'"
|
||||
|
||||
#: builtin/clone.c:321
|
||||
#: builtin/clone.c:314
|
||||
#, c-format
|
||||
msgid "%s exists and is not a directory"
|
||||
msgstr "%s existe et n'est pas un répertoire"
|
||||
|
||||
#: builtin/clone.c:335
|
||||
#: builtin/clone.c:328
|
||||
#, c-format
|
||||
msgid "failed to stat %s\n"
|
||||
msgstr "échec du stat de %s\n"
|
||||
|
||||
#: builtin/clone.c:357
|
||||
#: builtin/clone.c:350
|
||||
#, c-format
|
||||
msgid "failed to create link '%s'"
|
||||
msgstr "échec de la création du lien '%s'"
|
||||
|
||||
#: builtin/clone.c:361
|
||||
#: builtin/clone.c:354
|
||||
#, c-format
|
||||
msgid "failed to copy file to '%s'"
|
||||
msgstr "échec de la copie vers '%s'"
|
||||
|
||||
#: builtin/clone.c:384 builtin/clone.c:558
|
||||
#: builtin/clone.c:377 builtin/clone.c:551
|
||||
#, c-format
|
||||
msgid "done.\n"
|
||||
msgstr "fait.\n"
|
||||
|
||||
#: builtin/clone.c:396
|
||||
#: builtin/clone.c:389
|
||||
msgid ""
|
||||
"Clone succeeded, but checkout failed.\n"
|
||||
"You can inspect what was checked out with 'git status'\n"
|
||||
|
|
@ -4257,119 +4240,125 @@ msgstr ""
|
|||
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
|
||||
"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
|
||||
|
||||
#: builtin/clone.c:473
|
||||
#: builtin/clone.c:466
|
||||
#, c-format
|
||||
msgid "Could not find remote branch %s to clone."
|
||||
msgstr "Impossible de trouver la branche distante '%s' à cloner."
|
||||
|
||||
#: builtin/clone.c:553
|
||||
#: builtin/clone.c:546
|
||||
#, c-format
|
||||
msgid "Checking connectivity... "
|
||||
msgstr "Vérification de la connectivité... "
|
||||
|
||||
#: builtin/clone.c:556
|
||||
#: builtin/clone.c:549
|
||||
msgid "remote did not send all necessary objects"
|
||||
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
|
||||
|
||||
#: builtin/clone.c:620
|
||||
#: builtin/clone.c:613
|
||||
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
||||
msgstr ""
|
||||
"la HEAD distante réfère à une référence non existante, impossible de "
|
||||
"l'extraire.\n"
|
||||
|
||||
#: builtin/clone.c:651
|
||||
#: builtin/clone.c:644
|
||||
msgid "unable to checkout working tree"
|
||||
msgstr "impossible d'extraire la copie de travail"
|
||||
|
||||
#: builtin/clone.c:738
|
||||
#: builtin/clone.c:731
|
||||
msgid "cannot repack to clean up"
|
||||
msgstr "impossible de remballer pour nettoyer"
|
||||
|
||||
#: builtin/clone.c:740
|
||||
#: builtin/clone.c:733
|
||||
msgid "cannot unlink temporary alternates file"
|
||||
msgstr "impossible de unlinker le fichier temporaire alternates"
|
||||
|
||||
#: builtin/clone.c:770
|
||||
#: builtin/clone.c:763
|
||||
msgid "Too many arguments."
|
||||
msgstr "Trop d'arguments."
|
||||
|
||||
#: builtin/clone.c:774
|
||||
#: builtin/clone.c:767
|
||||
msgid "You must specify a repository to clone."
|
||||
msgstr "Vous devez spécifier un dépôt à cloner."
|
||||
|
||||
#: builtin/clone.c:785
|
||||
#: builtin/clone.c:778
|
||||
#, c-format
|
||||
msgid "--bare and --origin %s options are incompatible."
|
||||
msgstr "les options --bare et --origin %s sont incompatibles."
|
||||
|
||||
#: builtin/clone.c:788
|
||||
#: builtin/clone.c:781
|
||||
msgid "--bare and --separate-git-dir are incompatible."
|
||||
msgstr "--bare et --separate-git-dir sont incompatibles."
|
||||
|
||||
#: builtin/clone.c:801
|
||||
#: builtin/clone.c:794
|
||||
#, c-format
|
||||
msgid "repository '%s' does not exist"
|
||||
msgstr "le dépôt '%s' n'existe pas"
|
||||
|
||||
#: builtin/clone.c:807 builtin/fetch.c:1160
|
||||
#: builtin/clone.c:800 builtin/fetch.c:1160
|
||||
#, c-format
|
||||
msgid "depth %s is not a positive number"
|
||||
msgstr "la profondeur %s n'est pas un entier positif"
|
||||
|
||||
#: builtin/clone.c:817
|
||||
#: builtin/clone.c:810
|
||||
#, c-format
|
||||
msgid "destination path '%s' already exists and is not an empty directory."
|
||||
msgstr ""
|
||||
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
|
||||
|
||||
#: builtin/clone.c:827
|
||||
#: builtin/clone.c:820
|
||||
#, c-format
|
||||
msgid "working tree '%s' already exists."
|
||||
msgstr "la copie de travail '%s' existe déjà."
|
||||
|
||||
#: builtin/clone.c:845
|
||||
#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
|
||||
#: builtin/worktree.c:220
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
|
||||
|
||||
#: builtin/clone.c:838
|
||||
#, c-format
|
||||
msgid "could not create work tree dir '%s'"
|
||||
msgstr "impossible de créer le répertoire de la copie de travail '%s'"
|
||||
|
||||
#: builtin/clone.c:863
|
||||
#: builtin/clone.c:856
|
||||
#, c-format
|
||||
msgid "Cloning into bare repository '%s'...\n"
|
||||
msgstr "Clonage dans le dépôt nu '%s'\n"
|
||||
|
||||
#: builtin/clone.c:865
|
||||
#: builtin/clone.c:858
|
||||
#, c-format
|
||||
msgid "Cloning into '%s'...\n"
|
||||
msgstr "Clonage dans '%s'...\n"
|
||||
|
||||
#: builtin/clone.c:890
|
||||
#: builtin/clone.c:883
|
||||
msgid "--dissociate given, but there is no --reference"
|
||||
msgstr "--dissociate est spécifié, mais --reference est absent"
|
||||
|
||||
#: builtin/clone.c:907
|
||||
#: builtin/clone.c:900
|
||||
msgid "--depth is ignored in local clones; use file:// instead."
|
||||
msgstr ""
|
||||
"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
|
||||
|
||||
#: builtin/clone.c:910
|
||||
#: builtin/clone.c:903
|
||||
msgid "source repository is shallow, ignoring --local"
|
||||
msgstr "le dépôt source est superficiel, option --local ignorée"
|
||||
|
||||
#: builtin/clone.c:915
|
||||
#: builtin/clone.c:908
|
||||
msgid "--local is ignored"
|
||||
msgstr "--local est ignoré"
|
||||
|
||||
#: builtin/clone.c:919
|
||||
#: builtin/clone.c:912
|
||||
#, c-format
|
||||
msgid "Don't know how to clone %s"
|
||||
msgstr "Je ne sais pas cloner %s"
|
||||
|
||||
#: builtin/clone.c:968 builtin/clone.c:976
|
||||
#: builtin/clone.c:961 builtin/clone.c:969
|
||||
#, c-format
|
||||
msgid "Remote branch %s not found in upstream %s"
|
||||
msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
|
||||
|
||||
#: builtin/clone.c:979
|
||||
#: builtin/clone.c:972
|
||||
msgid "You appear to have cloned an empty repository."
|
||||
msgstr "Vous semblez avoir cloné un dépôt vide."
|
||||
|
||||
|
|
@ -5759,7 +5748,7 @@ msgstr "clé"
|
|||
msgid "field name to sort on"
|
||||
msgstr "nom du champ servant à trier"
|
||||
|
||||
#: builtin/fsck.c:147 builtin/prune.c:236
|
||||
#: builtin/fsck.c:147 builtin/prune.c:137
|
||||
msgid "Checking connectivity"
|
||||
msgstr "Vérification de la connectivité"
|
||||
|
||||
|
|
@ -5808,7 +5797,7 @@ msgstr "activer une vérification plus strict"
|
|||
msgid "write dangling objects in .git/lost-found"
|
||||
msgstr "écrire les objets en suspens dans .git/lost-found"
|
||||
|
||||
#: builtin/fsck.c:627 builtin/prune.c:198
|
||||
#: builtin/fsck.c:627 builtin/prune.c:107
|
||||
msgid "show progress"
|
||||
msgstr "afficher la progression"
|
||||
|
||||
|
|
@ -8308,60 +8297,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|||
msgid "Removing duplicate objects"
|
||||
msgstr "Suppression des objets dupliqués"
|
||||
|
||||
#: builtin/prune.c:12
|
||||
#: builtin/prune.c:11
|
||||
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
||||
msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]"
|
||||
|
||||
#: builtin/prune.c:86
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Suppression de worktrees/%s : répertoire invalide"
|
||||
|
||||
#: builtin/prune.c:92
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
|
||||
|
||||
#: builtin/prune.c:97
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
|
||||
|
||||
#: builtin/prune.c:108
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
|
||||
|
||||
#: builtin/prune.c:124
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr "Suppression de worktrees/%s : le fichier gitdir point sur un endroit inexistant"
|
||||
|
||||
#: builtin/prune.c:159
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "échec de la suppression de %s"
|
||||
|
||||
#: builtin/prune.c:196
|
||||
#: builtin/prune.c:105 builtin/worktree.c:112
|
||||
msgid "do not remove, show only"
|
||||
msgstr "ne pas supprimer, afficher seulement"
|
||||
|
||||
#: builtin/prune.c:197
|
||||
#: builtin/prune.c:106 builtin/worktree.c:113
|
||||
msgid "report pruned objects"
|
||||
msgstr "afficher les objets éliminés"
|
||||
|
||||
#: builtin/prune.c:199
|
||||
msgid "prune .git/worktrees"
|
||||
msgstr "éliminer .git/worktrees"
|
||||
|
||||
#: builtin/prune.c:201
|
||||
#: builtin/prune.c:109 builtin/worktree.c:115
|
||||
msgid "expire objects older than <time>"
|
||||
msgstr "faire expirer les objets plus vieux que <heure>"
|
||||
|
||||
#: builtin/prune.c:216
|
||||
msgid "--worktrees does not take extra arguments"
|
||||
msgstr "--worktrees n'accepte pas d'argument supplémentaire"
|
||||
|
||||
#: builtin/push.c:14
|
||||
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
||||
msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
|
||||
|
|
@ -10278,27 +10229,36 @@ msgstr "Test en cours "
|
|||
|
||||
#: builtin/update-index.c:136
|
||||
msgid "directory stat info does not change after adding a new file"
|
||||
msgstr "l'information de stat du répertoire ne change pas après ajout d'un fichier"
|
||||
msgstr ""
|
||||
"l'information de stat du répertoire ne change pas après ajout d'un fichier"
|
||||
|
||||
#: builtin/update-index.c:149
|
||||
msgid "directory stat info does not change after adding a new directory"
|
||||
msgstr "l'information de stat du répertoire ne change pas après ajout d'un répertoire"
|
||||
msgstr ""
|
||||
"l'information de stat du répertoire ne change pas après ajout d'un répertoire"
|
||||
|
||||
#: builtin/update-index.c:162
|
||||
msgid "directory stat info changes after updating a file"
|
||||
msgstr "l'information de stat du répertoire change après mise à jour d'un fichier"
|
||||
msgstr ""
|
||||
"l'information de stat du répertoire change après mise à jour d'un fichier"
|
||||
|
||||
#: builtin/update-index.c:173
|
||||
msgid "directory stat info changes after adding a file inside subdirectory"
|
||||
msgstr "l'information de stat du répertoire change après l'ajout d'un fichier dans un sous-répertoire"
|
||||
msgstr ""
|
||||
"l'information de stat du répertoire change après l'ajout d'un fichier dans "
|
||||
"un sous-répertoire"
|
||||
|
||||
#: builtin/update-index.c:184
|
||||
msgid "directory stat info does not change after deleting a file"
|
||||
msgstr "l'information de stat du répertoire ne change pas après la suppression d'un fichier<"
|
||||
msgstr ""
|
||||
"l'information de stat du répertoire ne change pas après la suppression d'un "
|
||||
"fichier<"
|
||||
|
||||
#: builtin/update-index.c:197
|
||||
msgid "directory stat info does not change after deleting a directory"
|
||||
msgstr "l'information de stat du répertoire ne change pas après la suppression d'un répertoire"
|
||||
msgstr ""
|
||||
"l'information de stat du répertoire ne change pas après la suppression d'un "
|
||||
"répertoire"
|
||||
|
||||
#: builtin/update-index.c:204
|
||||
msgid " OK"
|
||||
|
|
@ -10498,6 +10458,86 @@ msgstr "git verify-tag [-v | --verbose] <étiquette>..."
|
|||
msgid "print tag contents"
|
||||
msgstr "afficher le contenu de l'étiquette"
|
||||
|
||||
#: builtin/worktree.c:11
|
||||
msgid "git worktree add [<options>] <path> <branch>"
|
||||
msgstr "git worktree add [<options>] <chemin> <branche>"
|
||||
|
||||
#: builtin/worktree.c:12
|
||||
msgid "git worktree prune [<options>]"
|
||||
msgstr "git worktree prune [<options>]"
|
||||
|
||||
#: builtin/worktree.c:27
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Suppression de worktrees/%s : répertoire invalide"
|
||||
|
||||
#: builtin/worktree.c:33
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
|
||||
|
||||
#: builtin/worktree.c:38
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr ""
|
||||
"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
|
||||
|
||||
#: builtin/worktree.c:49
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
|
||||
|
||||
#: builtin/worktree.c:65
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr ""
|
||||
"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
|
||||
"inexistant"
|
||||
|
||||
#: builtin/worktree.c:100
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "échec de la suppression de %s"
|
||||
|
||||
#: builtin/worktree.c:186
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "'%s' existe déjà"
|
||||
|
||||
#: builtin/worktree.c:207
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "impossible de créer le répertoire de '%s'"
|
||||
|
||||
#: builtin/worktree.c:241
|
||||
msgid "unable to resolve HEAD"
|
||||
msgstr "impossible de résoudre HEAD"
|
||||
|
||||
#: builtin/worktree.c:249
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Saisir %s (identifiant %s)"
|
||||
|
||||
#: builtin/worktree.c:281
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr "extraire la <branche> même si elle est déjà extraite dans une autre copie de travail"
|
||||
|
||||
#: builtin/worktree.c:283
|
||||
msgid "create a new branch"
|
||||
msgstr "créer une nouvelle branche"
|
||||
|
||||
#: builtin/worktree.c:285
|
||||
msgid "create or reset a branch"
|
||||
msgstr "créer ou réinitialiser une branche"
|
||||
|
||||
#: builtin/worktree.c:286
|
||||
msgid "detach HEAD at named commit"
|
||||
msgstr "détacher la HEAD au commit nommé"
|
||||
|
||||
#: builtin/worktree.c:292
|
||||
msgid "-b and -B are mutually exclusive"
|
||||
msgstr "-b et -B sont mutuellement exclusifs"
|
||||
|
||||
#: builtin/write-tree.c:13
|
||||
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
||||
msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]"
|
||||
|
|
@ -10534,7 +10574,8 @@ msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"
|
|||
|
||||
#: common-cmds.h:11
|
||||
msgid "work on the current change (see also: git help everyday)"
|
||||
msgstr "travailler sur la modification actuelle (voir aussi : git help revisions)"
|
||||
msgstr ""
|
||||
"travailler sur la modification actuelle (voir aussi : git help revisions)"
|
||||
|
||||
#: common-cmds.h:12
|
||||
msgid "examine the history and state (see also: git help revisions)"
|
||||
|
|
@ -10561,8 +10602,8 @@ msgid "List, create, or delete branches"
|
|||
msgstr "Lister, créer ou supprimer des branches"
|
||||
|
||||
#: common-cmds.h:21
|
||||
msgid "Checkout a branch or paths to the working tree"
|
||||
msgstr "Extraire une branche ou des chemins dans la copie de travail"
|
||||
msgid "Switch branches or restore working tree files"
|
||||
msgstr "Basculer de branche ou restaurer la copie de travail"
|
||||
|
||||
#: common-cmds.h:22
|
||||
msgid "Clone a repository into a new directory"
|
||||
|
|
@ -11659,6 +11700,18 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
|
|||
msgid "Synchronizing submodule url for '$displaypath'"
|
||||
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
|
||||
|
||||
#~ msgid "no branch specified"
|
||||
#~ msgstr "aucune branche spécifiée"
|
||||
|
||||
#~ msgid "check a branch out in a separate working directory"
|
||||
#~ msgstr "extraire une branche dans un répertoire de travail séparé"
|
||||
|
||||
#~ msgid "prune .git/worktrees"
|
||||
#~ msgstr "éliminer .git/worktrees"
|
||||
|
||||
#~ msgid "--worktrees does not take extra arguments"
|
||||
#~ msgstr "--worktrees n'accepte pas d'argument supplémentaire"
|
||||
|
||||
#~ msgid "The most commonly used git commands are:"
|
||||
#~ msgstr "Les commandes git les plus utilisées sont :"
|
||||
|
||||
|
|
|
|||
381
po/git.pot
381
po/git.pot
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2015-06-27 19:17+0800\n"
|
||||
"POT-Creation-Date: 2015-07-14 07:19+0800\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -624,8 +624,8 @@ msgstr ""
|
|||
msgid "failed to read the cache"
|
||||
msgstr ""
|
||||
|
||||
#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
|
||||
#: builtin/clone.c:654
|
||||
#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
|
||||
#: builtin/clone.c:647
|
||||
msgid "unable to write new index file"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -672,7 +672,7 @@ msgstr ""
|
|||
msgid "blob expected for %s '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:788 builtin/clone.c:313
|
||||
#: merge-recursive.c:788 builtin/clone.c:306
|
||||
#, c-format
|
||||
msgid "failed to open '%s'"
|
||||
msgstr ""
|
||||
|
|
@ -1930,7 +1930,7 @@ msgstr ""
|
|||
msgid "behind "
|
||||
msgstr ""
|
||||
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:352
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:345
|
||||
#, c-format
|
||||
msgid "failed to unlink '%s'"
|
||||
msgstr ""
|
||||
|
|
@ -2008,7 +2008,7 @@ msgstr ""
|
|||
msgid "interactive picking"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
|
||||
#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
|
||||
msgid "select hunks interactively"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2340,7 +2340,7 @@ msgstr ""
|
|||
msgid "Checking patch %s..."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
|
||||
#, c-format
|
||||
msgid "make_cache_entry failed for path '%s'"
|
||||
msgstr ""
|
||||
|
|
@ -3027,7 +3027,7 @@ msgstr ""
|
|||
msgid "Failed to resolve HEAD as a valid ref."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/branch.c:878 builtin/clone.c:629
|
||||
#: builtin/branch.c:878 builtin/clone.c:622
|
||||
msgid "HEAD not found below refs/heads!"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3216,7 +3216,7 @@ msgstr ""
|
|||
msgid "terminate input and output records by a NUL character"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
|
||||
msgid "suppress progress reporting"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3313,113 +3313,113 @@ msgstr ""
|
|||
msgid "copy out the files from named stage"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:26
|
||||
#: builtin/checkout.c:24
|
||||
msgid "git checkout [<options>] <branch>"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:27
|
||||
#: builtin/checkout.c:25
|
||||
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:138 builtin/checkout.c:171
|
||||
#: builtin/checkout.c:134 builtin/checkout.c:167
|
||||
#, c-format
|
||||
msgid "path '%s' does not have our version"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:140 builtin/checkout.c:173
|
||||
#: builtin/checkout.c:136 builtin/checkout.c:169
|
||||
#, c-format
|
||||
msgid "path '%s' does not have their version"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:156
|
||||
#: builtin/checkout.c:152
|
||||
#, c-format
|
||||
msgid "path '%s' does not have all necessary versions"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:200
|
||||
#: builtin/checkout.c:196
|
||||
#, c-format
|
||||
msgid "path '%s' does not have necessary versions"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:217
|
||||
#: builtin/checkout.c:213
|
||||
#, c-format
|
||||
msgid "path '%s': cannot merge"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:234
|
||||
#: builtin/checkout.c:230
|
||||
#, c-format
|
||||
msgid "Unable to add merge result for '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
|
||||
#: builtin/checkout.c:264 builtin/checkout.c:277
|
||||
#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
|
||||
#: builtin/checkout.c:260
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with updating paths"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:267 builtin/checkout.c:270
|
||||
#: builtin/checkout.c:263 builtin/checkout.c:266
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:273
|
||||
#: builtin/checkout.c:269
|
||||
#, c-format
|
||||
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:287 builtin/checkout.c:481
|
||||
#: builtin/checkout.c:280 builtin/checkout.c:474
|
||||
msgid "corrupt index file"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:347 builtin/checkout.c:354
|
||||
#: builtin/checkout.c:340 builtin/checkout.c:347
|
||||
#, c-format
|
||||
msgid "path '%s' is unmerged"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:503
|
||||
#: builtin/checkout.c:496
|
||||
msgid "you need to resolve your current index first"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:634
|
||||
#: builtin/checkout.c:627
|
||||
#, c-format
|
||||
msgid "Can not do reflog for '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:670
|
||||
#: builtin/checkout.c:663
|
||||
msgid "HEAD is now at"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:677
|
||||
#: builtin/checkout.c:670
|
||||
#, c-format
|
||||
msgid "Reset branch '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:680
|
||||
#: builtin/checkout.c:673
|
||||
#, c-format
|
||||
msgid "Already on '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:684
|
||||
#: builtin/checkout.c:677
|
||||
#, c-format
|
||||
msgid "Switched to and reset branch '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:686 builtin/checkout.c:1285
|
||||
#: builtin/checkout.c:679 builtin/checkout.c:1134
|
||||
#, c-format
|
||||
msgid "Switched to a new branch '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:688
|
||||
#: builtin/checkout.c:681
|
||||
#, c-format
|
||||
msgid "Switched to branch '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:740
|
||||
#: builtin/checkout.c:733
|
||||
#, c-format
|
||||
msgid " ... and %d more.\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:746
|
||||
#: builtin/checkout.c:739
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Warning: you are leaving %d commit behind, not connected to\n"
|
||||
|
|
@ -3434,7 +3434,7 @@ msgid_plural ""
|
|||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: builtin/checkout.c:765
|
||||
#: builtin/checkout.c:758
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you want to keep it by creating a new branch, this may be a good time\n"
|
||||
|
|
@ -3451,189 +3451,161 @@ msgid_plural ""
|
|||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: builtin/checkout.c:801
|
||||
#: builtin/checkout.c:794
|
||||
msgid "internal error in revision walk"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:805
|
||||
#: builtin/checkout.c:798
|
||||
msgid "Previous HEAD position was"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:832 builtin/checkout.c:1280
|
||||
#: builtin/checkout.c:825 builtin/checkout.c:1129
|
||||
msgid "You are on a branch yet to be born"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:893
|
||||
msgid "no branch specified"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:895
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
|
||||
#: builtin/clone.c:853
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:924
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:960
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1070
|
||||
#: builtin/checkout.c:931
|
||||
#, c-format
|
||||
msgid "'%s' is already checked out at '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1176
|
||||
#: builtin/checkout.c:1036
|
||||
#, c-format
|
||||
msgid "only one reference expected, %d given."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1215
|
||||
#: builtin/checkout.c:1075
|
||||
#, c-format
|
||||
msgid "invalid reference: %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1255
|
||||
#: builtin/checkout.c:1104
|
||||
#, c-format
|
||||
msgid "reference is not a tree: %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1294
|
||||
#: builtin/checkout.c:1143
|
||||
msgid "paths cannot be used with switching branches"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1297 builtin/checkout.c:1301
|
||||
#: builtin/checkout.c:1146 builtin/checkout.c:1150
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with switching branches"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
|
||||
#: builtin/checkout.c:1316
|
||||
#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
|
||||
#: builtin/checkout.c:1165
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1321
|
||||
#: builtin/checkout.c:1170
|
||||
#, c-format
|
||||
msgid "Cannot switch branch to a non-commit '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161
|
||||
#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
|
||||
#: builtin/worktree.c:284
|
||||
msgid "branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1347
|
||||
#: builtin/checkout.c:1204
|
||||
msgid "create and checkout a new branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1349
|
||||
#: builtin/checkout.c:1206
|
||||
msgid "create/reset and checkout a branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1350
|
||||
#: builtin/checkout.c:1207
|
||||
msgid "create reflog for new branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1351
|
||||
#: builtin/checkout.c:1208
|
||||
msgid "detach the HEAD at named commit"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1352
|
||||
#: builtin/checkout.c:1209
|
||||
msgid "set upstream info for new branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new-branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new unparented branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1355
|
||||
#: builtin/checkout.c:1212
|
||||
msgid "checkout our version for unmerged files"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1357
|
||||
#: builtin/checkout.c:1214
|
||||
msgid "checkout their version for unmerged files"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1359
|
||||
#: builtin/checkout.c:1216
|
||||
msgid "force checkout (throw away local modifications)"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1360
|
||||
#: builtin/checkout.c:1217
|
||||
msgid "perform a 3-way merge with the new branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1361 builtin/merge.c:227
|
||||
#: builtin/checkout.c:1218 builtin/merge.c:227
|
||||
msgid "update ignored files (default)"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
|
||||
#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
|
||||
msgid "style"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1363
|
||||
#: builtin/checkout.c:1220
|
||||
msgid "conflict style (merge or diff3)"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1366
|
||||
#: builtin/checkout.c:1223
|
||||
msgid "do not limit pathspecs to sparse entries only"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1368
|
||||
#: builtin/checkout.c:1225
|
||||
msgid "second guess 'git checkout <no-such-branch>'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1370
|
||||
msgid "check a branch out in a separate working directory"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1372
|
||||
#: builtin/checkout.c:1227
|
||||
msgid "do not check if another worktree is holding the given ref"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1406
|
||||
#: builtin/checkout.c:1252
|
||||
msgid "-b, -B and --orphan are mutually exclusive"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1423
|
||||
#: builtin/checkout.c:1269
|
||||
msgid "--track needs a branch name"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1428
|
||||
#: builtin/checkout.c:1274
|
||||
msgid "Missing branch name; try -b"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1464
|
||||
#: builtin/checkout.c:1310
|
||||
msgid "invalid path specification"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1471
|
||||
#: builtin/checkout.c:1317
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot update paths and switch to branch '%s' at the same time.\n"
|
||||
"Did you intend to checkout '%s' which can not be resolved as commit?"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1476
|
||||
#: builtin/checkout.c:1322
|
||||
#, c-format
|
||||
msgid "git checkout: --detach does not take a path argument '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/checkout.c:1480
|
||||
#: builtin/checkout.c:1326
|
||||
msgid ""
|
||||
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
||||
"checking out of the index."
|
||||
|
|
@ -3893,172 +3865,178 @@ msgstr ""
|
|||
msgid "set config inside the new repository"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:247
|
||||
#: builtin/clone.c:240
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is not a local repository."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:251
|
||||
#: builtin/clone.c:244
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is shallow"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:254
|
||||
#: builtin/clone.c:247
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is grafted"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:317
|
||||
#: builtin/clone.c:310
|
||||
#, c-format
|
||||
msgid "failed to create directory '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:319 builtin/diff.c:84
|
||||
#: builtin/clone.c:312 builtin/diff.c:84
|
||||
#, c-format
|
||||
msgid "failed to stat '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:321
|
||||
#: builtin/clone.c:314
|
||||
#, c-format
|
||||
msgid "%s exists and is not a directory"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:335
|
||||
#: builtin/clone.c:328
|
||||
#, c-format
|
||||
msgid "failed to stat %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:357
|
||||
#: builtin/clone.c:350
|
||||
#, c-format
|
||||
msgid "failed to create link '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:361
|
||||
#: builtin/clone.c:354
|
||||
#, c-format
|
||||
msgid "failed to copy file to '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:384 builtin/clone.c:558
|
||||
#: builtin/clone.c:377 builtin/clone.c:551
|
||||
#, c-format
|
||||
msgid "done.\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:396
|
||||
#: builtin/clone.c:389
|
||||
msgid ""
|
||||
"Clone succeeded, but checkout failed.\n"
|
||||
"You can inspect what was checked out with 'git status'\n"
|
||||
"and retry the checkout with 'git checkout -f HEAD'\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:473
|
||||
#: builtin/clone.c:466
|
||||
#, c-format
|
||||
msgid "Could not find remote branch %s to clone."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:553
|
||||
#: builtin/clone.c:546
|
||||
#, c-format
|
||||
msgid "Checking connectivity... "
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:556
|
||||
#: builtin/clone.c:549
|
||||
msgid "remote did not send all necessary objects"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:620
|
||||
#: builtin/clone.c:613
|
||||
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:651
|
||||
#: builtin/clone.c:644
|
||||
msgid "unable to checkout working tree"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:738
|
||||
#: builtin/clone.c:731
|
||||
msgid "cannot repack to clean up"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:740
|
||||
#: builtin/clone.c:733
|
||||
msgid "cannot unlink temporary alternates file"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:770
|
||||
#: builtin/clone.c:763
|
||||
msgid "Too many arguments."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:774
|
||||
#: builtin/clone.c:767
|
||||
msgid "You must specify a repository to clone."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:785
|
||||
#: builtin/clone.c:778
|
||||
#, c-format
|
||||
msgid "--bare and --origin %s options are incompatible."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:788
|
||||
#: builtin/clone.c:781
|
||||
msgid "--bare and --separate-git-dir are incompatible."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:801
|
||||
#: builtin/clone.c:794
|
||||
#, c-format
|
||||
msgid "repository '%s' does not exist"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:807 builtin/fetch.c:1160
|
||||
#: builtin/clone.c:800 builtin/fetch.c:1160
|
||||
#, c-format
|
||||
msgid "depth %s is not a positive number"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:817
|
||||
#: builtin/clone.c:810
|
||||
#, c-format
|
||||
msgid "destination path '%s' already exists and is not an empty directory."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:827
|
||||
#: builtin/clone.c:820
|
||||
#, c-format
|
||||
msgid "working tree '%s' already exists."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:845
|
||||
#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
|
||||
#: builtin/worktree.c:220
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:838
|
||||
#, c-format
|
||||
msgid "could not create work tree dir '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:863
|
||||
#: builtin/clone.c:856
|
||||
#, c-format
|
||||
msgid "Cloning into bare repository '%s'...\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:865
|
||||
#: builtin/clone.c:858
|
||||
#, c-format
|
||||
msgid "Cloning into '%s'...\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:890
|
||||
#: builtin/clone.c:883
|
||||
msgid "--dissociate given, but there is no --reference"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:907
|
||||
#: builtin/clone.c:900
|
||||
msgid "--depth is ignored in local clones; use file:// instead."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:910
|
||||
#: builtin/clone.c:903
|
||||
msgid "source repository is shallow, ignoring --local"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:915
|
||||
#: builtin/clone.c:908
|
||||
msgid "--local is ignored"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:919
|
||||
#: builtin/clone.c:912
|
||||
#, c-format
|
||||
msgid "Don't know how to clone %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:968 builtin/clone.c:976
|
||||
#: builtin/clone.c:961 builtin/clone.c:969
|
||||
#, c-format
|
||||
msgid "Remote branch %s not found in upstream %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:979
|
||||
#: builtin/clone.c:972
|
||||
msgid "You appear to have cloned an empty repository."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5351,7 +5329,7 @@ msgstr ""
|
|||
msgid "field name to sort on"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/fsck.c:147 builtin/prune.c:236
|
||||
#: builtin/fsck.c:147 builtin/prune.c:137
|
||||
msgid "Checking connectivity"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5399,7 +5377,7 @@ msgstr ""
|
|||
msgid "write dangling objects in .git/lost-found"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/fsck.c:627 builtin/prune.c:198
|
||||
#: builtin/fsck.c:627 builtin/prune.c:107
|
||||
msgid "show progress"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -7798,60 +7776,22 @@ msgstr ""
|
|||
msgid "Removing duplicate objects"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:12
|
||||
#: builtin/prune.c:11
|
||||
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:86
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:92
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:97
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:108
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:124
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:159
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:196
|
||||
#: builtin/prune.c:105 builtin/worktree.c:112
|
||||
msgid "do not remove, show only"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:197
|
||||
#: builtin/prune.c:106 builtin/worktree.c:113
|
||||
msgid "report pruned objects"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:199
|
||||
msgid "prune .git/worktrees"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:201
|
||||
#: builtin/prune.c:109 builtin/worktree.c:115
|
||||
msgid "expire objects older than <time>"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:216
|
||||
msgid "--worktrees does not take extra arguments"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/push.c:14
|
||||
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
||||
msgstr ""
|
||||
|
|
@ -9798,6 +9738,83 @@ msgstr ""
|
|||
msgid "print tag contents"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:11
|
||||
msgid "git worktree add [<options>] <path> <branch>"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:12
|
||||
msgid "git worktree prune [<options>]"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:27
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:33
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:38
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:49
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:65
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:100
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:186
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:207
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:241
|
||||
msgid "unable to resolve HEAD"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:249
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:281
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:283
|
||||
msgid "create a new branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:285
|
||||
msgid "create or reset a branch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:286
|
||||
msgid "detach HEAD at named commit"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:292
|
||||
msgid "-b and -B are mutually exclusive"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/write-tree.c:13
|
||||
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
||||
msgstr ""
|
||||
|
|
@ -9858,7 +9875,7 @@ msgid "List, create, or delete branches"
|
|||
msgstr ""
|
||||
|
||||
#: common-cmds.h:21
|
||||
msgid "Checkout a branch or paths to the working tree"
|
||||
msgid "Switch branches or restore working tree files"
|
||||
msgstr ""
|
||||
|
||||
#: common-cmds.h:22
|
||||
|
|
|
|||
402
po/sv.po
402
po/sv.po
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git 2.5.0\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2015-06-27 19:17+0800\n"
|
||||
"PO-Revision-Date: 2015-06-28 18:49+0100\n"
|
||||
"POT-Creation-Date: 2015-07-14 07:19+0800\n"
|
||||
"PO-Revision-Date: 2015-07-15 12:51+0100\n"
|
||||
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
|
||||
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
|
||||
"Language: sv\n"
|
||||
|
|
@ -652,8 +652,8 @@ msgstr "FEL: återöppna en låsfil som har överlämnats"
|
|||
msgid "failed to read the cache"
|
||||
msgstr "misslyckades läsa cachen"
|
||||
|
||||
#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
|
||||
#: builtin/clone.c:654
|
||||
#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
|
||||
#: builtin/clone.c:647
|
||||
msgid "unable to write new index file"
|
||||
msgstr "kunde inte skriva ny indexfil"
|
||||
|
||||
|
|
@ -700,7 +700,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""
|
|||
msgid "blob expected for %s '%s'"
|
||||
msgstr "blob förväntades för %s \"%s\""
|
||||
|
||||
#: merge-recursive.c:788 builtin/clone.c:313
|
||||
#: merge-recursive.c:788 builtin/clone.c:306
|
||||
#, c-format
|
||||
msgid "failed to open '%s'"
|
||||
msgstr "misslyckades öppna \"%s\""
|
||||
|
|
@ -2021,7 +2021,7 @@ msgstr "försvunnen"
|
|||
msgid "behind "
|
||||
msgstr "efter "
|
||||
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:352
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:345
|
||||
#, c-format
|
||||
msgid "failed to unlink '%s'"
|
||||
msgstr "misslyckades ta bort länken \"%s\""
|
||||
|
|
@ -2099,7 +2099,7 @@ msgstr "var pratsam"
|
|||
msgid "interactive picking"
|
||||
msgstr "plocka interaktivt"
|
||||
|
||||
#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
|
||||
#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
|
||||
msgid "select hunks interactively"
|
||||
msgstr "välj stycken interaktivt"
|
||||
|
||||
|
|
@ -2438,7 +2438,7 @@ msgstr "%s: patchen kan inte tillämpas"
|
|||
msgid "Checking patch %s..."
|
||||
msgstr "Kontrollerar patchen %s..."
|
||||
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
|
||||
#, c-format
|
||||
msgid "make_cache_entry failed for path '%s'"
|
||||
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
|
||||
|
|
@ -3132,7 +3132,7 @@ msgstr "visa grenar i spalter"
|
|||
msgid "Failed to resolve HEAD as a valid ref."
|
||||
msgstr "Misslyckades slå upp HEAD som giltig referens"
|
||||
|
||||
#: builtin/branch.c:878 builtin/clone.c:629
|
||||
#: builtin/branch.c:878 builtin/clone.c:622
|
||||
msgid "HEAD not found below refs/heads!"
|
||||
msgstr "HEAD hittades inte under refs/heads!"
|
||||
|
||||
|
|
@ -3334,7 +3334,7 @@ msgstr "läs filnamn från standard in"
|
|||
msgid "terminate input and output records by a NUL character"
|
||||
msgstr "avsluta in- och utdataposter med NUL-tecken"
|
||||
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
|
||||
msgid "suppress progress reporting"
|
||||
msgstr "undertryck förloppsrapportering"
|
||||
|
||||
|
|
@ -3431,113 +3431,113 @@ msgstr "när filer skapas, lägg till <sträng> först"
|
|||
msgid "copy out the files from named stage"
|
||||
msgstr "kopiera ut filer från namngiven etapp"
|
||||
|
||||
#: builtin/checkout.c:26
|
||||
#: builtin/checkout.c:24
|
||||
msgid "git checkout [<options>] <branch>"
|
||||
msgstr "git checkout [<flaggor>] <gren>"
|
||||
|
||||
#: builtin/checkout.c:27
|
||||
#: builtin/checkout.c:25
|
||||
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
||||
msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
|
||||
|
||||
#: builtin/checkout.c:138 builtin/checkout.c:171
|
||||
#: builtin/checkout.c:134 builtin/checkout.c:167
|
||||
#, c-format
|
||||
msgid "path '%s' does not have our version"
|
||||
msgstr "sökvägen \"%s\" har inte vår version"
|
||||
|
||||
#: builtin/checkout.c:140 builtin/checkout.c:173
|
||||
#: builtin/checkout.c:136 builtin/checkout.c:169
|
||||
#, c-format
|
||||
msgid "path '%s' does not have their version"
|
||||
msgstr "sökvägen \"%s\" har inte deras version"
|
||||
|
||||
#: builtin/checkout.c:156
|
||||
#: builtin/checkout.c:152
|
||||
#, c-format
|
||||
msgid "path '%s' does not have all necessary versions"
|
||||
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
|
||||
|
||||
#: builtin/checkout.c:200
|
||||
#: builtin/checkout.c:196
|
||||
#, c-format
|
||||
msgid "path '%s' does not have necessary versions"
|
||||
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
|
||||
|
||||
#: builtin/checkout.c:217
|
||||
#: builtin/checkout.c:213
|
||||
#, c-format
|
||||
msgid "path '%s': cannot merge"
|
||||
msgstr "sökväg \"%s\": kan inte slå ihop"
|
||||
|
||||
#: builtin/checkout.c:234
|
||||
#: builtin/checkout.c:230
|
||||
#, c-format
|
||||
msgid "Unable to add merge result for '%s'"
|
||||
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
|
||||
|
||||
#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
|
||||
#: builtin/checkout.c:264 builtin/checkout.c:277
|
||||
#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
|
||||
#: builtin/checkout.c:260
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with updating paths"
|
||||
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
|
||||
|
||||
#: builtin/checkout.c:267 builtin/checkout.c:270
|
||||
#: builtin/checkout.c:263 builtin/checkout.c:266
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with %s"
|
||||
msgstr "\"%s\" kan inte användas med %s"
|
||||
|
||||
#: builtin/checkout.c:273
|
||||
#: builtin/checkout.c:269
|
||||
#, c-format
|
||||
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
||||
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
|
||||
|
||||
#: builtin/checkout.c:287 builtin/checkout.c:481
|
||||
#: builtin/checkout.c:280 builtin/checkout.c:474
|
||||
msgid "corrupt index file"
|
||||
msgstr "indexfilen är trasig"
|
||||
|
||||
#: builtin/checkout.c:347 builtin/checkout.c:354
|
||||
#: builtin/checkout.c:340 builtin/checkout.c:347
|
||||
#, c-format
|
||||
msgid "path '%s' is unmerged"
|
||||
msgstr "sökvägen \"%s\" har inte slagits ihop"
|
||||
|
||||
#: builtin/checkout.c:503
|
||||
#: builtin/checkout.c:496
|
||||
msgid "you need to resolve your current index first"
|
||||
msgstr "du måste lösa ditt befintliga index först"
|
||||
|
||||
#: builtin/checkout.c:634
|
||||
#: builtin/checkout.c:627
|
||||
#, c-format
|
||||
msgid "Can not do reflog for '%s'\n"
|
||||
msgstr "Kan inte skapa referenslog för \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:670
|
||||
#: builtin/checkout.c:663
|
||||
msgid "HEAD is now at"
|
||||
msgstr "HEAD är nu på"
|
||||
|
||||
#: builtin/checkout.c:677
|
||||
#: builtin/checkout.c:670
|
||||
#, c-format
|
||||
msgid "Reset branch '%s'\n"
|
||||
msgstr "Återställ gren \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:680
|
||||
#: builtin/checkout.c:673
|
||||
#, c-format
|
||||
msgid "Already on '%s'\n"
|
||||
msgstr "Redan på \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:684
|
||||
#: builtin/checkout.c:677
|
||||
#, c-format
|
||||
msgid "Switched to and reset branch '%s'\n"
|
||||
msgstr "Växlade till och nollställde grenen \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:686 builtin/checkout.c:1285
|
||||
#: builtin/checkout.c:679 builtin/checkout.c:1134
|
||||
#, c-format
|
||||
msgid "Switched to a new branch '%s'\n"
|
||||
msgstr "Växlade till en ny gren \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:688
|
||||
#: builtin/checkout.c:681
|
||||
#, c-format
|
||||
msgid "Switched to branch '%s'\n"
|
||||
msgstr "Växlade till grenen \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:740
|
||||
#: builtin/checkout.c:733
|
||||
#, c-format
|
||||
msgid " ... and %d more.\n"
|
||||
msgstr " ... och %d till.\n"
|
||||
|
||||
#: builtin/checkout.c:746
|
||||
#: builtin/checkout.c:739
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Warning: you are leaving %d commit behind, not connected to\n"
|
||||
|
|
@ -3560,7 +3560,7 @@ msgstr[1] ""
|
|||
"\n"
|
||||
"%s\n"
|
||||
|
||||
#: builtin/checkout.c:765
|
||||
#: builtin/checkout.c:758
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you want to keep it by creating a new branch, this may be a good time\n"
|
||||
|
|
@ -3587,178 +3587,150 @@ msgstr[1] ""
|
|||
" git branch <nytt_grennamn> %s\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/checkout.c:801
|
||||
#: builtin/checkout.c:794
|
||||
msgid "internal error in revision walk"
|
||||
msgstr "internt fel vid genomgång av revisioner (revision walk)"
|
||||
|
||||
#: builtin/checkout.c:805
|
||||
#: builtin/checkout.c:798
|
||||
msgid "Previous HEAD position was"
|
||||
msgstr "Tidigare position för HEAD var"
|
||||
|
||||
#: builtin/checkout.c:832 builtin/checkout.c:1280
|
||||
#: builtin/checkout.c:825 builtin/checkout.c:1129
|
||||
msgid "You are on a branch yet to be born"
|
||||
msgstr "Du är på en gren som ännu inte är född"
|
||||
|
||||
#: builtin/checkout.c:893
|
||||
msgid "no branch specified"
|
||||
msgstr "inget grennamn angavs"
|
||||
|
||||
#: builtin/checkout.c:895
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "\"%s\" finns redan"
|
||||
|
||||
#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
|
||||
#: builtin/clone.c:853
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "kunde inte skapa inledande kataloger för \"%s\""
|
||||
|
||||
#: builtin/checkout.c:924
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "kunde inte skapa katalogen \"%s\""
|
||||
|
||||
#: builtin/checkout.c:960
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Går in i %s (identifieraren %s)"
|
||||
|
||||
#: builtin/checkout.c:1070
|
||||
#: builtin/checkout.c:931
|
||||
#, c-format
|
||||
msgid "'%s' is already checked out at '%s'"
|
||||
msgstr "\"%s\" är redan utcheckad på \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1176
|
||||
#: builtin/checkout.c:1036
|
||||
#, c-format
|
||||
msgid "only one reference expected, %d given."
|
||||
msgstr "endast en referens förväntades, %d gavs."
|
||||
|
||||
#: builtin/checkout.c:1215
|
||||
#: builtin/checkout.c:1075
|
||||
#, c-format
|
||||
msgid "invalid reference: %s"
|
||||
msgstr "felaktig referens: %s"
|
||||
|
||||
#: builtin/checkout.c:1255
|
||||
#: builtin/checkout.c:1104
|
||||
#, c-format
|
||||
msgid "reference is not a tree: %s"
|
||||
msgstr "referensen är inte ett träd: %s"
|
||||
|
||||
#: builtin/checkout.c:1294
|
||||
#: builtin/checkout.c:1143
|
||||
msgid "paths cannot be used with switching branches"
|
||||
msgstr "sökvägar kan inte användas vid byte av gren"
|
||||
|
||||
#: builtin/checkout.c:1297 builtin/checkout.c:1301
|
||||
#: builtin/checkout.c:1146 builtin/checkout.c:1150
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with switching branches"
|
||||
msgstr "\"%s\" kan inte användas vid byte av gren"
|
||||
|
||||
#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
|
||||
#: builtin/checkout.c:1316
|
||||
#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
|
||||
#: builtin/checkout.c:1165
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with '%s'"
|
||||
msgstr "\"%s\" kan inte användas med \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1321
|
||||
#: builtin/checkout.c:1170
|
||||
#, c-format
|
||||
msgid "Cannot switch branch to a non-commit '%s'"
|
||||
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161
|
||||
#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
|
||||
#: builtin/worktree.c:284
|
||||
msgid "branch"
|
||||
msgstr "gren"
|
||||
|
||||
#: builtin/checkout.c:1347
|
||||
#: builtin/checkout.c:1204
|
||||
msgid "create and checkout a new branch"
|
||||
msgstr "skapa och checka ut en ny gren"
|
||||
|
||||
#: builtin/checkout.c:1349
|
||||
#: builtin/checkout.c:1206
|
||||
msgid "create/reset and checkout a branch"
|
||||
msgstr "skapa/nollställ och checka ut en gren"
|
||||
|
||||
#: builtin/checkout.c:1350
|
||||
#: builtin/checkout.c:1207
|
||||
msgid "create reflog for new branch"
|
||||
msgstr "skapa reflogg för ny gren"
|
||||
|
||||
#: builtin/checkout.c:1351
|
||||
#: builtin/checkout.c:1208
|
||||
msgid "detach the HEAD at named commit"
|
||||
msgstr "koppla från HEAD vid namngiven incheckning"
|
||||
|
||||
#: builtin/checkout.c:1352
|
||||
#: builtin/checkout.c:1209
|
||||
msgid "set upstream info for new branch"
|
||||
msgstr "sätt uppströmsinformation för ny gren"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new-branch"
|
||||
msgstr "ny-gren"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new unparented branch"
|
||||
msgstr "ny gren utan förälder"
|
||||
|
||||
#: builtin/checkout.c:1355
|
||||
#: builtin/checkout.c:1212
|
||||
msgid "checkout our version for unmerged files"
|
||||
msgstr "checka ut vår version för ej sammanslagna filer"
|
||||
|
||||
#: builtin/checkout.c:1357
|
||||
#: builtin/checkout.c:1214
|
||||
msgid "checkout their version for unmerged files"
|
||||
msgstr "checka ut deras version för ej sammanslagna filer"
|
||||
|
||||
#: builtin/checkout.c:1359
|
||||
#: builtin/checkout.c:1216
|
||||
msgid "force checkout (throw away local modifications)"
|
||||
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
|
||||
|
||||
#: builtin/checkout.c:1360
|
||||
#: builtin/checkout.c:1217
|
||||
msgid "perform a 3-way merge with the new branch"
|
||||
msgstr "utför en 3-vägssammanslagning för den nya grenen"
|
||||
|
||||
#: builtin/checkout.c:1361 builtin/merge.c:227
|
||||
#: builtin/checkout.c:1218 builtin/merge.c:227
|
||||
msgid "update ignored files (default)"
|
||||
msgstr "uppdatera ignorerade filer (standard)"
|
||||
|
||||
#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
|
||||
#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
|
||||
msgid "style"
|
||||
msgstr "stil"
|
||||
|
||||
#: builtin/checkout.c:1363
|
||||
#: builtin/checkout.c:1220
|
||||
msgid "conflict style (merge or diff3)"
|
||||
msgstr "konfliktstil (merge eller diff3)"
|
||||
|
||||
#: builtin/checkout.c:1366
|
||||
#: builtin/checkout.c:1223
|
||||
msgid "do not limit pathspecs to sparse entries only"
|
||||
msgstr "begränsa inte sökvägar till endast glesa poster"
|
||||
|
||||
#: builtin/checkout.c:1368
|
||||
#: builtin/checkout.c:1225
|
||||
msgid "second guess 'git checkout <no-such-branch>'"
|
||||
msgstr "förutspå \"git checkout <gren-saknas>\""
|
||||
|
||||
#: builtin/checkout.c:1370
|
||||
msgid "check a branch out in a separate working directory"
|
||||
msgstr "checka ut en gren i separat arbetskatalog"
|
||||
|
||||
#: builtin/checkout.c:1372
|
||||
#: builtin/checkout.c:1227
|
||||
msgid "do not check if another worktree is holding the given ref"
|
||||
msgstr ""
|
||||
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
|
||||
|
||||
#: builtin/checkout.c:1406
|
||||
#: builtin/checkout.c:1252
|
||||
msgid "-b, -B and --orphan are mutually exclusive"
|
||||
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
|
||||
|
||||
#: builtin/checkout.c:1423
|
||||
#: builtin/checkout.c:1269
|
||||
msgid "--track needs a branch name"
|
||||
msgstr "--track behöver ett namn på en gren"
|
||||
|
||||
#: builtin/checkout.c:1428
|
||||
#: builtin/checkout.c:1274
|
||||
msgid "Missing branch name; try -b"
|
||||
msgstr "Grennamn saknas; försök med -b"
|
||||
|
||||
#: builtin/checkout.c:1464
|
||||
#: builtin/checkout.c:1310
|
||||
msgid "invalid path specification"
|
||||
msgstr "felaktig sökvägsangivelse"
|
||||
|
||||
#: builtin/checkout.c:1471
|
||||
#: builtin/checkout.c:1317
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot update paths and switch to branch '%s' at the same time.\n"
|
||||
|
|
@ -3767,12 +3739,12 @@ msgstr ""
|
|||
"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
|
||||
"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
|
||||
|
||||
#: builtin/checkout.c:1476
|
||||
#: builtin/checkout.c:1322
|
||||
#, c-format
|
||||
msgid "git checkout: --detach does not take a path argument '%s'"
|
||||
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1480
|
||||
#: builtin/checkout.c:1326
|
||||
msgid ""
|
||||
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
||||
"checking out of the index."
|
||||
|
|
@ -4059,57 +4031,57 @@ msgstr "nyckel=värde"
|
|||
msgid "set config inside the new repository"
|
||||
msgstr "ställ in konfiguration i det nya arkivet"
|
||||
|
||||
#: builtin/clone.c:247
|
||||
#: builtin/clone.c:240
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is not a local repository."
|
||||
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
|
||||
|
||||
#: builtin/clone.c:251
|
||||
#: builtin/clone.c:244
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is shallow"
|
||||
msgstr "referensarkivet \"%s\" är grunt"
|
||||
|
||||
#: builtin/clone.c:254
|
||||
#: builtin/clone.c:247
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is grafted"
|
||||
msgstr "referensarkivet \"%s\" är ympat"
|
||||
|
||||
#: builtin/clone.c:317
|
||||
#: builtin/clone.c:310
|
||||
#, c-format
|
||||
msgid "failed to create directory '%s'"
|
||||
msgstr "misslyckades skapa katalogen \"%s\""
|
||||
|
||||
#: builtin/clone.c:319 builtin/diff.c:84
|
||||
#: builtin/clone.c:312 builtin/diff.c:84
|
||||
#, c-format
|
||||
msgid "failed to stat '%s'"
|
||||
msgstr "misslyckades ta status på \"%s\""
|
||||
|
||||
#: builtin/clone.c:321
|
||||
#: builtin/clone.c:314
|
||||
#, c-format
|
||||
msgid "%s exists and is not a directory"
|
||||
msgstr "%s finns och är ingen katalog"
|
||||
|
||||
#: builtin/clone.c:335
|
||||
#: builtin/clone.c:328
|
||||
#, c-format
|
||||
msgid "failed to stat %s\n"
|
||||
msgstr "misslyckades ta status på %s\n"
|
||||
|
||||
#: builtin/clone.c:357
|
||||
#: builtin/clone.c:350
|
||||
#, c-format
|
||||
msgid "failed to create link '%s'"
|
||||
msgstr "misslyckades skapa länken \"%s\""
|
||||
|
||||
#: builtin/clone.c:361
|
||||
#: builtin/clone.c:354
|
||||
#, c-format
|
||||
msgid "failed to copy file to '%s'"
|
||||
msgstr "misslyckades kopiera filen till \"%s\""
|
||||
|
||||
#: builtin/clone.c:384 builtin/clone.c:558
|
||||
#: builtin/clone.c:377 builtin/clone.c:551
|
||||
#, c-format
|
||||
msgid "done.\n"
|
||||
msgstr "klart.\n"
|
||||
|
||||
#: builtin/clone.c:396
|
||||
#: builtin/clone.c:389
|
||||
msgid ""
|
||||
"Clone succeeded, but checkout failed.\n"
|
||||
"You can inspect what was checked out with 'git status'\n"
|
||||
|
|
@ -4119,118 +4091,124 @@ msgstr ""
|
|||
"Du kan inspektera det som checkades ut med \"git status\"\n"
|
||||
"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
|
||||
|
||||
#: builtin/clone.c:473
|
||||
#: builtin/clone.c:466
|
||||
#, c-format
|
||||
msgid "Could not find remote branch %s to clone."
|
||||
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
|
||||
|
||||
# Vague original, not networking-related, but rather related to the actual
|
||||
# objects in the database.
|
||||
#: builtin/clone.c:553
|
||||
# objects downloaded.
|
||||
#: builtin/clone.c:546
|
||||
#, c-format
|
||||
msgid "Checking connectivity... "
|
||||
msgstr "Kontrollerar konnektivitet..."
|
||||
msgstr "Kontrollerar om vi fick alla objekt..."
|
||||
|
||||
#: builtin/clone.c:556
|
||||
#: builtin/clone.c:549
|
||||
msgid "remote did not send all necessary objects"
|
||||
msgstr "fjärren sände inte alla nödvändiga objekt"
|
||||
|
||||
#: builtin/clone.c:620
|
||||
#: builtin/clone.c:613
|
||||
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
||||
msgstr ""
|
||||
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
|
||||
|
||||
#: builtin/clone.c:651
|
||||
#: builtin/clone.c:644
|
||||
msgid "unable to checkout working tree"
|
||||
msgstr "kunde inte checka ut arbetskatalogen"
|
||||
|
||||
#: builtin/clone.c:738
|
||||
#: builtin/clone.c:731
|
||||
msgid "cannot repack to clean up"
|
||||
msgstr "kan inte packa om för att städa upp"
|
||||
|
||||
#: builtin/clone.c:740
|
||||
#: builtin/clone.c:733
|
||||
msgid "cannot unlink temporary alternates file"
|
||||
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
|
||||
|
||||
#: builtin/clone.c:770
|
||||
#: builtin/clone.c:763
|
||||
msgid "Too many arguments."
|
||||
msgstr "För många argument."
|
||||
|
||||
#: builtin/clone.c:774
|
||||
#: builtin/clone.c:767
|
||||
msgid "You must specify a repository to clone."
|
||||
msgstr "Du måste ange ett arkiv att klona."
|
||||
|
||||
#: builtin/clone.c:785
|
||||
#: builtin/clone.c:778
|
||||
#, c-format
|
||||
msgid "--bare and --origin %s options are incompatible."
|
||||
msgstr "flaggorna --bare och --origin %s är inkompatibla."
|
||||
|
||||
#: builtin/clone.c:788
|
||||
#: builtin/clone.c:781
|
||||
msgid "--bare and --separate-git-dir are incompatible."
|
||||
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
|
||||
|
||||
#: builtin/clone.c:801
|
||||
#: builtin/clone.c:794
|
||||
#, c-format
|
||||
msgid "repository '%s' does not exist"
|
||||
msgstr "arkivet \"%s\" finns inte"
|
||||
|
||||
#: builtin/clone.c:807 builtin/fetch.c:1160
|
||||
#: builtin/clone.c:800 builtin/fetch.c:1160
|
||||
#, c-format
|
||||
msgid "depth %s is not a positive number"
|
||||
msgstr "djupet %s är inte ett positivt tal"
|
||||
|
||||
#: builtin/clone.c:817
|
||||
#: builtin/clone.c:810
|
||||
#, c-format
|
||||
msgid "destination path '%s' already exists and is not an empty directory."
|
||||
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
|
||||
|
||||
#: builtin/clone.c:827
|
||||
#: builtin/clone.c:820
|
||||
#, c-format
|
||||
msgid "working tree '%s' already exists."
|
||||
msgstr "arbetsträdet \"%s\" finns redan."
|
||||
|
||||
#: builtin/clone.c:845
|
||||
#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
|
||||
#: builtin/worktree.c:220
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "kunde inte skapa inledande kataloger för \"%s\""
|
||||
|
||||
#: builtin/clone.c:838
|
||||
#, c-format
|
||||
msgid "could not create work tree dir '%s'"
|
||||
msgstr "kunde inte skapa arbetskatalogen \"%s\""
|
||||
|
||||
#: builtin/clone.c:863
|
||||
#: builtin/clone.c:856
|
||||
#, c-format
|
||||
msgid "Cloning into bare repository '%s'...\n"
|
||||
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
|
||||
|
||||
#: builtin/clone.c:865
|
||||
#: builtin/clone.c:858
|
||||
#, c-format
|
||||
msgid "Cloning into '%s'...\n"
|
||||
msgstr "Klonar till \"%s\"...\n"
|
||||
|
||||
#: builtin/clone.c:890
|
||||
#: builtin/clone.c:883
|
||||
msgid "--dissociate given, but there is no --reference"
|
||||
msgstr "--dissociate angavs, men --reference har inte angivits"
|
||||
|
||||
#: builtin/clone.c:907
|
||||
#: builtin/clone.c:900
|
||||
msgid "--depth is ignored in local clones; use file:// instead."
|
||||
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
|
||||
|
||||
#: builtin/clone.c:910
|
||||
#: builtin/clone.c:903
|
||||
msgid "source repository is shallow, ignoring --local"
|
||||
msgstr "källarkivet är grunt, ignorerar --local"
|
||||
|
||||
#: builtin/clone.c:915
|
||||
#: builtin/clone.c:908
|
||||
msgid "--local is ignored"
|
||||
msgstr "--local ignoreras"
|
||||
|
||||
#: builtin/clone.c:919
|
||||
#: builtin/clone.c:912
|
||||
#, c-format
|
||||
msgid "Don't know how to clone %s"
|
||||
msgstr "Vet inte hur man klonar %s"
|
||||
|
||||
#: builtin/clone.c:968 builtin/clone.c:976
|
||||
#: builtin/clone.c:961 builtin/clone.c:969
|
||||
#, c-format
|
||||
msgid "Remote branch %s not found in upstream %s"
|
||||
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
|
||||
|
||||
#: builtin/clone.c:979
|
||||
#: builtin/clone.c:972
|
||||
msgid "You appear to have cloned an empty repository."
|
||||
msgstr "Du verkar ha klonat ett tomt arkiv."
|
||||
|
||||
|
|
@ -5607,7 +5585,7 @@ msgstr "fältnamn att sortera på"
|
|||
|
||||
# Vague original, not networking-related, but rather related to the actual
|
||||
# objects in the database.
|
||||
#: builtin/fsck.c:147 builtin/prune.c:236
|
||||
#: builtin/fsck.c:147 builtin/prune.c:137
|
||||
msgid "Checking connectivity"
|
||||
msgstr "Kontrollerar konnektivitet"
|
||||
|
||||
|
|
@ -5655,7 +5633,7 @@ msgstr "aktivera striktare kontroll"
|
|||
msgid "write dangling objects in .git/lost-found"
|
||||
msgstr "skriv dinglande objekt i .git/lost-found"
|
||||
|
||||
#: builtin/fsck.c:627 builtin/prune.c:198
|
||||
#: builtin/fsck.c:627 builtin/prune.c:107
|
||||
msgid "show progress"
|
||||
msgstr "visa förlopp"
|
||||
|
||||
|
|
@ -8108,60 +8086,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|||
msgid "Removing duplicate objects"
|
||||
msgstr "Tar bort duplicerade objekt"
|
||||
|
||||
#: builtin/prune.c:12
|
||||
#: builtin/prune.c:11
|
||||
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
||||
msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"
|
||||
|
||||
#: builtin/prune.c:86
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
|
||||
|
||||
#: builtin/prune.c:92
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
|
||||
|
||||
#: builtin/prune.c:97
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
|
||||
|
||||
#: builtin/prune.c:108
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
|
||||
|
||||
#: builtin/prune.c:124
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
|
||||
|
||||
#: builtin/prune.c:159
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "misslyckades ta bort: %s"
|
||||
|
||||
#: builtin/prune.c:196
|
||||
#: builtin/prune.c:105 builtin/worktree.c:112
|
||||
msgid "do not remove, show only"
|
||||
msgstr "ta inte bort, bara visa"
|
||||
|
||||
#: builtin/prune.c:197
|
||||
#: builtin/prune.c:106 builtin/worktree.c:113
|
||||
msgid "report pruned objects"
|
||||
msgstr "rapportera borttagna objekt"
|
||||
|
||||
#: builtin/prune.c:199
|
||||
msgid "prune .git/worktrees"
|
||||
msgstr "rensa .git/worktrees"
|
||||
|
||||
#: builtin/prune.c:201
|
||||
#: builtin/prune.c:109 builtin/worktree.c:115
|
||||
msgid "expire objects older than <time>"
|
||||
msgstr "låt tid gå ut för objekt äldre än <tid>"
|
||||
|
||||
#: builtin/prune.c:216
|
||||
msgid "--worktrees does not take extra arguments"
|
||||
msgstr "--worktrees tar inte ytterligare argument"
|
||||
|
||||
#: builtin/push.c:14
|
||||
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
||||
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
|
||||
|
|
@ -10244,6 +10184,84 @@ msgstr "git verify-tag [-v | --verbose] <tagg>..."
|
|||
msgid "print tag contents"
|
||||
msgstr "visa innehåll för tag"
|
||||
|
||||
#: builtin/worktree.c:11
|
||||
msgid "git worktree add [<options>] <path> <branch>"
|
||||
msgstr "git worktree add [<flaggor>] <sökväg> <gren>"
|
||||
|
||||
#: builtin/worktree.c:12
|
||||
msgid "git worktree prune [<options>]"
|
||||
msgstr "git worktree prune [<flaggor>]"
|
||||
|
||||
#: builtin/worktree.c:27
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
|
||||
|
||||
#: builtin/worktree.c:33
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
|
||||
|
||||
#: builtin/worktree.c:38
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
|
||||
|
||||
#: builtin/worktree.c:49
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
|
||||
|
||||
#: builtin/worktree.c:65
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
|
||||
|
||||
#: builtin/worktree.c:100
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "misslyckades ta bort: %s"
|
||||
|
||||
#: builtin/worktree.c:186
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "\"%s\" finns redan"
|
||||
|
||||
#: builtin/worktree.c:207
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "kunde inte skapa katalogen \"%s\""
|
||||
|
||||
#: builtin/worktree.c:241
|
||||
msgid "unable to resolve HEAD"
|
||||
msgstr "kan inte bestämma HEAD"
|
||||
|
||||
#: builtin/worktree.c:249
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "Går in i %s (identifieraren %s)"
|
||||
|
||||
#: builtin/worktree.c:281
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr ""
|
||||
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
|
||||
|
||||
#: builtin/worktree.c:283
|
||||
msgid "create a new branch"
|
||||
msgstr "skapa en ny gren"
|
||||
|
||||
#: builtin/worktree.c:285
|
||||
msgid "create or reset a branch"
|
||||
msgstr "skapa eller återställ en gren"
|
||||
|
||||
#: builtin/worktree.c:286
|
||||
msgid "detach HEAD at named commit"
|
||||
msgstr "koppla från HEAD vid namngiven incheckning"
|
||||
|
||||
#: builtin/worktree.c:292
|
||||
msgid "-b and -B are mutually exclusive"
|
||||
msgstr "-b och -B kan inte användas samtidigt"
|
||||
|
||||
#: builtin/write-tree.c:13
|
||||
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
||||
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
||||
|
|
@ -10307,8 +10325,8 @@ msgid "List, create, or delete branches"
|
|||
msgstr "Visa, skapa eller ta bort grenar"
|
||||
|
||||
#: common-cmds.h:21
|
||||
msgid "Checkout a branch or paths to the working tree"
|
||||
msgstr "Checka ut en gren eller filer i arbetskatalogen"
|
||||
msgid "Switch branches or restore working tree files"
|
||||
msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
|
||||
|
||||
#: common-cmds.h:22
|
||||
msgid "Clone a repository into a new directory"
|
||||
|
|
@ -11371,6 +11389,18 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
|
|||
msgid "Synchronizing submodule url for '$displaypath'"
|
||||
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
|
||||
|
||||
#~ msgid "no branch specified"
|
||||
#~ msgstr "inget grennamn angavs"
|
||||
|
||||
#~ msgid "check a branch out in a separate working directory"
|
||||
#~ msgstr "checka ut en gren i separat arbetskatalog"
|
||||
|
||||
#~ msgid "prune .git/worktrees"
|
||||
#~ msgstr "rensa .git/worktrees"
|
||||
|
||||
#~ msgid "--worktrees does not take extra arguments"
|
||||
#~ msgstr "--worktrees tar inte ytterligare argument"
|
||||
|
||||
#~ msgid "The most commonly used git commands are:"
|
||||
#~ msgstr "De mest använda git-kommandona är:"
|
||||
|
||||
|
|
|
|||
400
po/zh_CN.po
400
po/zh_CN.po
|
|
@ -12,8 +12,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2015-06-27 19:17+0800\n"
|
||||
"PO-Revision-Date: 2015-07-05 23:12+0800\n"
|
||||
"POT-Creation-Date: 2015-07-14 07:19+0800\n"
|
||||
"PO-Revision-Date: 2015-07-14 07:32+0800\n"
|
||||
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
|
||||
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
|
||||
"Language: zh_CN\n"
|
||||
|
|
@ -653,8 +653,8 @@ msgstr "BUG: 重新打开一个已提交的锁文件"
|
|||
msgid "failed to read the cache"
|
||||
msgstr "无法读取缓存"
|
||||
|
||||
#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
|
||||
#: builtin/clone.c:654
|
||||
#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
|
||||
#: builtin/clone.c:647
|
||||
msgid "unable to write new index file"
|
||||
msgstr "无法写新的索引文件"
|
||||
|
||||
|
|
@ -701,7 +701,7 @@ msgstr "不能读取对象 %s '%s'"
|
|||
msgid "blob expected for %s '%s'"
|
||||
msgstr "%s '%s' 应为数据（blob）对象"
|
||||
|
||||
#: merge-recursive.c:788 builtin/clone.c:313
|
||||
#: merge-recursive.c:788 builtin/clone.c:306
|
||||
#, c-format
|
||||
msgid "failed to open '%s'"
|
||||
msgstr "无法打开 '%s'"
|
||||
|
|
@ -2034,7 +2034,7 @@ msgstr "丢失"
|
|||
msgid "behind "
|
||||
msgstr "落后 "
|
||||
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:352
|
||||
#: compat/precompose_utf8.c:55 builtin/clone.c:345
|
||||
#, c-format
|
||||
msgid "failed to unlink '%s'"
|
||||
msgstr "无法删除 '%s'"
|
||||
|
|
@ -2112,7 +2112,7 @@ msgstr "冗长输出"
|
|||
msgid "interactive picking"
|
||||
msgstr "交互式拣选"
|
||||
|
||||
#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
|
||||
#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
|
||||
msgid "select hunks interactively"
|
||||
msgstr "交互式挑选数据块"
|
||||
|
||||
|
|
@ -2446,7 +2446,7 @@ msgstr "%s：补丁未应用"
|
|||
msgid "Checking patch %s..."
|
||||
msgstr "检查补丁 %s..."
|
||||
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
|
||||
#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
|
||||
#, c-format
|
||||
msgid "make_cache_entry failed for path '%s'"
|
||||
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
|
||||
|
|
@ -3141,7 +3141,7 @@ msgstr "以列的方式显示分支"
|
|||
msgid "Failed to resolve HEAD as a valid ref."
|
||||
msgstr "无法将 HEAD 解析为有效引用。"
|
||||
|
||||
#: builtin/branch.c:878 builtin/clone.c:629
|
||||
#: builtin/branch.c:878 builtin/clone.c:622
|
||||
msgid "HEAD not found below refs/heads!"
|
||||
msgstr "HEAD 没有位于 /refs/heads 之下！"
|
||||
|
||||
|
|
@ -3337,7 +3337,7 @@ msgstr "从标准输入读出文件名"
|
|||
msgid "terminate input and output records by a NUL character"
|
||||
msgstr "输入和输出的记录使用 NUL 字符终结"
|
||||
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
|
||||
#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
|
||||
msgid "suppress progress reporting"
|
||||
msgstr "不显示进度报告"
|
||||
|
||||
|
|
@ -3434,114 +3434,114 @@ msgstr "在创建文件时，在前面加上<字符串>"
|
|||
msgid "copy out the files from named stage"
|
||||
msgstr "从指定暂存区中拷出文件"
|
||||
|
||||
#: builtin/checkout.c:26
|
||||
#: builtin/checkout.c:24
|
||||
msgid "git checkout [<options>] <branch>"
|
||||
msgstr "git checkout [<选项>] <分支>"
|
||||
|
||||
#: builtin/checkout.c:27
|
||||
#: builtin/checkout.c:25
|
||||
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
||||
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
|
||||
|
||||
#: builtin/checkout.c:138 builtin/checkout.c:171
|
||||
#: builtin/checkout.c:134 builtin/checkout.c:167
|
||||
#, c-format
|
||||
msgid "path '%s' does not have our version"
|
||||
msgstr "路径 '%s' 没有我们的版本"
|
||||
|
||||
#: builtin/checkout.c:140 builtin/checkout.c:173
|
||||
#: builtin/checkout.c:136 builtin/checkout.c:169
|
||||
#, c-format
|
||||
msgid "path '%s' does not have their version"
|
||||
msgstr "路径 '%s' 没有他们的版本"
|
||||
|
||||
#: builtin/checkout.c:156
|
||||
#: builtin/checkout.c:152
|
||||
#, c-format
|
||||
msgid "path '%s' does not have all necessary versions"
|
||||
msgstr "路径 '%s' 没有全部必须的版本"
|
||||
|
||||
#: builtin/checkout.c:200
|
||||
#: builtin/checkout.c:196
|
||||
#, c-format
|
||||
msgid "path '%s' does not have necessary versions"
|
||||
msgstr "路径 '%s' 没有必须的版本"
|
||||
|
||||
#: builtin/checkout.c:217
|
||||
#: builtin/checkout.c:213
|
||||
#, c-format
|
||||
msgid "path '%s': cannot merge"
|
||||
msgstr "path '%s'：无法合并"
|
||||
|
||||
#: builtin/checkout.c:234
|
||||
#: builtin/checkout.c:230
|
||||
#, c-format
|
||||
msgid "Unable to add merge result for '%s'"
|
||||
msgstr "无法为 '%s' 添加合并结果"
|
||||
|
||||
#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
|
||||
#: builtin/checkout.c:264 builtin/checkout.c:277
|
||||
#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
|
||||
#: builtin/checkout.c:260
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with updating paths"
|
||||
msgstr "'%s' 不能在更新路径时使用"
|
||||
|
||||
#: builtin/checkout.c:267 builtin/checkout.c:270
|
||||
#: builtin/checkout.c:263 builtin/checkout.c:266
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with %s"
|
||||
msgstr "'%s' 不能和 %s 同时使用"
|
||||
|
||||
#: builtin/checkout.c:273
|
||||
#: builtin/checkout.c:269
|
||||
#, c-format
|
||||
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
||||
msgstr "不能同时更新路径并切换到分支'%s'。"
|
||||
|
||||
#: builtin/checkout.c:287 builtin/checkout.c:481
|
||||
#: builtin/checkout.c:280 builtin/checkout.c:474
|
||||
msgid "corrupt index file"
|
||||
msgstr "损坏的索引文件"
|
||||
|
||||
#: builtin/checkout.c:347 builtin/checkout.c:354
|
||||
#: builtin/checkout.c:340 builtin/checkout.c:347
|
||||
#, c-format
|
||||
msgid "path '%s' is unmerged"
|
||||
msgstr "路径 '%s' 未合并"
|
||||
|
||||
#: builtin/checkout.c:503
|
||||
#: builtin/checkout.c:496
|
||||
msgid "you need to resolve your current index first"
|
||||
msgstr "您需要先解决当前索引的冲突"
|
||||
|
||||
#: builtin/checkout.c:634
|
||||
#: builtin/checkout.c:627
|
||||
#, c-format
|
||||
msgid "Can not do reflog for '%s'\n"
|
||||
msgstr "不能对 '%s' 执行 reflog 操作\n"
|
||||
|
||||
#: builtin/checkout.c:670
|
||||
#: builtin/checkout.c:663
|
||||
msgid "HEAD is now at"
|
||||
msgstr "HEAD 目前位于"
|
||||
|
||||
#: builtin/checkout.c:677
|
||||
#: builtin/checkout.c:670
|
||||
#, c-format
|
||||
msgid "Reset branch '%s'\n"
|
||||
msgstr "重置分支 '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:680
|
||||
#: builtin/checkout.c:673
|
||||
#, c-format
|
||||
msgid "Already on '%s'\n"
|
||||
msgstr "已经位于 '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:684
|
||||
#: builtin/checkout.c:677
|
||||
#, c-format
|
||||
msgid "Switched to and reset branch '%s'\n"
|
||||
msgstr "切换并重置分支 '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:686 builtin/checkout.c:1285
|
||||
#: builtin/checkout.c:679 builtin/checkout.c:1134
|
||||
#, c-format
|
||||
msgid "Switched to a new branch '%s'\n"
|
||||
msgstr "切换到一个新分支 '%s'\n"
|
||||
|
||||
#: builtin/checkout.c:688
|
||||
#: builtin/checkout.c:681
|
||||
#, c-format
|
||||
msgid "Switched to branch '%s'\n"
|
||||
msgstr "切换到分支 '%s'\n"
|
||||
|
||||
# 译者：注意保持前导空格
|
||||
#: builtin/checkout.c:740
|
||||
#: builtin/checkout.c:733
|
||||
#, c-format
|
||||
msgid " ... and %d more.\n"
|
||||
msgstr " ... 及其它 %d 个。\n"
|
||||
|
||||
#: builtin/checkout.c:746
|
||||
#: builtin/checkout.c:739
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Warning: you are leaving %d commit behind, not connected to\n"
|
||||
|
|
@ -3562,7 +3562,7 @@ msgstr[1] ""
|
|||
"\n"
|
||||
"%s\n"
|
||||
|
||||
#: builtin/checkout.c:765
|
||||
#: builtin/checkout.c:758
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you want to keep it by creating a new branch, this may be a good time\n"
|
||||
|
|
@ -3589,177 +3589,149 @@ msgstr[1] ""
|
|||
" git branch <新分支名> %s\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/checkout.c:801
|
||||
#: builtin/checkout.c:794
|
||||
msgid "internal error in revision walk"
|
||||
msgstr "在版本遍历时遇到内部错误"
|
||||
|
||||
#: builtin/checkout.c:805
|
||||
#: builtin/checkout.c:798
|
||||
msgid "Previous HEAD position was"
|
||||
msgstr "之前的 HEAD 位置是"
|
||||
|
||||
#: builtin/checkout.c:832 builtin/checkout.c:1280
|
||||
#: builtin/checkout.c:825 builtin/checkout.c:1129
|
||||
msgid "You are on a branch yet to be born"
|
||||
msgstr "您位于一个尚未初始化的分支"
|
||||
|
||||
#: builtin/checkout.c:893
|
||||
msgid "no branch specified"
|
||||
msgstr "未指定分支名"
|
||||
|
||||
#: builtin/checkout.c:895
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "'%s' 已经存在"
|
||||
|
||||
#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
|
||||
#: builtin/clone.c:853
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "不能为 '%s' 创建先导目录"
|
||||
|
||||
#: builtin/checkout.c:924
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "不能创建目录 '%s'"
|
||||
|
||||
#: builtin/checkout.c:960
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "输入 %s （标识符 %s）"
|
||||
|
||||
#: builtin/checkout.c:1070
|
||||
#: builtin/checkout.c:931
|
||||
#, c-format
|
||||
msgid "'%s' is already checked out at '%s'"
|
||||
msgstr "'%s' 已经检出到 '%s'"
|
||||
|
||||
#: builtin/checkout.c:1176
|
||||
#: builtin/checkout.c:1036
|
||||
#, c-format
|
||||
msgid "only one reference expected, %d given."
|
||||
msgstr "只要一个引用，却给出了 %d 个"
|
||||
|
||||
#: builtin/checkout.c:1215
|
||||
#: builtin/checkout.c:1075
|
||||
#, c-format
|
||||
msgid "invalid reference: %s"
|
||||
msgstr "无效引用：%s"
|
||||
|
||||
#: builtin/checkout.c:1255
|
||||
#: builtin/checkout.c:1104
|
||||
#, c-format
|
||||
msgid "reference is not a tree: %s"
|
||||
msgstr "引用不是一个树：%s"
|
||||
|
||||
#: builtin/checkout.c:1294
|
||||
#: builtin/checkout.c:1143
|
||||
msgid "paths cannot be used with switching branches"
|
||||
msgstr "路径不能和切换分支同时使用"
|
||||
|
||||
#: builtin/checkout.c:1297 builtin/checkout.c:1301
|
||||
#: builtin/checkout.c:1146 builtin/checkout.c:1150
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with switching branches"
|
||||
msgstr "'%s' 不能和切换分支同时使用"
|
||||
|
||||
#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
|
||||
#: builtin/checkout.c:1316
|
||||
#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
|
||||
#: builtin/checkout.c:1165
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with '%s'"
|
||||
msgstr "'%s' 不能和 '%s' 同时使用"
|
||||
|
||||
#: builtin/checkout.c:1321
|
||||
#: builtin/checkout.c:1170
|
||||
#, c-format
|
||||
msgid "Cannot switch branch to a non-commit '%s'"
|
||||
msgstr "不能切换分支到一个非提交 '%s'"
|
||||
|
||||
#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161
|
||||
#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
|
||||
#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
|
||||
#: builtin/worktree.c:284
|
||||
msgid "branch"
|
||||
msgstr "分支"
|
||||
|
||||
#: builtin/checkout.c:1347
|
||||
#: builtin/checkout.c:1204
|
||||
msgid "create and checkout a new branch"
|
||||
msgstr "创建并检出一个新的分支"
|
||||
|
||||
#: builtin/checkout.c:1349
|
||||
#: builtin/checkout.c:1206
|
||||
msgid "create/reset and checkout a branch"
|
||||
msgstr "创建/重置并检出一个分支"
|
||||
|
||||
#: builtin/checkout.c:1350
|
||||
#: builtin/checkout.c:1207
|
||||
msgid "create reflog for new branch"
|
||||
msgstr "为新的分支创建引用日志"
|
||||
|
||||
#: builtin/checkout.c:1351
|
||||
#: builtin/checkout.c:1208
|
||||
msgid "detach the HEAD at named commit"
|
||||
msgstr "成为指向该提交的分离头指针"
|
||||
|
||||
#: builtin/checkout.c:1352
|
||||
#: builtin/checkout.c:1209
|
||||
msgid "set upstream info for new branch"
|
||||
msgstr "为新的分支设置上游信息"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new-branch"
|
||||
msgstr "新分支"
|
||||
|
||||
#: builtin/checkout.c:1354
|
||||
#: builtin/checkout.c:1211
|
||||
msgid "new unparented branch"
|
||||
msgstr "新的没有父提交的分支"
|
||||
|
||||
#: builtin/checkout.c:1355
|
||||
#: builtin/checkout.c:1212
|
||||
msgid "checkout our version for unmerged files"
|
||||
msgstr "对尚未合并的文件检出我们的版本"
|
||||
|
||||
#: builtin/checkout.c:1357
|
||||
#: builtin/checkout.c:1214
|
||||
msgid "checkout their version for unmerged files"
|
||||
msgstr "对尚未合并的文件检出他们的版本"
|
||||
|
||||
#: builtin/checkout.c:1359
|
||||
#: builtin/checkout.c:1216
|
||||
msgid "force checkout (throw away local modifications)"
|
||||
msgstr "强制检出（丢弃本地修改）"
|
||||
|
||||
#: builtin/checkout.c:1360
|
||||
#: builtin/checkout.c:1217
|
||||
msgid "perform a 3-way merge with the new branch"
|
||||
msgstr "和新的分支执行三路合并"
|
||||
|
||||
#: builtin/checkout.c:1361 builtin/merge.c:227
|
||||
#: builtin/checkout.c:1218 builtin/merge.c:227
|
||||
msgid "update ignored files (default)"
|
||||
msgstr "更新忽略的文件（默认）"
|
||||
|
||||
#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
|
||||
#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
|
||||
msgid "style"
|
||||
msgstr "风格"
|
||||
|
||||
#: builtin/checkout.c:1363
|
||||
#: builtin/checkout.c:1220
|
||||
msgid "conflict style (merge or diff3)"
|
||||
msgstr "冲突输出风格（merge 或 diff3）"
|
||||
|
||||
#: builtin/checkout.c:1366
|
||||
#: builtin/checkout.c:1223
|
||||
msgid "do not limit pathspecs to sparse entries only"
|
||||
msgstr "对路径不做稀疏检出的限制"
|
||||
|
||||
#: builtin/checkout.c:1368
|
||||
#: builtin/checkout.c:1225
|
||||
msgid "second guess 'git checkout <no-such-branch>'"
|
||||
msgstr "二次猜测'git checkout <无此分支>'"
|
||||
|
||||
#: builtin/checkout.c:1370
|
||||
msgid "check a branch out in a separate working directory"
|
||||
msgstr "检出一个分支到单独的工作目录"
|
||||
|
||||
#: builtin/checkout.c:1372
|
||||
#: builtin/checkout.c:1227
|
||||
msgid "do not check if another worktree is holding the given ref"
|
||||
msgstr "不检查指定的引用是否被其他工作区所占用"
|
||||
|
||||
#: builtin/checkout.c:1406
|
||||
#: builtin/checkout.c:1252
|
||||
msgid "-b, -B and --orphan are mutually exclusive"
|
||||
msgstr "-b、-B 和 --orphan 是互斥的"
|
||||
|
||||
#: builtin/checkout.c:1423
|
||||
#: builtin/checkout.c:1269
|
||||
msgid "--track needs a branch name"
|
||||
msgstr "--track 需要一个分支名"
|
||||
|
||||
#: builtin/checkout.c:1428
|
||||
#: builtin/checkout.c:1274
|
||||
msgid "Missing branch name; try -b"
|
||||
msgstr "缺少分支名；尝试 -b"
|
||||
|
||||
#: builtin/checkout.c:1464
|
||||
#: builtin/checkout.c:1310
|
||||
msgid "invalid path specification"
|
||||
msgstr "无效的路径规格"
|
||||
|
||||
#: builtin/checkout.c:1471
|
||||
#: builtin/checkout.c:1317
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot update paths and switch to branch '%s' at the same time.\n"
|
||||
|
|
@ -3768,12 +3740,12 @@ msgstr ""
|
|||
"不能同时更新路径并切换到分支'%s'。\n"
|
||||
"您是想要检出 '%s' 但其未能解析为提交么？"
|
||||
|
||||
#: builtin/checkout.c:1476
|
||||
#: builtin/checkout.c:1322
|
||||
#, c-format
|
||||
msgid "git checkout: --detach does not take a path argument '%s'"
|
||||
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
|
||||
|
||||
#: builtin/checkout.c:1480
|
||||
#: builtin/checkout.c:1326
|
||||
msgid ""
|
||||
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
||||
"checking out of the index."
|
||||
|
|
@ -4056,57 +4028,57 @@ msgstr "key=value"
|
|||
msgid "set config inside the new repository"
|
||||
msgstr "在新版本库中设置配置信息"
|
||||
|
||||
#: builtin/clone.c:247
|
||||
#: builtin/clone.c:240
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is not a local repository."
|
||||
msgstr "参考版本库 '%s' 不是一个本地版本库。"
|
||||
|
||||
#: builtin/clone.c:251
|
||||
#: builtin/clone.c:244
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is shallow"
|
||||
msgstr "参考版本库 '%s' 是一个浅克隆"
|
||||
|
||||
#: builtin/clone.c:254
|
||||
#: builtin/clone.c:247
|
||||
#, c-format
|
||||
msgid "reference repository '%s' is grafted"
|
||||
msgstr "参考版本库 '%s' 已被嫁接"
|
||||
|
||||
#: builtin/clone.c:317
|
||||
#: builtin/clone.c:310
|
||||
#, c-format
|
||||
msgid "failed to create directory '%s'"
|
||||
msgstr "无法创建目录 '%s'"
|
||||
|
||||
#: builtin/clone.c:319 builtin/diff.c:84
|
||||
#: builtin/clone.c:312 builtin/diff.c:84
|
||||
#, c-format
|
||||
msgid "failed to stat '%s'"
|
||||
msgstr "无法枚举 '%s' 状态"
|
||||
|
||||
#: builtin/clone.c:321
|
||||
#: builtin/clone.c:314
|
||||
#, c-format
|
||||
msgid "%s exists and is not a directory"
|
||||
msgstr "%s 存在且不是一个目录"
|
||||
|
||||
#: builtin/clone.c:335
|
||||
#: builtin/clone.c:328
|
||||
#, c-format
|
||||
msgid "failed to stat %s\n"
|
||||
msgstr "无法枚举 %s 状态\n"
|
||||
|
||||
#: builtin/clone.c:357
|
||||
#: builtin/clone.c:350
|
||||
#, c-format
|
||||
msgid "failed to create link '%s'"
|
||||
msgstr "无法创建链接 '%s'"
|
||||
|
||||
#: builtin/clone.c:361
|
||||
#: builtin/clone.c:354
|
||||
#, c-format
|
||||
msgid "failed to copy file to '%s'"
|
||||
msgstr "无法拷贝文件至 '%s'"
|
||||
|
||||
#: builtin/clone.c:384 builtin/clone.c:558
|
||||
#: builtin/clone.c:377 builtin/clone.c:551
|
||||
#, c-format
|
||||
msgid "done.\n"
|
||||
msgstr "完成。\n"
|
||||
|
||||
#: builtin/clone.c:396
|
||||
#: builtin/clone.c:389
|
||||
msgid ""
|
||||
"Clone succeeded, but checkout failed.\n"
|
||||
"You can inspect what was checked out with 'git status'\n"
|
||||
|
|
@ -4116,115 +4088,121 @@ msgstr ""
|
|||
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
|
||||
"'git checkout -f HEAD' 重试\n"
|
||||
|
||||
#: builtin/clone.c:473
|
||||
#: builtin/clone.c:466
|
||||
#, c-format
|
||||
msgid "Could not find remote branch %s to clone."
|
||||
msgstr "不能发现要克隆的远程分支 %s。"
|
||||
|
||||
#: builtin/clone.c:553
|
||||
#: builtin/clone.c:546
|
||||
#, c-format
|
||||
msgid "Checking connectivity... "
|
||||
msgstr "检查连接... "
|
||||
|
||||
#: builtin/clone.c:556
|
||||
#: builtin/clone.c:549
|
||||
msgid "remote did not send all necessary objects"
|
||||
msgstr "远程没有发送所有必须的对象"
|
||||
|
||||
#: builtin/clone.c:620
|
||||
#: builtin/clone.c:613
|
||||
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
||||
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
|
||||
|
||||
#: builtin/clone.c:651
|
||||
#: builtin/clone.c:644
|
||||
msgid "unable to checkout working tree"
|
||||
msgstr "不能检出工作区"
|
||||
|
||||
#: builtin/clone.c:738
|
||||
#: builtin/clone.c:731
|
||||
msgid "cannot repack to clean up"
|
||||
msgstr "无法执行 repack 来清理"
|
||||
|
||||
#: builtin/clone.c:740
|
||||
#: builtin/clone.c:733
|
||||
msgid "cannot unlink temporary alternates file"
|
||||
msgstr "无法删除临时的 alternates 文件"
|
||||
|
||||
#: builtin/clone.c:770
|
||||
#: builtin/clone.c:763
|
||||
msgid "Too many arguments."
|
||||
msgstr "太多参数。"
|
||||
|
||||
#: builtin/clone.c:774
|
||||
#: builtin/clone.c:767
|
||||
msgid "You must specify a repository to clone."
|
||||
msgstr "您必须指定一个版本库来克隆。"
|
||||
|
||||
#: builtin/clone.c:785
|
||||
#: builtin/clone.c:778
|
||||
#, c-format
|
||||
msgid "--bare and --origin %s options are incompatible."
|
||||
msgstr "--bare 和 --origin %s 选项不兼容。"
|
||||
|
||||
#: builtin/clone.c:788
|
||||
#: builtin/clone.c:781
|
||||
msgid "--bare and --separate-git-dir are incompatible."
|
||||
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
|
||||
|
||||
#: builtin/clone.c:801
|
||||
#: builtin/clone.c:794
|
||||
#, c-format
|
||||
msgid "repository '%s' does not exist"
|
||||
msgstr "版本库 '%s' 不存在"
|
||||
|
||||
#: builtin/clone.c:807 builtin/fetch.c:1160
|
||||
#: builtin/clone.c:800 builtin/fetch.c:1160
|
||||
#, c-format
|
||||
msgid "depth %s is not a positive number"
|
||||
msgstr "深度 %s 不是一个正数"
|
||||
|
||||
#: builtin/clone.c:817
|
||||
#: builtin/clone.c:810
|
||||
#, c-format
|
||||
msgid "destination path '%s' already exists and is not an empty directory."
|
||||
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
|
||||
|
||||
#: builtin/clone.c:827
|
||||
#: builtin/clone.c:820
|
||||
#, c-format
|
||||
msgid "working tree '%s' already exists."
|
||||
msgstr "工作区 '%s' 已经存在。"
|
||||
|
||||
#: builtin/clone.c:845
|
||||
#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
|
||||
#: builtin/worktree.c:220
|
||||
#, c-format
|
||||
msgid "could not create leading directories of '%s'"
|
||||
msgstr "不能为 '%s' 创建先导目录"
|
||||
|
||||
#: builtin/clone.c:838
|
||||
#, c-format
|
||||
msgid "could not create work tree dir '%s'"
|
||||
msgstr "不能创建工作区目录 '%s'"
|
||||
|
||||
#: builtin/clone.c:863
|
||||
#: builtin/clone.c:856
|
||||
#, c-format
|
||||
msgid "Cloning into bare repository '%s'...\n"
|
||||
msgstr "克隆到纯版本库 '%s'...\n"
|
||||
|
||||
#: builtin/clone.c:865
|
||||
#: builtin/clone.c:858
|
||||
#, c-format
|
||||
msgid "Cloning into '%s'...\n"
|
||||
msgstr "正克隆到 '%s'...\n"
|
||||
|
||||
#: builtin/clone.c:890
|
||||
#: builtin/clone.c:883
|
||||
msgid "--dissociate given, but there is no --reference"
|
||||
msgstr "提供了参数 --dissociate，但未提供 --reference"
|
||||
|
||||
#: builtin/clone.c:907
|
||||
#: builtin/clone.c:900
|
||||
msgid "--depth is ignored in local clones; use file:// instead."
|
||||
msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
|
||||
|
||||
#: builtin/clone.c:910
|
||||
#: builtin/clone.c:903
|
||||
msgid "source repository is shallow, ignoring --local"
|
||||
msgstr "源版本库是浅克隆，忽略 --local"
|
||||
|
||||
#: builtin/clone.c:915
|
||||
#: builtin/clone.c:908
|
||||
msgid "--local is ignored"
|
||||
msgstr "--local 被忽略"
|
||||
|
||||
#: builtin/clone.c:919
|
||||
#: builtin/clone.c:912
|
||||
#, c-format
|
||||
msgid "Don't know how to clone %s"
|
||||
msgstr "不知道如何克隆 %s"
|
||||
|
||||
#: builtin/clone.c:968 builtin/clone.c:976
|
||||
#: builtin/clone.c:961 builtin/clone.c:969
|
||||
#, c-format
|
||||
msgid "Remote branch %s not found in upstream %s"
|
||||
msgstr "远程分支 %s 在上游 %s 未发现"
|
||||
|
||||
#: builtin/clone.c:979
|
||||
#: builtin/clone.c:972
|
||||
msgid "You appear to have cloned an empty repository."
|
||||
msgstr "您似乎克隆了一个空版本库。"
|
||||
|
||||
|
|
@ -5585,7 +5563,7 @@ msgstr "key"
|
|||
msgid "field name to sort on"
|
||||
msgstr "排序的字段名"
|
||||
|
||||
#: builtin/fsck.c:147 builtin/prune.c:236
|
||||
#: builtin/fsck.c:147 builtin/prune.c:137
|
||||
msgid "Checking connectivity"
|
||||
msgstr "检查连接中"
|
||||
|
||||
|
|
@ -5633,7 +5611,7 @@ msgstr "启用更严格的检查"
|
|||
msgid "write dangling objects in .git/lost-found"
|
||||
msgstr "将摇摆对象写入 .git/lost-found 中"
|
||||
|
||||
#: builtin/fsck.c:627 builtin/prune.c:198
|
||||
#: builtin/fsck.c:627 builtin/prune.c:107
|
||||
msgid "show progress"
|
||||
msgstr "显示进度"
|
||||
|
||||
|
|
@ -8062,60 +8040,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|||
msgid "Removing duplicate objects"
|
||||
msgstr "正在删除重复对象"
|
||||
|
||||
#: builtin/prune.c:12
|
||||
#: builtin/prune.c:11
|
||||
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
||||
msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
|
||||
|
||||
#: builtin/prune.c:86
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "删除工作区/%s：不是一个有效的目录"
|
||||
|
||||
#: builtin/prune.c:92
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "删除 worktrees/%s：gitdir 文件不存在"
|
||||
|
||||
#: builtin/prune.c:97
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
|
||||
|
||||
#: builtin/prune.c:108
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
|
||||
|
||||
#: builtin/prune.c:124
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
|
||||
|
||||
#: builtin/prune.c:159
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "无法删除：%s"
|
||||
|
||||
#: builtin/prune.c:196
|
||||
#: builtin/prune.c:105 builtin/worktree.c:112
|
||||
msgid "do not remove, show only"
|
||||
msgstr "不删除，只显示"
|
||||
|
||||
#: builtin/prune.c:197
|
||||
#: builtin/prune.c:106 builtin/worktree.c:113
|
||||
msgid "report pruned objects"
|
||||
msgstr "报告清除的对象"
|
||||
|
||||
#: builtin/prune.c:199
|
||||
msgid "prune .git/worktrees"
|
||||
msgstr "清理 .git/worktrees"
|
||||
|
||||
#: builtin/prune.c:201
|
||||
#: builtin/prune.c:109 builtin/worktree.c:115
|
||||
msgid "expire objects older than <time>"
|
||||
msgstr "使早于给定时间的对象过期"
|
||||
|
||||
#: builtin/prune.c:216
|
||||
msgid "--worktrees does not take extra arguments"
|
||||
msgstr "--worktrees 没有附加参数"
|
||||
|
||||
#: builtin/push.c:14
|
||||
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
||||
msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
|
||||
|
|
@ -10165,6 +10105,83 @@ msgstr "git verify-tag [-v | --verbose] <标签>..."
|
|||
msgid "print tag contents"
|
||||
msgstr "打印 tag 内容"
|
||||
|
||||
#: builtin/worktree.c:11
|
||||
msgid "git worktree add [<options>] <path> <branch>"
|
||||
msgstr "git worktree add [<选项>] <路径> <分支>"
|
||||
|
||||
#: builtin/worktree.c:12
|
||||
msgid "git worktree prune [<options>]"
|
||||
msgstr "git worktree prune [<选项>]"
|
||||
|
||||
#: builtin/worktree.c:27
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: not a valid directory"
|
||||
msgstr "删除工作区/%s：不是一个有效的目录"
|
||||
|
||||
#: builtin/worktree.c:33
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file does not exist"
|
||||
msgstr "删除 worktrees/%s：gitdir 文件不存在"
|
||||
|
||||
#: builtin/worktree.c:38
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
||||
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
|
||||
|
||||
#: builtin/worktree.c:49
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: invalid gitdir file"
|
||||
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
|
||||
|
||||
#: builtin/worktree.c:65
|
||||
#, c-format
|
||||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
|
||||
|
||||
#: builtin/worktree.c:100
|
||||
#, c-format
|
||||
msgid "failed to remove: %s"
|
||||
msgstr "无法删除：%s"
|
||||
|
||||
#: builtin/worktree.c:186
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
msgstr "'%s' 已经存在"
|
||||
|
||||
#: builtin/worktree.c:207
|
||||
#, c-format
|
||||
msgid "could not create directory of '%s'"
|
||||
msgstr "不能创建目录 '%s'"
|
||||
|
||||
#: builtin/worktree.c:241
|
||||
msgid "unable to resolve HEAD"
|
||||
msgstr "不能解析 HEAD"
|
||||
|
||||
#: builtin/worktree.c:249
|
||||
#, c-format
|
||||
msgid "Enter %s (identifier %s)"
|
||||
msgstr "输入 %s （标识符 %s）"
|
||||
|
||||
#: builtin/worktree.c:281
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
|
||||
|
||||
#: builtin/worktree.c:283
|
||||
msgid "create a new branch"
|
||||
msgstr "创建一个新分支"
|
||||
|
||||
#: builtin/worktree.c:285
|
||||
msgid "create or reset a branch"
|
||||
msgstr "创建或重置一个分支"
|
||||
|
||||
#: builtin/worktree.c:286
|
||||
msgid "detach HEAD at named commit"
|
||||
msgstr "HEAD 从指定的提交分离"
|
||||
|
||||
#: builtin/worktree.c:292
|
||||
msgid "-b and -B are mutually exclusive"
|
||||
msgstr "-b 和 -B 互斥"
|
||||
|
||||
#: builtin/write-tree.c:13
|
||||
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
||||
msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
|
||||
|
|
@ -10228,8 +10245,8 @@ msgid "List, create, or delete branches"
|
|||
msgstr "列出、创建或删除分支"
|
||||
|
||||
#: common-cmds.h:21
|
||||
msgid "Checkout a branch or paths to the working tree"
|
||||
msgstr "检出一个分支或路径到工作区"
|
||||
msgid "Switch branches or restore working tree files"
|
||||
msgstr "切换分支或恢复工作区文件"
|
||||
|
||||
#: common-cmds.h:22
|
||||
msgid "Clone a repository into a new directory"
|
||||
|
|
@ -11261,18 +11278,3 @@ msgstr "无法递归进子模组路径 '$sm_path'"
|
|||
#, sh-format
|
||||
msgid "Synchronizing submodule url for '$displaypath'"
|
||||
msgstr "为 '$displaypath' 同步子模组 url"
|
||||
|
||||
#~ msgid "Cannot apply stash: Your index contains uncommitted changes."
|
||||
#~ msgstr "无法应用 stash：您的索引中包含未提交的变更。"
|
||||
|
||||
#~ msgid "The most commonly used git commands are:"
|
||||
#~ msgstr "最常用的 git 命令有："
|
||||
|
||||
#~ msgid "No such branch: '%s'"
|
||||
#~ msgstr "没有此分支：'%s'"
|
||||
|
||||
#~ msgid "Could not create git link %s"
|
||||
#~ msgstr "不能创建 git link %s"
|
||||
|
||||
#~ msgid "Invalid gc.pruneexpire: '%s'"
|
||||
#~ msgstr "无效的 gc.pruneexpire：'%s'"
|
||||
|
|
|
|||
Loading…
Reference in a new issue