l10n: Fixed typo of git fetch-pack command
Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed the affected translations all in one batch. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Nov 22, 2016 at 22:24 UTC
275588f93eedd8d7a556c38b75944b858e704dce
6 files changed
+282
-183
po/fr.po
+124
-61
@@ -73,8 +73,8 @@ msgid ""
73
msgstr ""
74
"Project-Id-Version: git\n"
75
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
76
-"POT-Creation-Date: 2016-11-01 21:35+0800\n"
77
-"PO-Revision-Date: 2016-11-06 20:21+0100\n"
76
+"POT-Creation-Date: 2016-11-22 22:10+0800\n"
77
+"PO-Revision-Date: 2016-11-22 22:16+0800\n"
78
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
79
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
80
"Language: fr\n"
@@ -269,7 +269,8 @@ msgstr[1] ""
269
#: apply.c:1589
270
#, c-format
271
msgid "git diff header lacks filename information (line %d)"
272
-msgstr "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
272
+msgstr ""
273
+"information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
274
275
#: apply.c:1759
276
msgid "new file depends on old contents"
@@ -358,18 +359,22 @@ msgstr "données de patch binaire manquantes pour '%s'"
359
#: apply.c:3098
360
#, c-format
361
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
361
-msgstr "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section inverse"
362
+msgstr ""
363
+"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
364
+"inverse"
365
366
#: apply.c:3144
367
#, c-format
368
msgid "cannot apply binary patch to '%s' without full index line"
366
-msgstr "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
369
+msgstr ""
370
+"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
371
372
#: apply.c:3154
373
#, c-format
374
msgid ""
375
"the patch applies to '%s' (%s), which does not match the current contents."
372
-msgstr "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
376
+msgstr ""
377
+"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
378
379
#: apply.c:3162
380
#, c-format
@@ -430,7 +435,9 @@ msgstr "%s : ne correspond pas à l'index"
435
436
#: apply.c:3554
437
msgid "repository lacks the necessary blob to fall back on 3-way merge."
433
-msgstr "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 points."
438
+msgstr ""
439
+"le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
440
+"points."
441
442
#: apply.c:3557
443
#, c-format
@@ -515,7 +522,8 @@ msgstr "Vérification du patch %s..."
522
#: apply.c:4075
523
#, c-format
524
msgid "sha1 information is lacking or useless for submodule %s"
518
-msgstr "l'information sha1 est manquante ou inutilisable pour le sous-module %s"
525
+msgstr ""
526
+"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
527
528
#: apply.c:4082
529
#, c-format
@@ -835,11 +843,11 @@ msgstr "préfixe"
843
msgid "prepend prefix to each pathname in the archive"
844
msgstr "préfixer chaque chemin de fichier dans l'archive"
845
838
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 builtin/blame.c:2604
839
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
840
-#: builtin/grep.c:723 builtin/hash-object.c:101 builtin/ls-files.c:539
841
-#: builtin/ls-files.c:542 builtin/notes.c:401 builtin/notes.c:564
842
-#: builtin/read-tree.c:109 parse-options.h:153
846
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
847
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
848
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
849
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
850
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
851
msgid "file"
852
msgstr "fichier"
853
@@ -1162,27 +1170,27 @@ msgstr ""
1170
"sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
1171
"pour paramétrer le suivi distant en même temps que vous poussez."
1172
1165
-#: branch.c:266
1173
+#: branch.c:265
1174
#, c-format
1175
msgid "Not a valid object name: '%s'."
1176
msgstr "Nom d'objet invalide : '%s'."
1177
1170
-#: branch.c:286
1178
+#: branch.c:285
1179
#, c-format
1180
msgid "Ambiguous object name: '%s'."
1181
msgstr "Nom d'objet ambigu : '%s'."
1182
1175
-#: branch.c:291
1183
+#: branch.c:290
1184
#, c-format
1185
msgid "Not a valid branch point: '%s'."
1186
msgstr "Point d'embranchement invalide : '%s'."
1187
1180
-#: branch.c:345
1188
+#: branch.c:344
1189
#, c-format
1190
msgid "'%s' is already checked out at '%s'"
1191
msgstr "'%s' est déjà extrait dans '%s'"
1192
1185
-#: branch.c:364
1193
+#: branch.c:363
1194
#, c-format
1195
msgid "HEAD of working tree %s is not updated"
1196
msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
@@ -1289,8 +1297,10 @@ msgid ""
1297
"variable i18n.commitencoding to the encoding your project uses.\n"
1298
msgstr ""
1299
"Avertissement : le message de validation ne se conforme pas à UTF-8.\n"
1292
-"Vous souhaitez peut-être le modifier après correction du message ou régler la\n"
1293
-"variable de configuration i18n.commitencoding à l'encodage utilisé par votre projet.\n"
1300
+"Vous souhaitez peut-être le modifier après correction du message ou régler "
1301
+"la\n"
1302
+"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
1303
+"projet.\n"
1304
1305
#: compat/obstack.c:406 compat/obstack.c:408
1306
msgid "memory exhausted"
@@ -1469,7 +1479,8 @@ msgid ""
1479
"The file will have its original line endings in your working directory."
1480
msgstr ""
1481
"Les CRLF seront remplacés par des LF dans %s.\n"
1472
-"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail."
1482
+"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
1483
+"travail."
1484
1485
#: convert.c:205
1486
#, c-format
@@ -1483,7 +1494,8 @@ msgid ""
1494
"The file will have its original line endings in your working directory."
1495
msgstr ""
1496
"Les LF seront remplacés par des CRLF dans %s.\n"
1486
-"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail."
1497
+"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
1498
+"travail."
1499
1500
#: convert.c:215
1501
#, c-format
@@ -1563,7 +1575,7 @@ msgstr[1] "il y a %lu ans"
1575
msgid "failed to read orderfile '%s'"
1576
msgstr "impossible de lire le fichier de commande '%s'"
1577
1566
-#: diffcore-rename.c:540
1578
+#: diffcore-rename.c:536
1579
msgid "Performing inexact rename detection"
1580
msgstr "Détection de renommage inexact en cours"
1581
@@ -1627,17 +1639,23 @@ msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
1639
1640
#: diff.c:4700
1641
msgid "inexact rename detection was skipped due to too many files."
1630
-msgstr "détection de renommage inexact annulée à cause d'un trop grand nombre de fichiers."
1642
+msgstr ""
1643
+"détection de renommage inexact annulée à cause d'un trop grand nombre de "
1644
+"fichiers."
1645
1646
#: diff.c:4703
1647
msgid "only found copies from modified paths due to too many files."
1634
-msgstr "recherche uniquement des copies par modification de chemin à cause d'un trop grand nombre de fichiers."
1648
+msgstr ""
1649
+"recherche uniquement des copies par modification de chemin à cause d'un trop "
1650
+"grand nombre de fichiers."
1651
1652
#: diff.c:4706
1653
#, c-format
1654
msgid ""
1655
"you may want to set your %s variable to at least %d and retry the command."
1640
-msgstr "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le commande."
1656
+msgstr ""
1657
+"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
1658
+"commande."
1659
1660
#: dir.c:1866
1661
msgid "failed to get kernel name and information"
@@ -1657,7 +1675,7 @@ msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
1675
1676
#: fetch-pack.c:243
1677
#, c-format
1660
-msgid "git fetch_pack: expected ACK/NAK, got '%s'"
1678
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1679
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
1680
1681
#: fetch-pack.c:295
@@ -2214,7 +2232,8 @@ msgid ""
2232
"commit/abort the previous merge before you start a new notes merge."
2233
msgstr ""
2234
"Vous n'avez pas terminé votre précédente fusion de notes (%s existe).\n"
2217
-"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
2235
+"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "
2236
+"pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
2237
2238
#: notes-merge.c:280
2239
#, c-format
@@ -2341,7 +2360,10 @@ msgstr ""
2360
msgid ""
2361
"empty strings as pathspecs will be made invalid in upcoming releases. please "
2362
"use . instead if you meant to match all paths"
2344
-msgstr "les chaines de caractères vides comme spécificateurs de chemin seront invalides dans les prochaines versions. Veuillez utiliser . à la place pour correspondre à tous le chemins"
2363
+msgstr ""
2364
+"les chaines de caractères vides comme spécificateurs de chemin seront "
2365
+"invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
2366
+"correspondre à tous le chemins"
2367
2368
#: pathspec.c:440
2369
#, c-format
@@ -2838,7 +2860,9 @@ msgstr "le commit %s n'a pas de parent %d"
2860
#: sequencer.c:687
2861
#, c-format
2862
msgid "mainline was specified but commit %s is not a merge."
2841
-msgstr "une branche principale a été spécifiée mais le commit %s n'est pas une fusion."
2863
+msgstr ""
2864
+"une branche principale a été spécifiée mais le commit %s n'est pas une "
2865
+"fusion."
2866
2867
#. TRANSLATORS: The first %s will be a "todo" command like
2868
#. "revert" or "pick", the second %s a SHA1.
@@ -3111,7 +3135,7 @@ msgstr "le SHA1 court %s est ambigu"
3135
msgid "The candidates are:"
3136
msgstr "Les candidats sont :"
3137
3114
-#: sha1_name.c:577
3138
+#: sha1_name.c:578
3139
msgid ""
3140
"Git normally never creates a ref that ends with 40 hex characters\n"
3141
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -3503,7 +3527,8 @@ msgid ""
3527
"update:\n"
3528
"%s"
3529
msgstr ""
3506
-"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par l'extraction creuse :\n"
3530
+"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "
3531
+"jour par l'extraction creuse :\n"
3532
"%s"
3533
3534
#: unpack-trees.c:128
@@ -3513,7 +3538,8 @@ msgid ""
3538
"update:\n"
3539
"%s"
3540
msgstr ""
3516
-"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n"
3541
+"Les fichiers suivants de la copie de travail seraient supprimés par la mise "
3542
+"à jour par extraction creuse :\n"
3543
"%s"
3544
3545
#: unpack-trees.c:205
@@ -4528,10 +4554,10 @@ msgid "pass it through git-apply"
4554
msgstr "le passer jusqu'à git-apply"
4555
4556
#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
4531
-#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194
4532
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644
4533
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
4534
-#: parse-options.h:134 parse-options.h:245
4557
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
4558
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
4559
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
4560
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
4561
msgid "n"
4562
msgstr "n"
4563
@@ -4751,11 +4777,15 @@ msgstr "Ignorer les différences d'espace"
4777
4778
#: builtin/blame.c:2599
4779
msgid "Use an experimental indent-based heuristic to improve diffs"
4754
-msgstr "Utiliser une heuristique expérimentale reposant sur l'indentation pour améliorer les diffs"
4780
+msgstr ""
4781
+"Utiliser une heuristique expérimentale reposant sur l'indentation pour "
4782
+"améliorer les diffs"
4783
4784
#: builtin/blame.c:2600
4785
msgid "Use an experimental blank-line-based heuristic to improve diffs"
4758
-msgstr "Utiliser une heuristique expérimentale reposant sur les lignes vides pour améliorer le diffs"
4786
+msgstr ""
4787
+"Utiliser une heuristique expérimentale reposant sur les lignes vides pour "
4788
+"améliorer le diffs"
4789
4790
#: builtin/blame.c:2602
4791
msgid "Spend extra cycles to find better match"
@@ -4794,7 +4824,9 @@ msgstr ""
4824
4825
#: builtin/blame.c:2654
4826
msgid "--progress can't be used with --incremental or porcelain formats"
4797
-msgstr "--progress ne peut pas être utilisé avec --incremental ou les formats porcelaine"
4827
+msgstr ""
4828
+"--progress ne peut pas être utilisé avec --incremental ou les formats "
4829
+"porcelaine"
4830
4831
#. TRANSLATORS: This string is used to tell us the maximum
4832
#. display width for a relative timestamp in "git blame"
@@ -4816,12 +4848,16 @@ msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
4848
4849
#: builtin/blame.c:2805
4850
msgid "--reverse and --first-parent together require specified latest commit"
4819
-msgstr "--reverse et --first-parent ensemble nécessitent la spécification d'un dernier commit"
4851
+msgstr ""
4852
+"--reverse et --first-parent ensemble nécessitent la spécification d'un "
4853
+"dernier commit"
4854
4855
#: builtin/blame.c:2832
4856
msgid ""
4857
"--reverse --first-parent together require range along first-parent chain"
4824
-msgstr "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de premier parent"
4858
+msgstr ""
4859
+"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
4860
+"premier parent"
4861
4862
#: builtin/blame.c:2843
4863
#, c-format
@@ -5298,13 +5334,17 @@ msgstr "Le dépaquetage d'un colis requiert un dépôt."
5334
msgid ""
5335
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5336
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
5301
-msgstr "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p | <type> | --textconv | --filters) [--path=<chemin>] <objet>"
5337
+msgstr ""
5338
+"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
5339
+"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
5340
5341
#: builtin/cat-file.c:514
5342
msgid ""
5343
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5344
"filters]"
5307
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
5345
+msgstr ""
5346
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5347
+"filters]"
5348
5349
#: builtin/cat-file.c:551
5350
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -6077,7 +6117,8 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
6117
msgid "path to git-upload-pack on the remote"
6118
msgstr "chemin vers git-upload-pack sur le serveur distant"
6119
6080
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
6120
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
6121
+#: builtin/pull.c:202
6122
msgid "depth"
6123
msgstr "profondeur"
6124
@@ -6100,7 +6141,8 @@ msgstr "révision"
6141
6142
#: builtin/clone.c:102 builtin/fetch.c:125
6143
msgid "deepen history of shallow clone by excluding rev"
6103
-msgstr "approfondir l'historique d'un clone superficiel en excluant une révision"
6144
+msgstr ""
6145
+"approfondir l'historique d'un clone superficiel en excluant une révision"
6146
6147
#: builtin/clone.c:104
6148
msgid "clone only one branch, HEAD or --branch"
@@ -6286,7 +6328,9 @@ msgstr "Clonage dans '%s'...\n"
6328
msgid ""
6329
"clone --recursive is not compatible with both --reference and --reference-if-"
6330
"able"
6289
-msgstr "clone --recursive n'est pas compatible avec à la fois --reference et --reference-if-able"
6331
+msgstr ""
6332
+"clone --recursive n'est pas compatible avec à la fois --reference et --"
6333
+"reference-if-able"
6334
6335
#: builtin/clone.c:1019
6336
msgid "--depth is ignored in local clones; use file:// instead."
@@ -6295,11 +6339,15 @@ msgstr ""
6339
6340
#: builtin/clone.c:1021
6341
msgid "--shallow-since is ignored in local clones; use file:// instead."
6298
-msgstr "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
6342
+msgstr ""
6343
+"--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
6344
+"\"."
6345
6346
#: builtin/clone.c:1023
6347
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6302
-msgstr "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
6348
+msgstr ""
6349
+"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
6350
+"\"file://\"."
6351
6352
#: builtin/clone.c:1026
6353
msgid "source repository is shallow, ignoring --local"
@@ -6435,7 +6483,8 @@ msgid ""
6483
" git commit --allow-empty\n"
6484
"\n"
6485
msgstr ""
6438
-"Le picorage précédent est à présent vide, vraisemblablement dû à une résolution de conflit.\n"
6486
+"Le picorage précédent est à présent vide, vraisemblablement dû à une "
6487
+"résolution de conflit.\n"
6488
"Si vous souhaitez tout de même le valider, utilisez :\n"
6489
"\n"
6490
" git commit --allow-empty\n"
@@ -6955,7 +7004,7 @@ msgid "Aborting commit; you did not edit the message.\n"
7004
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
7005
7006
#: builtin/commit.c:1754
6958
-#, c-format, fuzzy
7007
+#, fuzzy, c-format
7008
msgid "Aborting commit due to empty commit message.\n"
7009
msgstr "Abandon de la validation dû à un message de validation vide\n"
7010
@@ -10251,7 +10300,8 @@ msgstr "une fusion de notes dans %s est déjà en cours avec %s"
10300
#: builtin/notes.c:863
10301
#, c-format
10302
msgid "failed to store link to current notes ref (%s)"
10254
-msgstr "impossible de stocker le lien vers la référence actuelle aux notes (%s)"
10303
+msgstr ""
10304
+"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
10305
10306
#: builtin/notes.c:865
10307
#, c-format
@@ -12365,7 +12415,9 @@ msgstr ""
12415
#: builtin/show-branch.c:703
12416
msgid ""
12417
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
12368
-msgstr "--reflog est incompatible avec --all, --remotes, --independant et --merge-base"
12418
+msgstr ""
12419
+"--reflog est incompatible avec --all, --remotes, --independant et --merge-"
12420
+"base"
12421
12422
#: builtin/show-branch.c:727
12423
msgid "no branches given, and HEAD is not valid"
@@ -12551,7 +12603,8 @@ msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
12603
#: builtin/submodule--helper.c:563
12604
#, c-format
12605
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
12554
-msgstr "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
12606
+msgstr ""
12607
+"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
12608
12609
#: builtin/submodule--helper.c:570
12610
#, c-format
@@ -13127,7 +13180,9 @@ msgstr "activer le cache de non-suivis sans tester le système de fichier"
13180
msgid ""
13181
"core.untrackedCache is set to true; remove or change it, if you really want "
13182
"to disable the untracked cache"
13130
-msgstr "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver le cache des fichiers non-suivis"
13183
+msgstr ""
13184
+"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
13185
+"souhaitez vraiment désactiver le cache des fichiers non-suivis"
13186
13187
#: builtin/update-index.c:1123
13188
msgid "Untracked cache disabled"
@@ -13137,7 +13192,9 @@ msgstr "Le cache non suivi est désactivé"
13192
msgid ""
13193
"core.untrackedCache is set to false; remove or change it, if you really want "
13194
"to enable the untracked cache"
13140
-msgstr "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous souhaitez vraiment activer le cache des fichiers non-suivis"
13195
+msgstr ""
13196
+"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
13197
+"souhaitez vraiment activer le cache des fichiers non-suivis"
13198
13199
#: builtin/update-index.c:1135
13200
#, c-format
@@ -13987,7 +14044,8 @@ msgstr ""
14044
14045
#: git-stash.sh:251
14046
msgid "Can't use --patch and --include-untracked or --all at the same time"
13990
-msgstr "Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
14047
+msgstr ""
14048
+"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
14049
14050
#: git-stash.sh:259
14051
msgid "No local changes to save"
@@ -14516,9 +14574,12 @@ msgid ""
14574
"before\n"
14575
"you are able to reword the commit."
14576
msgstr ""
14519
-"Impossible de corriger le commit après avoir réussi à picorer $sha1... $rest\n"
14520
-"C'est probablement dû à un message de validation vide ou le crochet pre-commit\n"
14521
-"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre le\n"
14577
+"Impossible de corriger le commit après avoir réussi à picorer $sha1... "
14578
+"$rest\n"
14579
+"C'est probablement dû à un message de validation vide ou le crochet pre-"
14580
+"commit\n"
14581
+"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre "
14582
+"le\n"
14583
"problème avant de pouvoir reformuler le message du commit."
14584
14585
#: git-rebase--interactive.sh:564
@@ -14647,7 +14708,9 @@ msgstr ""
14708
msgid ""
14709
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
14710
"continue'."
14650
-msgstr "Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git rebase --continue'."
14711
+msgstr ""
14712
+"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
14713
+"rebase --continue'."
14714
14715
#: git-rebase--interactive.sh:1045
14716
msgid "Or you can abort the rebase with 'git rebase --abort'."
po/ko.po
+67
-38
@@ -58,8 +58,8 @@ msgid ""
58
msgstr ""
59
"Project-Id-Version: git\n"
60
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
61
-"POT-Creation-Date: 2016-11-01 21:35+0800\n"
62
-"PO-Revision-Date: 2016-11-03 19:47+0900\n"
61
+"POT-Creation-Date: 2016-11-22 22:10+0800\n"
62
+"PO-Revision-Date: 2016-11-22 22:16+0800\n"
63
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
64
"Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
65
"ko>\n"
@@ -332,12 +332,14 @@ msgstr "'%s'에 대한 바이너리 패치 데이터가 없습니다"
332
#: apply.c:3098
333
#, c-format
334
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
335
-msgstr "반대 헝크가 없으면 '%s'에 대한 바이너리 패치를 반대로 적용할 수 없습니다"
335
+msgstr ""
336
+"반대 헝크가 없으면 '%s'에 대한 바이너리 패치를 반대로 적용할 수 없습니다"
337
338
#: apply.c:3144
339
#, c-format
340
msgid "cannot apply binary patch to '%s' without full index line"
340
-msgstr "전체 인덱스 라인이 없으면 '%s'에 대한 바이너리 패치를 적용할 수 없습니다"
341
+msgstr ""
342
+"전체 인덱스 라인이 없으면 '%s'에 대한 바이너리 패치를 적용할 수 없습니다"
343
344
#: apply.c:3154
345
#, c-format
@@ -796,11 +798,11 @@ msgstr "접두어"
798
msgid "prepend prefix to each pathname in the archive"
799
msgstr "아카이브의 각 경로 이름의 앞에 지정한 경로를 붙입니다"
800
799
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 builtin/blame.c:2604
800
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
801
-#: builtin/grep.c:723 builtin/hash-object.c:101 builtin/ls-files.c:539
802
-#: builtin/ls-files.c:542 builtin/notes.c:401 builtin/notes.c:564
803
-#: builtin/read-tree.c:109 parse-options.h:153
801
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
802
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
803
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
804
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
805
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
806
msgid "file"
807
msgstr "파일"
808
@@ -1115,27 +1117,27 @@ msgstr ""
1117
"새 로컬 브랜치를 거기에 해당하는 리모트 브랜치로 push하려면,\n"
1118
"\"git push -u\"로 push하는 업스트림을 설정할 수 있습니다."
1119
1118
-#: branch.c:266
1120
+#: branch.c:265
1121
#, c-format
1122
msgid "Not a valid object name: '%s'."
1123
msgstr "올바른 오브젝트 이름이 아닙니다: '%s'."
1124
1123
-#: branch.c:286
1125
+#: branch.c:285
1126
#, c-format
1127
msgid "Ambiguous object name: '%s'."
1128
msgstr "애매한 오브젝트 이름: '%s'."
1129
1128
-#: branch.c:291
1130
+#: branch.c:290
1131
#, c-format
1132
msgid "Not a valid branch point: '%s'."
1133
msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
1134
1133
-#: branch.c:345
1135
+#: branch.c:344
1136
#, c-format
1137
msgid "'%s' is already checked out at '%s'"
1138
msgstr "'%s'은(는) 이미 '%s' 위치에 받아져 있습니다"
1139
1138
-#: branch.c:364
1140
+#: branch.c:363
1141
#, c-format
1142
msgid "HEAD of working tree %s is not updated"
1143
msgstr "작업 폴더 %s의 헤드가 업데이트되지 않았습니다"
@@ -1492,7 +1494,7 @@ msgstr[0] "%lu년 전"
1494
msgid "failed to read orderfile '%s'"
1495
msgstr "'%s' 순서 파일을 읽는데 실패했습니다"
1496
1495
-#: diffcore-rename.c:540
1497
+#: diffcore-rename.c:536
1498
msgid "Performing inexact rename detection"
1499
msgstr "부정확한 이름 바꾸기 탐색을 수행하는 중"
1500
@@ -1532,7 +1534,8 @@ msgstr "외부 diff 프로그램이 죽음, %s 위치에서 멈춤"
1534
1535
#: diff.c:3412
1536
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1535
-msgstr "\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
1537
+msgstr ""
1538
+"\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
1539
1540
#: diff.c:3502
1541
msgid "--follow requires exactly one pathspec"
@@ -1584,8 +1587,8 @@ msgstr "git fetch-pack: ACK/NAK가 와야 하지만, EOF를 받았습니다"
1587
1588
#: fetch-pack.c:243
1589
#, c-format
1587
-msgid "git fetch_pack: expected ACK/NAK, got '%s'"
1588
-msgstr "git fetch_pack: ACK/NAK가 와야 하지만, '%s'을(를) 받았습니다"
1590
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1591
+msgstr "git fetch-pack: ACK/NAK가 와야 하지만, '%s'을(를) 받았습니다"
1592
1593
#: fetch-pack.c:295
1594
msgid "--stateless-rpc requires multi_ack_detailed"
@@ -2258,7 +2261,9 @@ msgstr "%s: 경로명세 지시어가 이 명령어에서 지원하지 않습니
2261
msgid ""
2262
"empty strings as pathspecs will be made invalid in upcoming releases. please "
2263
"use . instead if you meant to match all paths"
2261
-msgstr "경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니다. 모든 경로를 지정하려면 점(.)을 사용하십시오."
2264
+msgstr ""
2265
+"경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니다. 모"
2266
+"든 경로를 지정하려면 점(.)을 사용하십시오."
2267
2268
#: pathspec.c:440
2269
#, c-format
@@ -3012,7 +3017,7 @@ msgstr "짧은 SHA1 %s은(는) 여럿에 대응됩니다"
3017
msgid "The candidates are:"
3018
msgstr "후보는 다음과 같습니다:"
3019
3015
-#: sha1_name.c:577
3020
+#: sha1_name.c:578
3021
msgid ""
3022
"Git normally never creates a ref that ends with 40 hex characters\n"
3023
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -4388,10 +4393,10 @@ msgid "pass it through git-apply"
4393
msgstr "git-apply에 넘깁니다"
4394
4395
#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
4391
-#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194
4392
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644
4393
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
4394
-#: parse-options.h:134 parse-options.h:245
4396
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
4397
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
4398
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
4399
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
4400
msgid "n"
4401
msgstr "n"
4402
@@ -4646,7 +4651,8 @@ msgstr "n,m줄 (1번 줄부터 시작) 사이의 범위만 처리"
4651
4652
#: builtin/blame.c:2654
4653
msgid "--progress can't be used with --incremental or porcelain formats"
4649
-msgstr "--progress 옵션은 --incremental 옵션이나 포스레인 형식에서 사용할 수 없습니다"
4654
+msgstr ""
4655
+"--progress 옵션은 --incremental 옵션이나 포스레인 형식에서 사용할 수 없습니다"
4656
4657
#. TRANSLATORS: This string is used to tell us the maximum
4658
#. display width for a relative timestamp in "git blame"
@@ -4668,12 +4674,15 @@ msgstr "--contents 옵션을 마지막 오브젝트 이름에 사용할 수 없
4674
4675
#: builtin/blame.c:2805
4676
msgid "--reverse and --first-parent together require specified latest commit"
4671
-msgstr "--reverse 및 --first-parent 옵션을 같이 쓰면 최근 커밋을 지정해야 합니다"
4677
+msgstr ""
4678
+"--reverse 및 --first-parent 옵션을 같이 쓰면 최근 커밋을 지정해야 합니다"
4679
4680
#: builtin/blame.c:2832
4681
msgid ""
4682
"--reverse --first-parent together require range along first-parent chain"
4676
-msgstr "--reverse 및 --first-parent 옵션을 같이 쓰면 최초-상위 체인과 범위가 필요합니다"
4683
+msgstr ""
4684
+"--reverse 및 --first-parent 옵션을 같이 쓰면 최초-상위 체인과 범위가 필요합니"
4685
+"다"
4686
4687
#: builtin/blame.c:2843
4688
#, c-format
@@ -5145,13 +5154,17 @@ msgstr "번들을 해제하려면 저장소가 필요합니다."
5154
msgid ""
5155
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5156
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
5148
-msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <종류> | --textconv | --filters) [--path=<경로>] <오브젝트>"
5157
+msgstr ""
5158
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5159
+"p | <종류> | --textconv | --filters) [--path=<경로>] <오브젝트>"
5160
5161
#: builtin/cat-file.c:514
5162
msgid ""
5163
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5164
"filters]"
5154
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
5165
+msgstr ""
5166
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5167
+"filters]"
5168
5169
#: builtin/cat-file.c:551
5170
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -5902,7 +5915,8 @@ msgstr "리모트의 HEAD 대신 <브랜치>를 가져옵니다"
5915
msgid "path to git-upload-pack on the remote"
5916
msgstr "리모트의 git-upload-pack 경로"
5917
5905
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
5918
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
5919
+#: builtin/pull.c:202
5920
msgid "depth"
5921
msgstr "깊이"
5922
@@ -6108,7 +6122,9 @@ msgstr "'%s'에 복제합니다...\n"
6122
msgid ""
6123
"clone --recursive is not compatible with both --reference and --reference-if-"
6124
"able"
6111
-msgstr "clone --recursive 옵션은 --reference 및 --reference-if-able 옵션을 같이 쓰는 것과 호환되지 않습니다"
6125
+msgstr ""
6126
+"clone --recursive 옵션은 --reference 및 --reference-if-able 옵션을 같이 쓰는 "
6127
+"것과 호환되지 않습니다"
6128
6129
#: builtin/clone.c:1019
6130
msgid "--depth is ignored in local clones; use file:// instead."
@@ -6117,11 +6133,15 @@ msgstr ""
6133
6134
#: builtin/clone.c:1021
6135
msgid "--shallow-since is ignored in local clones; use file:// instead."
6120
-msgstr "--shallow-since 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십시오."
6136
+msgstr ""
6137
+"--shallow-since 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십"
6138
+"시오."
6139
6140
#: builtin/clone.c:1023
6141
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6124
-msgstr "--shallow-exclude 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십시오."
6142
+msgstr ""
6143
+"--shallow-exclude 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하"
6144
+"십시오."
6145
6146
#: builtin/clone.c:1026
6147
msgid "source repository is shallow, ignoring --local"
@@ -12038,7 +12058,9 @@ msgstr "기준부터 시작해 최대 <n>개의 최근 ref-log 항목을 표시
12058
#: builtin/show-branch.c:703
12059
msgid ""
12060
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
12041
-msgstr "--reflog 옵션은 --all, --remotes, --independent, --merge-base 옵션과 호환되지 않습니다"
12061
+msgstr ""
12062
+"--reflog 옵션은 --all, --remotes, --independent, --merge-base 옵션과 호환되"
12063
+"지 않습니다"
12064
12065
#: builtin/show-branch.c:727
12066
msgid "no branches given, and HEAD is not valid"
@@ -12769,7 +12791,9 @@ msgstr "파일 시스템 시험 없이 추적하지 않는 캐시를 사용합
12791
msgid ""
12792
"core.untrackedCache is set to true; remove or change it, if you really want "
12793
"to disable the untracked cache"
12772
-msgstr "core.untrackedCache값이 참입니다. 정말로 추적하지 않는 파일 캐시를 사용하지 않으려면 이 값을 제거하거나 바꾸십시오."
12794
+msgstr ""
12795
+"core.untrackedCache값이 참입니다. 정말로 추적하지 않는 파일 캐시를 사용하지 "
12796
+"않으려면 이 값을 제거하거나 바꾸십시오."
12797
12798
#: builtin/update-index.c:1123
12799
msgid "Untracked cache disabled"
@@ -12779,7 +12803,9 @@ msgstr "추적되지 않는 파일 캐시를 사용하지 않습니다"
12803
msgid ""
12804
"core.untrackedCache is set to false; remove or change it, if you really want "
12805
"to enable the untracked cache"
12782
-msgstr "core.untrackedCache값이 거짓입니다. 정말로 추적하지 않는 파일 캐시를 사용하려면 이 값을 제거하거나 바꾸십시오."
12806
+msgstr ""
12807
+"core.untrackedCache값이 거짓입니다. 정말로 추적하지 않는 파일 캐시를 사용하려"
12808
+"면 이 값을 제거하거나 바꾸십시오."
12809
12810
#: builtin/update-index.c:1135
12811
#, c-format
@@ -13603,7 +13629,8 @@ msgstr ""
13629
13630
#: git-stash.sh:251
13631
msgid "Can't use --patch and --include-untracked or --all at the same time"
13606
-msgstr "--patch 옵션과 --include-untracked 또는 --all 옵션을 동시에 쓸 수 없습니다"
13632
+msgstr ""
13633
+"--patch 옵션과 --include-untracked 또는 --all 옵션을 동시에 쓸 수 없습니다"
13634
13635
#: git-stash.sh:259
13636
msgid "No local changes to save"
@@ -14241,7 +14268,9 @@ msgstr ""
14268
msgid ""
14269
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
14270
"continue'."
14244
-msgstr "'git rebase --edit-todo' 명령으로 바로잡을 수 있고 'git rebase --continue' 명령을 실행합니다."
14271
+msgstr ""
14272
+"'git rebase --edit-todo' 명령으로 바로잡을 수 있고 'git rebase --continue' 명"
14273
+"령을 실행합니다."
14274
14275
#: git-rebase--interactive.sh:1045
14276
msgid "Or you can abort the rebase with 'git rebase --abort'."
po/pt_PT.po
+34
-36
@@ -9,7 +9,7 @@ msgid ""
9
msgstr ""
10
"Project-Id-Version: Git\n"
11
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
12
-"POT-Creation-Date: 2016-11-01 21:35+0800\n"
12
+"POT-Creation-Date: 2016-11-22 22:10+0800\n"
13
"PO-Revision-Date: 2016-11-13 16:37+0000\n"
14
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
15
"Language-Team: Portuguese\n"
@@ -767,11 +767,11 @@ msgstr "prefixo"
767
msgid "prepend prefix to each pathname in the archive"
768
msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
769
770
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 builtin/blame.c:2604
771
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
772
-#: builtin/grep.c:723 builtin/hash-object.c:101 builtin/ls-files.c:539
773
-#: builtin/ls-files.c:542 builtin/notes.c:401 builtin/notes.c:564
774
-#: builtin/read-tree.c:109 parse-options.h:153
770
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
771
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
772
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
773
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
774
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
775
msgid "file"
776
msgstr "ficheiro"
777
@@ -1086,27 +1086,27 @@ msgstr ""
1086
"o seu homólogo remoto, pode usar \"git push -u\" para configurar\n"
1087
"o respetivo ramo a montante, ao mesmo tempo que publica."
1088
1089
-#: branch.c:266
1089
+#: branch.c:265
1090
#, c-format
1091
msgid "Not a valid object name: '%s'."
1092
msgstr "Nome de objeto inválido: '%s'."
1093
1094
-#: branch.c:286
1094
+#: branch.c:285
1095
#, c-format
1096
msgid "Ambiguous object name: '%s'."
1097
msgstr "Nome de objeto ambíguo: '%s'."
1098
1099
-#: branch.c:291
1099
+#: branch.c:290
1100
#, c-format
1101
msgid "Not a valid branch point: '%s'."
1102
msgstr "Ponto no ramo inválido: '%s'."
1103
1104
-#: branch.c:345
1104
+#: branch.c:344
1105
#, c-format
1106
msgid "'%s' is already checked out at '%s'"
1107
msgstr "'%s' foi já extraído em '%s'"
1108
1109
-#: branch.c:364
1109
+#: branch.c:363
1110
#, c-format
1111
msgid "HEAD of working tree %s is not updated"
1112
msgstr "HEAD da árvore de trabalho %s não está atualizada"
@@ -1386,8 +1386,7 @@ msgid ""
1386
"The file will have its original line endings in your working directory."
1387
msgstr ""
1388
"CRLF será substituído por LF em %s.\n"
1389
-"O final de linha original será mantido no ficheiro da sua árvore de "
1390
-"trabalho."
1389
+"O final de linha original será mantido no ficheiro da sua árvore de trabalho."
1390
1391
#: convert.c:205
1392
#, c-format
@@ -1401,8 +1400,7 @@ msgid ""
1400
"The file will have its original line endings in your working directory."
1401
msgstr ""
1402
"LF será substituído por CRLF em %s.\n"
1404
-"O final de linha original será mantido no ficheiro da sua árvore de "
1405
-"trabalho."
1403
+"O final de linha original será mantido no ficheiro da sua árvore de trabalho."
1404
1405
#: convert.c:215
1406
#, c-format
@@ -1482,7 +1480,7 @@ msgstr[1] "há %lu anos"
1480
msgid "failed to read orderfile '%s'"
1481
msgstr "falha ao ler o ficheiro de comando '%s'"
1482
1485
-#: diffcore-rename.c:540
1483
+#: diffcore-rename.c:536
1484
msgid "Performing inexact rename detection"
1485
msgstr "Deteção de mudança de nome inexata em curso"
1486
@@ -1579,7 +1577,7 @@ msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF"
1577
1578
#: fetch-pack.c:243
1579
#, c-format
1582
-msgid "git fetch_pack: expected ACK/NAK, got '%s'"
1580
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1581
msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
1582
1583
#: fetch-pack.c:295
@@ -1587,12 +1585,12 @@ msgid "--stateless-rpc requires multi_ack_detailed"
1585
msgstr "--stateless-rpc requer multi_ack_detailed"
1586
1587
#: fetch-pack.c:381
1590
-#, c-format, fuzzy
1588
+#, fuzzy, c-format
1589
msgid "invalid shallow line: %s"
1590
msgstr "linha rasa inválida: %s"
1591
1592
#: fetch-pack.c:387
1595
-#, c-format, fuzzy
1593
+#, fuzzy, c-format
1594
msgid "invalid unshallow line: %s"
1595
msgstr "linha para aprofundar inválida: %s"
1596
@@ -1607,12 +1605,12 @@ msgid "error in object: %s"
1605
msgstr "erro no objeto: %s"
1606
1607
#: fetch-pack.c:394
1610
-#, c-format, fuzzy
1608
+#, fuzzy, c-format
1609
msgid "no shallow found: %s"
1610
msgstr "raso não encontrado: %s"
1611
1612
#: fetch-pack.c:397
1615
-#, c-format, fuzzy
1613
+#, fuzzy, c-format
1614
msgid "expected shallow/unshallow, got %s"
1615
msgstr "esperava-se raso/aprofundar, obteve-se %s"
1616
@@ -2136,9 +2134,8 @@ msgid ""
2134
"commit/abort the previous merge before you start a new notes merge."
2135
msgstr ""
2136
"Não concluíu a integração de notas anterior (%s existe).\n"
2139
-"Use 'git notes merge --commit' ou 'git notes merge --abort' para "
2140
-"submeter/abortar a integração anterior antes de começar uma nova integração "
2141
-"de notas."
2137
+"Use 'git notes merge --commit' ou 'git notes merge --abort' para submeter/"
2138
+"abortar a integração anterior antes de começar uma nova integração de notas."
2139
2140
#: notes-merge.c:280
2141
#, c-format
@@ -3037,7 +3034,7 @@ msgstr "SHA1 curto %s é ambíguo"
3034
msgid "The candidates are:"
3035
msgstr "Os candidatos são:"
3036
3040
-#: sha1_name.c:577
3037
+#: sha1_name.c:578
3038
msgid ""
3039
"Git normally never creates a ref that ends with 40 hex characters\n"
3040
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -4462,10 +4459,10 @@ msgid "pass it through git-apply"
4459
msgstr "transmitir ao git-apply"
4460
4461
#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
4465
-#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194
4466
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644
4467
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
4468
-#: parse-options.h:134 parse-options.h:245
4462
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
4463
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
4464
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
4465
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
4466
msgid "n"
4467
msgstr "n"
4468
@@ -5230,16 +5227,16 @@ msgid ""
5227
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5228
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
5229
msgstr ""
5233
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
5234
-"-p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
5230
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5231
+"p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
5232
5233
#: builtin/cat-file.c:514
5234
msgid ""
5235
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5236
"filters]"
5237
msgstr ""
5241
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
5242
-"--filters]"
5238
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5239
+"filters]"
5240
5241
#: builtin/cat-file.c:551
5242
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -6005,7 +6002,8 @@ msgstr "extrair <ramo> em vez da HEAD do remoto"
6002
msgid "path to git-upload-pack on the remote"
6003
msgstr "caminho para git-upload-pack no remoto"
6004
6008
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
6005
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
6006
+#: builtin/pull.c:202
6007
msgid "depth"
6008
msgstr "profundidade"
6009
@@ -14490,8 +14488,8 @@ msgid ""
14488
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
14489
"continue'."
14490
msgstr ""
14493
-"Pode corrí-lo com 'git rebase --edit-todo' e depois executar 'git rebase "
14494
-"--continue'."
14491
+"Pode corrí-lo com 'git rebase --edit-todo' e depois executar 'git rebase --"
14492
+"continue'."
14493
14494
#: git-rebase--interactive.sh:1045
14495
msgid "Or you can abort the rebase with 'git rebase --abort'."
po/sv.po
+11
-11
@@ -7,8 +7,8 @@ msgid ""
7
msgstr ""
8
"Project-Id-Version: git 2.11.0\n"
9
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10
-"POT-Creation-Date: 2016-11-01 21:35+0800\n"
11
-"PO-Revision-Date: 2016-11-05 16:01+0100\n"
10
+"POT-Creation-Date: 2016-11-22 22:10+0800\n"
11
+"PO-Revision-Date: 2016-11-22 22:16+0800\n"
12
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
13
"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
14
"Language: sv\n"
@@ -1087,27 +1087,27 @@ msgstr ""
1087
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
1088
"för att ställa in uppströmskonfigurationen när du sänder in."
1089
1090
-#: branch.c:266
1090
+#: branch.c:265
1091
#, c-format
1092
msgid "Not a valid object name: '%s'."
1093
msgstr "Objektnamnet är inte giltigt: \"%s\"."
1094
1095
-#: branch.c:286
1095
+#: branch.c:285
1096
#, c-format
1097
msgid "Ambiguous object name: '%s'."
1098
msgstr "Objektnamnet är tvetydigt: \"%s\"."
1099
1100
-#: branch.c:291
1100
+#: branch.c:290
1101
#, c-format
1102
msgid "Not a valid branch point: '%s'."
1103
msgstr "Avgreningspunkten är inte giltig: \"%s\""
1104
1105
-#: branch.c:345
1105
+#: branch.c:344
1106
#, c-format
1107
msgid "'%s' is already checked out at '%s'"
1108
msgstr "\"%s\" är redan utcheckad på \"%s\""
1109
1110
-#: branch.c:364
1110
+#: branch.c:363
1111
#, c-format
1112
msgid "HEAD of working tree %s is not updated"
1113
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
@@ -1484,7 +1484,7 @@ msgstr[1] "%lu år sedan"
1484
msgid "failed to read orderfile '%s'"
1485
msgstr "kunde inte läsa orderfilen \"%s\""
1486
1487
-#: diffcore-rename.c:540
1487
+#: diffcore-rename.c:536
1488
msgid "Performing inexact rename detection"
1489
msgstr "Utför onöjaktig namnbytesdetektering"
1490
@@ -1578,8 +1578,8 @@ msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
1578
1579
#: fetch-pack.c:243
1580
#, c-format
1581
-msgid "git fetch_pack: expected ACK/NAK, got '%s'"
1582
-msgstr "git fetch_pack: förväntade ACK/NAK, fick \"%s\""
1581
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1582
+msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
1583
1584
#: fetch-pack.c:295
1585
msgid "--stateless-rpc requires multi_ack_detailed"
@@ -3021,7 +3021,7 @@ msgstr "kort SHA1 %s är tvetydig"
3021
msgid "The candidates are:"
3022
msgstr "Kandidaterna är:"
3023
3024
-#: sha1_name.c:577
3024
+#: sha1_name.c:578
3025
msgid ""
3026
"Git normally never creates a ref that ends with 40 hex characters\n"
3027
"because it will be ignored when you just specify 40-hex. These refs\n"
po/vi.po
+22
-21
@@ -8,8 +8,8 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: git v2.11.0\n"
10
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11
-"POT-Creation-Date: 2016-11-01 21:35+0800\n"
12
-"PO-Revision-Date: 2016-11-04 08:07+0700\n"
11
+"POT-Creation-Date: 2016-11-22 22:10+0800\n"
12
+"PO-Revision-Date: 2016-11-22 22:17+0800\n"
13
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
14
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
15
"Language: vi\n"
@@ -768,11 +768,11 @@ msgstr "tiền_tố"
768
msgid "prepend prefix to each pathname in the archive"
769
msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu"
770
771
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 builtin/blame.c:2604
772
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
773
-#: builtin/grep.c:723 builtin/hash-object.c:101 builtin/ls-files.c:539
774
-#: builtin/ls-files.c:542 builtin/notes.c:401 builtin/notes.c:564
775
-#: builtin/read-tree.c:109 parse-options.h:153
771
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
772
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
773
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
774
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
775
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
776
msgid "file"
777
msgstr "tập_tin"
778
@@ -1087,27 +1087,27 @@ msgstr ""
1087
"sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n"
1088
"\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push."
1089
1090
-#: branch.c:266
1090
+#: branch.c:265
1091
#, c-format
1092
msgid "Not a valid object name: '%s'."
1093
msgstr "Không phải tên đối tượng hợp lệ: “%s”."
1094
1095
-#: branch.c:286
1095
+#: branch.c:285
1096
#, c-format
1097
msgid "Ambiguous object name: '%s'."
1098
msgstr "Tên đối tượng chưa rõ ràng: “%s”."
1099
1100
-#: branch.c:291
1100
+#: branch.c:290
1101
#, c-format
1102
msgid "Not a valid branch point: '%s'."
1103
msgstr "Nhánh không hợp lệ: “%s”."
1104
1105
-#: branch.c:345
1105
+#: branch.c:344
1106
#, c-format
1107
msgid "'%s' is already checked out at '%s'"
1108
msgstr "“%s” đã được lấy ra tại “%s” rồi"
1109
1110
-#: branch.c:364
1110
+#: branch.c:363
1111
#, c-format
1112
msgid "HEAD of working tree %s is not updated"
1113
msgstr "HEAD của cây làm việc %s chưa được cập nhật"
@@ -1466,7 +1466,7 @@ msgstr[0] "%lu năm trước"
1466
msgid "failed to read orderfile '%s'"
1467
msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”"
1468
1469
-#: diffcore-rename.c:540
1469
+#: diffcore-rename.c:536
1470
msgid "Performing inexact rename detection"
1471
msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
1472
@@ -1562,8 +1562,8 @@ msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF"
1562
1563
#: fetch-pack.c:243
1564
#, c-format
1565
-msgid "git fetch_pack: expected ACK/NAK, got '%s'"
1566
-msgstr "git fetch_pack: cần ACK/NAK, nhưng lại nhận được “%s”"
1565
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1566
+msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”"
1567
1568
#: fetch-pack.c:295
1569
msgid "--stateless-rpc requires multi_ack_detailed"
@@ -3007,7 +3007,7 @@ msgstr "tóm lược SHA1 %s chưa rõ ràng"
3007
msgid "The candidates are:"
3008
msgstr "Các ứng cử là:"
3009
3010
-#: sha1_name.c:577
3010
+#: sha1_name.c:578
3011
msgid ""
3012
"Git normally never creates a ref that ends with 40 hex characters\n"
3013
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -4440,10 +4440,10 @@ msgid "pass it through git-apply"
4440
msgstr "chuyển nó qua git-apply"
4441
4442
#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
4443
-#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194
4444
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644
4445
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
4446
-#: parse-options.h:134 parse-options.h:245
4443
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
4444
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
4445
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
4446
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
4447
msgid "n"
4448
msgstr "n"
4449
@@ -5968,7 +5968,8 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
5968
msgid "path to git-upload-pack on the remote"
5969
msgstr "đường dẫn đến git-upload-pack trên máy chủ"
5970
5971
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
5971
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
5972
+#: builtin/pull.c:202
5973
msgid "depth"
5974
msgstr "độ-sâu"
5975
po/zh_CN.po
+24
-16
@@ -135,8 +135,8 @@ msgid ""
135
msgstr ""
136
"Project-Id-Version: Git\n"
137
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
138
-"POT-Creation-Date: 2016-11-01 21:35+0800\n"
139
-"PO-Revision-Date: 2016-11-21 23:14+0800\n"
138
+"POT-Creation-Date: 2016-11-22 22:10+0800\n"
139
+"PO-Revision-Date: 2016-11-22 22:15+0800\n"
140
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
141
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
142
"Language: zh_CN\n"
@@ -1183,27 +1183,27 @@ msgstr ""
1183
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
1184
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1185
1186
-#: branch.c:266
1186
+#: branch.c:265
1187
#, c-format
1188
msgid "Not a valid object name: '%s'."
1189
msgstr "不是一个有效的对象名：'%s'。"
1190
1191
-#: branch.c:286
1191
+#: branch.c:285
1192
#, c-format
1193
msgid "Ambiguous object name: '%s'."
1194
msgstr "歧义的对象名：'%s'。"
1195
1196
-#: branch.c:291
1196
+#: branch.c:290
1197
#, c-format
1198
msgid "Not a valid branch point: '%s'."
1199
msgstr "无效的分支点：'%s'。"
1200
1201
-#: branch.c:345
1201
+#: branch.c:344
1202
#, c-format
1203
msgid "'%s' is already checked out at '%s'"
1204
msgstr "'%s' 已经检出到 '%s'"
1205
1206
-#: branch.c:364
1206
+#: branch.c:363
1207
#, c-format
1208
msgid "HEAD of working tree %s is not updated"
1209
msgstr "工作区 %s 的 HEAD 指向没有被更新"
@@ -1570,7 +1570,7 @@ msgstr[1] "%lu 年前"
1570
msgid "failed to read orderfile '%s'"
1571
msgstr "无法读取排序文件 '%s'"
1572
1573
-#: diffcore-rename.c:540
1573
+#: diffcore-rename.c:536
1574
msgid "Performing inexact rename detection"
1575
msgstr "正在进行非精确的重命名检测"
1576
@@ -1664,7 +1664,7 @@ msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
1664
1665
#: fetch-pack.c:243
1666
#, c-format
1667
-msgid "git fetch_pack: expected ACK/NAK, got '%s'"
1667
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1668
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
1669
1670
#: fetch-pack.c:295
@@ -2216,8 +2216,8 @@ msgid ""
2216
"commit/abort the previous merge before you start a new notes merge."
2217
msgstr ""
2218
"您尚未结束您前一次注释合并（存在 %s）。\n"
2219
-"请您在开始一个新的注释合并之前，使用 'git notes merge --commit' 或者 "
2220
-"'git notes merge --abort' 来提交/终止前一次合并。"
2219
+"请您在开始一个新的注释合并之前，使用 'git notes merge --commit' 或者 'git "
2220
+"notes merge --abort' 来提交/终止前一次合并。"
2221
2222
#: notes-merge.c:280
2223
#, c-format
@@ -3094,7 +3094,7 @@ msgstr "歧义的短 SHA1 %s"
3094
msgid "The candidates are:"
3095
msgstr "候选者有："
3096
3097
-#: sha1_name.c:577
3097
+#: sha1_name.c:578
3098
msgid ""
3099
"Git normally never creates a ref that ends with 40 hex characters\n"
3100
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5237,13 +5237,17 @@ msgstr "需要一个仓库来解包。"
5237
msgid ""
5238
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5239
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
5240
-msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
5240
+msgstr ""
5241
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5242
+"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
5243
5244
#: builtin/cat-file.c:514
5245
msgid ""
5246
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5247
"filters]"
5246
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
5248
+msgstr ""
5249
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5250
+"filters]"
5251
5252
#: builtin/cat-file.c:551
5253
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -12813,7 +12817,9 @@ msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
12817
msgid ""
12818
"core.untrackedCache is set to true; remove or change it, if you really want "
12819
"to disable the untracked cache"
12816
-msgstr "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修改它。"
12820
+msgstr ""
12821
+"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
12822
+"改它。"
12823
12824
#: builtin/update-index.c:1123
12825
msgid "Untracked cache disabled"
@@ -12823,7 +12829,9 @@ msgstr "缓存未跟踪文件被禁用"
12829
msgid ""
12830
"core.untrackedCache is set to false; remove or change it, if you really want "
12831
"to enable the untracked cache"
12826
-msgstr "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或修改它。"
12832
+msgstr ""
12833
+"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
12834
+"修改它。"
12835
12836
#: builtin/update-index.c:1135
12837
#, c-format