Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

提交 9aeb4c2b 编写于 作者: J Jiang Xin
浏览文件
操作

l10n: batch updates for one trivial change 

In order to catch up with the release of Git 2.2.0 final, make a batch
l10n update for the new l10n change brought by commit d52adf1f (trailer:
display a trailer without its trailing newline).
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
上级 e3f9cab7
展开全部 显示空白变更内容
内联 并排
Showing with 554 addition and 519 deletion
po/bg.po
浏览文件 @ 9aeb4c2b
...@@ -130,8 +130,8 @@ msgid "" ...@@ -130,8 +130,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: git master\n" "Project-Id-Version: git master\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2014-11-02 18:01+0200\n" "POT-Creation-Date: 2014-11-20 09:42+0800\n"
"PO-Revision-Date: 2014-11-02 18:52+0200\n" "PO-Revision-Date: 2014-11-20 10:15+0800\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n" "Language: bg\n"
...@@ -410,42 +410,42 @@ msgid_plural "The bundle requires these %d refs:" ...@@ -410,42 +410,42 @@ msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Пратката изисква следния указател:" msgstr[0] "Пратката изисква следния указател:"
msgstr[1] "Пратката изисква следните %d указатели:" msgstr[1] "Пратката изисква следните %d указатели:"
#: bundle.c:251
msgid "Could not spawn pack-objects"
msgstr "Командата „git pack-objects“ не може да бъде стартирана"
# FIXME better message
#: bundle.c:269
msgid "pack-objects died"
msgstr "Командата „git pack-objects“ не завърши успешно"
# FIXME better message # FIXME better message
#: bundle.c:292 #: bundle.c:309
msgid "rev-list died" msgid "rev-list died"
msgstr "Командата „git rev-list“ не завърши успешно" msgstr "Командата „git rev-list“ не завърши успешно"
#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #: bundle.c:358
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
#: bundle.c:333
#, c-format #, c-format
msgid "ref '%s' is excluded by the rev-list options" msgid "ref '%s' is excluded by the rev-list options"
msgstr "" msgstr ""
"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
#: bundle.c:378 #: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
#: bundle.c:444
msgid "Refusing to create empty bundle." msgid "Refusing to create empty bundle."
msgstr "Създаването на празна пратка е невъзможно." msgstr "Създаването на празна пратка е невъзможно."
#: bundle.c:393 #: bundle.c:454
msgid "Could not spawn pack-objects"
msgstr "Командата „git pack-objects“ не може да бъде стартирана"
# FIXME better message
#: bundle.c:411
msgid "pack-objects died"
msgstr "Командата „git pack-objects“ не завърши успешно"
#: bundle.c:414
#, c-format #, c-format
msgid "cannot create '%s'" msgid "cannot create '%s'"
msgstr "Файлът „%s“ не може да бъде създаден" msgstr "Файлът „%s“ не може да бъде създаден"
# FIXME better message # FIXME better message
#: bundle.c:435 #: bundle.c:475
msgid "index-pack died" msgid "index-pack died"
msgstr "Командата „git index-pack“ не завърши успешно" msgstr "Командата „git index-pack“ не завърши успешно"
...@@ -1619,28 +1619,28 @@ msgstr "Връзката в Git „%s“ не може да бъде създа ...@@ -1619,28 +1619,28 @@ msgstr "Връзката в Git „%s“ не може да бъде създа
msgid "Could not set core.worktree in %s" msgid "Could not set core.worktree in %s"
msgstr "Настройката „core.worktree“ не може да се зададе в „%s“" msgstr "Настройката „core.worktree“ не може да се зададе в „%s“"
#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 #: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
#: trailer.c:570 #: trailer.c:569
#, c-format #, c-format
msgid "unknown value '%s' for key '%s'" msgid "unknown value '%s' for key '%s'"
msgstr "неправилна стойност „%s“ за настройката „%s“" msgstr "неправилна стойност „%s“ за настройката „%s“"
#: trailer.c:552 trailer.c:557 builtin/remote.c:288 #: trailer.c:551 trailer.c:556 builtin/remote.c:288
#, c-format #, c-format
msgid "more than one %s" msgid "more than one %s"
msgstr "стойността „%s“ се повтаря в настройките" msgstr "стойността „%s“ се повтаря в настройките"
#: trailer.c:587 #: trailer.c:589
#, c-format #, c-format
msgid "empty trailer token in trailer '%s'" msgid "empty trailer token in trailer '%.*s'"
msgstr "празна завършваща лексема в епилога „%s“" msgstr "празна завършваща лексема в епилога „%.*s“"
#: trailer.c:706 #: trailer.c:709
#, c-format #, c-format
msgid "could not read input file '%s'" msgid "could not read input file '%s'"
msgstr "входният файл „%s“ не може да бъде прочетен" msgstr "входният файл „%s“ не може да бъде прочетен"
#: trailer.c:709 #: trailer.c:712
msgid "could not read from stdin" msgid "could not read from stdin"
msgstr "от стандартния вход не може да се чете" msgstr "от стандартния вход не може да се чете"
...@@ -2142,6 +2142,11 @@ msgstr "изтрит" ...@@ -2142,6 +2142,11 @@ msgstr "изтрит"
msgid "behind " msgid "behind "
msgstr "назад с " msgstr "назад с "
#: compat/precompose_utf8.c:55 builtin/clone.c:357
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуспешно изтриване на „%s“"
#: builtin/add.c:22 #: builtin/add.c:22
msgid "git add [options] [--] <pathspec>..." msgid "git add [options] [--] <pathspec>..."
msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
...@@ -4184,11 +4189,6 @@ msgstr "„%s“ съществува и не е директория" ...@@ -4184,11 +4189,6 @@ msgstr "„%s“ съществува и не е директория"
msgid "failed to stat %s\n" msgid "failed to stat %s\n"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n" msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n"
#: builtin/clone.c:357
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуспешно изтриване на „%s“"
#: builtin/clone.c:362 #: builtin/clone.c:362
#, c-format #, c-format
msgid "failed to create link '%s'" msgid "failed to create link '%s'"
...@@ -10511,27 +10511,6 @@ msgstr "" ...@@ -10511,27 +10511,6 @@ msgstr ""
"за\n" "за\n"
"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“." "някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“."
#: parse-options.h:143
msgid "expiry-date"
msgstr "период на валидност/запазване"
#: parse-options.h:158
msgid "no-op (backward compatibility)"
msgstr "нулева операция (за съвместимост с предишни версии)"
#: parse-options.h:232
msgid "be more verbose"
msgstr "повече подробности"
#: parse-options.h:234
msgid "be more quiet"
msgstr "по-малко подробности"
# FIXME SHA-1 -> SHA1
#: parse-options.h:240
msgid "use <n> digits to display SHA-1s"
msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1"
#: common-cmds.h:8 #: common-cmds.h:8
msgid "Add file contents to the index" msgid "Add file contents to the index"
msgstr "Добавяне на съдържанието на файла към индекса" msgstr "Добавяне на съдържанието на файла към индекса"
...@@ -10618,6 +10597,27 @@ msgstr "Извеждане на състоянието на работното ...@@ -10618,6 +10597,27 @@ msgstr "Извеждане на състоянието на работното
msgid "Create, list, delete or verify a tag object signed with GPG" msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG" msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG"
#: parse-options.h:143
msgid "expiry-date"
msgstr "период на валидност/запазване"
#: parse-options.h:158
msgid "no-op (backward compatibility)"
msgstr "нулева операция (за съвместимост с предишни версии)"
#: parse-options.h:232
msgid "be more verbose"
msgstr "повече подробности"
#: parse-options.h:234
msgid "be more quiet"
msgstr "по-малко подробности"
# FIXME SHA-1 -> SHA1
#: parse-options.h:240
msgid "use <n> digits to display SHA-1s"
msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1"
#: rerere.h:27 #: rerere.h:27
msgid "update the index with reused conflict resolution if possible" msgid "update the index with reused conflict resolution if possible"
msgstr "" msgstr ""
......
po/ca.po
浏览文件 @ 9aeb4c2b
...@@ -7,8 +7,8 @@ msgid "" ...@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Git\n" "Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2014-11-01 07:46+0800\n" "POT-Creation-Date: 2014-11-20 09:42+0800\n"
"PO-Revision-Date: 2014-11-17 13:16-0700\n" "PO-Revision-Date: 2014-11-20 10:23+0800\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" "Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan\n" "Language-Team: Catalan\n"
"Language: ca\n" "Language: ca\n"
...@@ -290,38 +290,38 @@ msgid_plural "The bundle requires these %d refs:" ...@@ -290,38 +290,38 @@ msgid_plural "The bundle requires these %d refs:"
msgstr[0] "L'embolic requereix aquesta referència:" msgstr[0] "L'embolic requereix aquesta referència:"
msgstr[1] "L'embolic requereix aquestes %d referències:" msgstr[1] "L'embolic requereix aquestes %d referències:"
#: bundle.c:292 #: bundle.c:251
msgid "Could not spawn pack-objects"
msgstr "No s'ha pogut executar el pack-objects"
#: bundle.c:269
msgid "pack-objects died"
msgstr "El pack-objects s'ha mort"
#: bundle.c:309
msgid "rev-list died" msgid "rev-list died"
msgstr "El rev-list s'ha mort" msgstr "El rev-list s'ha mort"
#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #: bundle.c:358
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
#: bundle.c:333
#, c-format #, c-format
msgid "ref '%s' is excluded by the rev-list options" msgid "ref '%s' is excluded by the rev-list options"
msgstr "les opcions de la llista de revisions exclouen la referència '%s'" msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
#: bundle.c:378 #: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
#: bundle.c:444
msgid "Refusing to create empty bundle." msgid "Refusing to create empty bundle."
msgstr "Refusant crear un embolic buit." msgstr "Refusant crear un embolic buit."
#: bundle.c:393 #: bundle.c:454
msgid "Could not spawn pack-objects"
msgstr "No s'ha pogut executar el pack-objects"
#: bundle.c:411
msgid "pack-objects died"
msgstr "El pack-objects s'ha mort"
#: bundle.c:414
#, c-format #, c-format
msgid "cannot create '%s'" msgid "cannot create '%s'"
msgstr "no es pot crear '%s'" msgstr "no es pot crear '%s'"
#: bundle.c:435 #: bundle.c:475
msgid "index-pack died" msgid "index-pack died"
msgstr "L'index-pack s'ha mort" msgstr "L'index-pack s'ha mort"
...@@ -1475,28 +1475,28 @@ msgstr "No s'ha pogut crear l'enllaç de git %s" ...@@ -1475,28 +1475,28 @@ msgstr "No s'ha pogut crear l'enllaç de git %s"
msgid "Could not set core.worktree in %s" msgid "Could not set core.worktree in %s"
msgstr "No s'ha pogut establir core.worktree en %s" msgstr "No s'ha pogut establir core.worktree en %s"
#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 #: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
#: trailer.c:570 #: trailer.c:569
#, c-format #, c-format
msgid "unknown value '%s' for key '%s'" msgid "unknown value '%s' for key '%s'"
msgstr "valor desconegut '%s' per a la clau '%s'" msgstr "valor desconegut '%s' per a la clau '%s'"
#: trailer.c:552 trailer.c:557 builtin/remote.c:288 #: trailer.c:551 trailer.c:556 builtin/remote.c:288
#, c-format #, c-format
msgid "more than one %s" msgid "more than one %s"
msgstr "més d'un %s" msgstr "més d'un %s"
#: trailer.c:587 #: trailer.c:589
#, c-format #, c-format
msgid "empty trailer token in trailer '%s'" msgid "empty trailer token in trailer '%.*s'"
msgstr "fitxa de remolc buida en el remolc '%s'" msgstr "fitxa de remolc buida en el remolc '%.*s'"
#: trailer.c:706 #: trailer.c:709
#, c-format #, c-format
msgid "could not read input file '%s'" msgid "could not read input file '%s'"
msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"
#: trailer.c:709 #: trailer.c:712
msgid "could not read from stdin" msgid "could not read from stdin"
msgstr "No s'ha pogut llegir des d'stdin" msgstr "No s'ha pogut llegir des d'stdin"
......
po/de.po
浏览文件 @ 9aeb4c2b
此差异已折叠。
po/fr.po
浏览文件 @ 9aeb4c2b
...@@ -73,8 +73,8 @@ msgid "" ...@@ -73,8 +73,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: git\n" "Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2014-11-01 07:46+0800\n" "POT-Creation-Date: 2014-11-20 09:42+0800\n"
"PO-Revision-Date: 2014-11-01 16:51+0100\n" "PO-Revision-Date: 2014-11-20 10:21+0800\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n" "Language: fr\n"
...@@ -359,38 +359,38 @@ msgid_plural "The bundle requires these %d refs:" ...@@ -359,38 +359,38 @@ msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Le colis exige cette référence :" msgstr[0] "Le colis exige cette référence :"
msgstr[1] "Le colis exige ces %d références :" msgstr[1] "Le colis exige ces %d références :"
#: bundle.c:292 #: bundle.c:251
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
#: bundle.c:269
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
#: bundle.c:309
msgid "rev-list died" msgid "rev-list died"
msgstr "rev-list a disparu" msgstr "rev-list a disparu"
#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #: bundle.c:358
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
#: bundle.c:333
#, c-format #, c-format
msgid "ref '%s' is excluded by the rev-list options" msgid "ref '%s' is excluded by the rev-list options"
msgstr "la référence '%s' est exclue par les options de rev-list" msgstr "la référence '%s' est exclue par les options de rev-list"
#: bundle.c:378 #: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
#: bundle.c:444
msgid "Refusing to create empty bundle." msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide." msgstr "Refus de créer un colis vide."
#: bundle.c:393 #: bundle.c:454
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
#: bundle.c:411
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
#: bundle.c:414
#, c-format #, c-format
msgid "cannot create '%s'" msgid "cannot create '%s'"
msgstr "impossible de créer '%s'" msgstr "impossible de créer '%s'"
#: bundle.c:435 #: bundle.c:475
msgid "index-pack died" msgid "index-pack died"
msgstr "l'index de groupe a disparu" msgstr "l'index de groupe a disparu"
...@@ -421,7 +421,8 @@ msgstr "ligne %d de fichier de config incorrecte dans %s" ...@@ -421,7 +421,8 @@ msgstr "ligne %d de fichier de config incorrecte dans %s"
#: config.c:587 #: config.c:587
#, c-format #, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s" msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
#: config.c:589 #: config.c:589
#, c-format #, c-format
...@@ -454,12 +455,14 @@ msgstr "erreur inconnue pendant la lecture des fichiers de configuration" ...@@ -454,12 +455,14 @@ msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
#: config.c:1586 #: config.c:1586
#, c-format #, c-format
msgid "unable to parse '%s' from command-line config" msgid "unable to parse '%s' from command-line config"
msgstr "impossible d'analyser '%s' depuis le configuration en ligne de commande" msgstr ""
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
#: config.c:1588 #: config.c:1588
#, c-format #, c-format
msgid "bad config variable '%s' in file '%s' at line %d" msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" msgstr ""
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
#: config.c:1647 #: config.c:1647
#, c-format #, c-format
...@@ -1550,28 +1553,28 @@ msgstr "Impossible de créer le lien git %s" ...@@ -1550,28 +1553,28 @@ msgstr "Impossible de créer le lien git %s"
msgid "Could not set core.worktree in %s" msgid "Could not set core.worktree in %s"
msgstr "Impossible de paramétrer core.worktree dans %s" msgstr "Impossible de paramétrer core.worktree dans %s"
#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 #: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
#: trailer.c:570 #: trailer.c:569
#, c-format #, c-format
msgid "unknown value '%s' for key '%s'" msgid "unknown value '%s' for key '%s'"
msgstr "valeur inconnue '%s' pour la clé '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'"
#: trailer.c:552 trailer.c:557 builtin/remote.c:288 #: trailer.c:551 trailer.c:556 builtin/remote.c:288
#, c-format #, c-format
msgid "more than one %s" msgid "more than one %s"
msgstr "plus d'un %s" msgstr "plus d'un %s"
#: trailer.c:587 #: trailer.c:589
#, c-format #, c-format
msgid "empty trailer token in trailer '%s'" msgid "empty trailer token in trailer '%.*s'"
msgstr "symbole vide dans la ligne de fin '%s'" msgstr "symbole vide dans la ligne de fin '%.*s'"
#: trailer.c:706 #: trailer.c:709
#, c-format #, c-format
msgid "could not read input file '%s'" msgid "could not read input file '%s'"
msgstr "impossible de lire le fichier d'entrée '%s'" msgstr "impossible de lire le fichier d'entrée '%s'"
#: trailer.c:709 #: trailer.c:712
msgid "could not read from stdin" msgid "could not read from stdin"
msgstr "Impossible de lire depuis l'entrée standard" msgstr "Impossible de lire depuis l'entrée standard"
...@@ -4281,7 +4284,8 @@ msgstr "" ...@@ -4281,7 +4284,8 @@ msgstr ""
"\n" "\n"
" git config --global --edit\n" " git config --global --edit\n"
"\n" "\n"
"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation avec :\n" "Après ceci, vous pouvez corriger l'identité utilisée pour cette validation "
"avec :\n"
"\n" "\n"
" git commit --amend --reset-author\n" " git commit --amend --reset-author\n"
...@@ -6000,7 +6004,9 @@ msgstr "stocker le fichier tel quel sans filtrage" ...@@ -6000,7 +6004,9 @@ msgstr "stocker le fichier tel quel sans filtrage"
#: builtin/hash-object.c:100 #: builtin/hash-object.c:100
msgid "" msgid ""
"just hash any random garbage to create corrupt objects for debugging Git" "just hash any random garbage to create corrupt objects for debugging Git"
msgstr "juste hasher n'importe quel contenu pour créer des objets corrompus pour debugger Git" msgstr ""
"juste hasher n'importe quel contenu pour créer des objets corrompus pour "
"debugger Git"
#: builtin/hash-object.c:101 #: builtin/hash-object.c:101
msgid "process file as it were from this path" msgid "process file as it were from this path"
...@@ -6574,7 +6580,9 @@ msgstr "Impossible d'accéder à l'arbre de travail '%s'" ...@@ -6574,7 +6580,9 @@ msgstr "Impossible d'accéder à l'arbre de travail '%s'"
msgid "" msgid ""
"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
"[<file>...]" "[<file>...]"
msgstr "git interpret-trailers [--trim-empty] [(--trailer <symbole>[(=|:)<valeur>])...] [<fichier>...]" msgstr ""
"git interpret-trailers [--trim-empty] [(--trailer "
"<symbole>[(=|:)<valeur>])...] [<fichier>...]"
#: builtin/interpret-trailers.c:25 #: builtin/interpret-trailers.c:25
msgid "trim empty trailers" msgid "trim empty trailers"
...@@ -6619,7 +6627,9 @@ msgstr "décorer les options" ...@@ -6619,7 +6627,9 @@ msgstr "décorer les options"
#: builtin/log.c:133 #: builtin/log.c:133
msgid "Process line range n,m in file, counting from 1" msgid "Process line range n,m in file, counting from 1"
msgstr "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le compte à 1" msgstr ""
"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
"compte à 1"
#: builtin/log.c:229 #: builtin/log.c:229
#, c-format #, c-format
...@@ -7471,7 +7481,9 @@ msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?" ...@@ -7471,7 +7481,9 @@ msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
#: builtin/mv.c:71 #: builtin/mv.c:71
msgid "Please stage your changes to .gitmodules or stash them to proceed" msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "Veuillez indexer vos modifications de .gitmodules ou les remiser pour continuer" msgstr ""
"Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
"continuer"
#: builtin/mv.c:89 #: builtin/mv.c:89
#, c-format #, c-format
...@@ -10366,7 +10378,8 @@ msgstr "utiliser <n> chiffres pour afficher les SHA-1s" ...@@ -10366,7 +10378,8 @@ msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
#: rerere.h:27 #: rerere.h:27
msgid "update the index with reused conflict resolution if possible" msgid "update the index with reused conflict resolution if possible"
msgstr "met à jour l'index avec les résolutions de conflit réutilisées si possible" msgstr ""
"met à jour l'index avec les résolutions de conflit réutilisées si possible"
#: git-am.sh:52 #: git-am.sh:52
msgid "You need to set your committer info first" msgid "You need to set your committer info first"
...@@ -10714,7 +10727,8 @@ msgid "" ...@@ -10714,7 +10727,8 @@ msgid ""
"as appropriate to mark resolution and make a commit." "as appropriate to mark resolution and make a commit."
msgstr "" msgstr ""
"Le tirage n'est pas possible car vous avez des fichiers non fusionnés.\n" "Le tirage n'est pas possible car vous avez des fichiers non fusionnés.\n"
"Veuillez les corriger dans votre copie de travail, utiliser alors 'git add/rm <fichier>'\n" "Veuillez les corriger dans votre copie de travail, utiliser alors 'git add/"
"rm <fichier>'\n"
"si nécessaire pour marquer comme résolu et valider." "si nécessaire pour marquer comme résolu et valider."
#: git-pull.sh:25 #: git-pull.sh:25
......
po/sv.po
浏览文件 @ 9aeb4c2b
...@@ -7,8 +7,8 @@ msgid "" ...@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: git 2.0.0\n" "Project-Id-Version: git 2.0.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2014-11-01 07:46+0800\n" "POT-Creation-Date: 2014-11-20 09:42+0800\n"
"PO-Revision-Date: 2014-11-01 20:10+0100\n" "PO-Revision-Date: 2014-11-20 10:19+0800\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n" "Language: sv\n"
...@@ -285,38 +285,38 @@ msgid_plural "The bundle requires these %d refs:" ...@@ -285,38 +285,38 @@ msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[0] "Paketet (bundlen) kräver denna referens:"
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
#: bundle.c:292 #: bundle.c:251
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
#: bundle.c:269
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
#: bundle.c:309
msgid "rev-list died" msgid "rev-list died"
msgstr "rev-list dog" msgstr "rev-list dog"
#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #: bundle.c:358
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
#: bundle.c:333
#, c-format #, c-format
msgid "ref '%s' is excluded by the rev-list options" msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
#: bundle.c:378 #: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
#: bundle.c:444
msgid "Refusing to create empty bundle." msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)." msgstr "Vägrar skapa ett tomt paket (bundle)."
#: bundle.c:393 #: bundle.c:454
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
#: bundle.c:411
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
#: bundle.c:414
#, c-format #, c-format
msgid "cannot create '%s'" msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\"" msgstr "kan inte skapa \"%s\""
#: bundle.c:435 #: bundle.c:475
msgid "index-pack died" msgid "index-pack died"
msgstr "index-pack dog" msgstr "index-pack dog"
...@@ -1459,28 +1459,28 @@ msgstr "Kunde inte skapa gitlänk %s" ...@@ -1459,28 +1459,28 @@ msgstr "Kunde inte skapa gitlänk %s"
msgid "Could not set core.worktree in %s" msgid "Could not set core.worktree in %s"
msgstr "Kunde inte sätta core.worktree i %s" msgstr "Kunde inte sätta core.worktree i %s"
#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 #: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
#: trailer.c:570 #: trailer.c:569
#, c-format #, c-format
msgid "unknown value '%s' for key '%s'" msgid "unknown value '%s' for key '%s'"
msgstr "okänt värde \"%s\" för nyckeln \"%s\"" msgstr "okänt värde \"%s\" för nyckeln \"%s\""
#: trailer.c:552 trailer.c:557 builtin/remote.c:288 #: trailer.c:551 trailer.c:556 builtin/remote.c:288
#, c-format #, c-format
msgid "more than one %s" msgid "more than one %s"
msgstr "mer än en %s" msgstr "mer än en %s"
#: trailer.c:587 #: trailer.c:589
#, c-format #, c-format
msgid "empty trailer token in trailer '%s'" msgid "empty trailer token in trailer '%.*s'"
msgstr "tom släpradssymbol i släpraden \"%s\"" msgstr "tom släpradssymbol i släpraden \"%.*s\""
#: trailer.c:706 #: trailer.c:709
#, c-format #, c-format
msgid "could not read input file '%s'" msgid "could not read input file '%s'"
msgstr "kunde inte läsa indatafilen \"%s\"" msgstr "kunde inte läsa indatafilen \"%s\""
#: trailer.c:709 #: trailer.c:712
msgid "could not read from stdin" msgid "could not read from stdin"
msgstr "Kunde inte läsa från standard in" msgstr "Kunde inte läsa från standard in"
...@@ -6358,11 +6358,11 @@ msgstr " delat" ...@@ -6358,11 +6358,11 @@ msgstr " delat"
#: builtin/init-db.c:467 #: builtin/init-db.c:467
msgid "" msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"[=<permissions>]] [directory]" "shared[=<permissions>]] [directory]"
msgstr "" msgstr ""
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
"[=<behörigheter>]] [katalog]" "shared[=<behörigheter>]] [katalog]"
#: builtin/init-db.c:490 #: builtin/init-db.c:490
msgid "permissions" msgid "permissions"
...@@ -6405,8 +6405,8 @@ msgid "" ...@@ -6405,8 +6405,8 @@ msgid ""
"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
"[<file>...]" "[<file>...]"
msgstr "" msgstr ""
"git interpret-trailers [--trim-empty] [(--trailer <symbol>[(=|:)" "git interpret-trailers [--trim-empty] [(--trailer "
"<värde>])...] [<fil>...]" "<symbol>[(=|:)<värde>])...] [<fil>...]"
#: builtin/interpret-trailers.c:25 #: builtin/interpret-trailers.c:25
msgid "trim empty trailers" msgid "trim empty trailers"
...@@ -9497,11 +9497,11 @@ msgstr "visa <n> nyaste refloggposter med början på bas" ...@@ -9497,11 +9497,11 @@ msgstr "visa <n> nyaste refloggposter med början på bas"
#: builtin/show-ref.c:10 #: builtin/show-ref.c:10
msgid "" msgid ""
"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
msgstr "" msgstr ""
"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] " "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] "
#: builtin/show-ref.c:11 #: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgid "git show-ref --exclude-existing[=pattern] < ref-list"
......
po/vi.po
浏览文件 @ 9aeb4c2b
...@@ -8,8 +8,8 @@ msgid "" ...@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: git v2.2.0\n" "Project-Id-Version: git v2.2.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2014-11-01 07:46+0800\n" "POT-Creation-Date: 2014-11-20 09:42+0800\n"
"PO-Revision-Date: 2014-11-01 09:05+0700\n" "PO-Revision-Date: 2014-11-20 10:17+0800\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n" "Language: vi\n"
...@@ -292,38 +292,38 @@ msgid_plural "The bundle requires these %d refs:" ...@@ -292,38 +292,38 @@ msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Lệnh bundle yêu cầu tham chiếu này:" msgstr[0] "Lệnh bundle yêu cầu tham chiếu này:"
msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu này:" msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu này:"
#: bundle.c:292 #: bundle.c:251
msgid "Could not spawn pack-objects"
msgstr "Không thể sản sinh đối tượng gói"
#: bundle.c:269
msgid "pack-objects died"
msgstr "đối tượng gói đã chết"
#: bundle.c:309
msgid "rev-list died" msgid "rev-list died"
msgstr "rev-list đã chết" msgstr "rev-list đã chết"
#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #: bundle.c:358
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
#: bundle.c:333
#, c-format #, c-format
msgid "ref '%s' is excluded by the rev-list options" msgid "ref '%s' is excluded by the rev-list options"
msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list" msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list"
#: bundle.c:378 #: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
#: bundle.c:444
msgid "Refusing to create empty bundle." msgid "Refusing to create empty bundle."
msgstr "Từ chối tạo một bundle trống rỗng." msgstr "Từ chối tạo một bundle trống rỗng."
#: bundle.c:393 #: bundle.c:454
msgid "Could not spawn pack-objects"
msgstr "Không thể sản sinh đối tượng gói"
#: bundle.c:411
msgid "pack-objects died"
msgstr "đối tượng gói đã chết"
#: bundle.c:414
#, c-format #, c-format
msgid "cannot create '%s'" msgid "cannot create '%s'"
msgstr "không thể tạo “%s”" msgstr "không thể tạo “%s”"
#: bundle.c:435 #: bundle.c:475
msgid "index-pack died" msgid "index-pack died"
msgstr "mục lục gói đã chết" msgstr "mục lục gói đã chết"
...@@ -1482,28 +1482,28 @@ msgstr "Không thể tạo liên kết git “%s”" ...@@ -1482,28 +1482,28 @@ msgstr "Không thể tạo liên kết git “%s”"
msgid "Could not set core.worktree in %s" msgid "Could not set core.worktree in %s"
msgstr "Không thể đặt “core.worktree” trong “%s”." msgstr "Không thể đặt “core.worktree” trong “%s”."
#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 #: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
#: trailer.c:570 #: trailer.c:569
#, c-format #, c-format
msgid "unknown value '%s' for key '%s'" msgid "unknown value '%s' for key '%s'"
msgstr "không hiểu giá trị “%s” cho khóa “%s”" msgstr "không hiểu giá trị “%s” cho khóa “%s”"
#: trailer.c:552 trailer.c:557 builtin/remote.c:288 #: trailer.c:551 trailer.c:556 builtin/remote.c:288
#, c-format #, c-format
msgid "more than one %s" msgid "more than one %s"
msgstr "nhiều hơn một %s" msgstr "nhiều hơn một %s"
#: trailer.c:587 #: trailer.c:589
#, c-format #, c-format
msgid "empty trailer token in trailer '%s'" msgid "empty trailer token in trailer '%.*s'"
msgstr "thẻ thừa trống rỗng trong phần thừa “%s”" msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”"
#: trailer.c:706 #: trailer.c:709
#, c-format #, c-format
msgid "could not read input file '%s'" msgid "could not read input file '%s'"
msgstr "không đọc được tập tin đầu vào “%s”" msgstr "không đọc được tập tin đầu vào “%s”"
#: trailer.c:709 #: trailer.c:712
msgid "could not read from stdin" msgid "could not read from stdin"
msgstr "không thể đọc từ đầu vào tiêu chuẩn" msgstr "không thể đọc từ đầu vào tiêu chuẩn"
......
po/zh_CN.po
浏览文件 @ 9aeb4c2b
...@@ -12,8 +12,8 @@ msgid "" ...@@ -12,8 +12,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Git\n" "Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2014-11-01 07:46+0800\n" "POT-Creation-Date: 2014-11-20 09:42+0800\n"
"PO-Revision-Date: 2014-11-02 10:58+0800\n" "PO-Revision-Date: 2014-11-20 10:05+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n" "Language: zh_CN\n"
...@@ -285,38 +285,38 @@ msgid_plural "The bundle requires these %d refs:" ...@@ -285,38 +285,38 @@ msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用：" msgstr[0] "这个包需要这个引用："
msgstr[1] "这个包需要 %d 个引用：" msgstr[1] "这个包需要 %d 个引用："
#: bundle.c:292 #: bundle.c:251
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
#: bundle.c:269
msgid "pack-objects died"
msgstr "pack-objects 终止"
#: bundle.c:309
msgid "rev-list died" msgid "rev-list died"
msgstr "rev-list 终止" msgstr "rev-list 终止"
#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #: bundle.c:358
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
#: bundle.c:333
#, c-format #, c-format
msgid "ref '%s' is excluded by the rev-list options" msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除" msgstr "引用 '%s' 被 rev-list 选项排除"
#: bundle.c:378 #: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
#: bundle.c:444
msgid "Refusing to create empty bundle." msgid "Refusing to create empty bundle."
msgstr "不能创建空包。" msgstr "不能创建空包。"
#: bundle.c:393 #: bundle.c:454
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
#: bundle.c:411
msgid "pack-objects died"
msgstr "pack-objects 终止"
#: bundle.c:414
#, c-format #, c-format
msgid "cannot create '%s'" msgid "cannot create '%s'"
msgstr "不能创建 '%s'" msgstr "不能创建 '%s'"
#: bundle.c:435 #: bundle.c:475
msgid "index-pack died" msgid "index-pack died"
msgstr "index-pack 终止" msgstr "index-pack 终止"
...@@ -1455,28 +1455,28 @@ msgstr "不能创建 git link %s" ...@@ -1455,28 +1455,28 @@ msgstr "不能创建 git link %s"
msgid "Could not set core.worktree in %s" msgid "Could not set core.worktree in %s"
msgstr "不能在 %s 中设置 core.worktree" msgstr "不能在 %s 中设置 core.worktree"
#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 #: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
#: trailer.c:570 #: trailer.c:569
#, c-format #, c-format
msgid "unknown value '%s' for key '%s'" msgid "unknown value '%s' for key '%s'"
msgstr "键 '%2$s' 的未知取值 '%1$s'" msgstr "键 '%2$s' 的未知取值 '%1$s'"
#: trailer.c:552 trailer.c:557 builtin/remote.c:288 #: trailer.c:551 trailer.c:556 builtin/remote.c:288
#, c-format #, c-format
msgid "more than one %s" msgid "more than one %s"
msgstr "多于一个 %s" msgstr "多于一个 %s"
#: trailer.c:587 #: trailer.c:589
#, c-format #, c-format
msgid "empty trailer token in trailer '%s'" msgid "empty trailer token in trailer '%.*s'"
msgstr "签名 '%s' 的键为空" msgstr "签名 '%.*s' 的键为空"
#: trailer.c:706 #: trailer.c:709
#, c-format #, c-format
msgid "could not read input file '%s'" msgid "could not read input file '%s'"
msgstr "不能读取输入文件 '%s'" msgstr "不能读取输入文件 '%s'"
#: trailer.c:709 #: trailer.c:712
msgid "could not read from stdin" msgid "could not read from stdin"
msgstr "不能自标准输入读取" msgstr "不能自标准输入读取"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或