@matheusbsbs / matheus-bagliano / commits / 72351d7d4f

l10n: fix unmatched single quote in error message

Translate one message introduced by commit: * 358718064b i18n: fix unmatched single quote in error message Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Nov 20, 2016 at 20:26 UTC 72351d7d4ff198068e761f2298251942c2f11253
7 files changed +82 -82
po/fr.po
+3 -3
@@ -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-22 22:10+0800\n"
77 -"PO-Revision-Date: 2016-11-22 22:16+0800\n"
76 +"POT-Creation-Date: 2016-11-25 22:50+0800\n"
77 +"PO-Revision-Date: 2016-11-25 22:55+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"
@@ -2763,7 +2763,7 @@ msgstr "impossible d'écrire dans '%s'"
2763
2764 #: sequencer.c:251
2765 #, c-format
2766 -msgid "could not write eol to '%s"
2766 +msgid "could not write eol to '%s'"
2767 msgstr "impossible d'écrire la fin de ligne dans '%s'"
2768
2769 #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
po/git.pot
+64 -64
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2016-11-22 22:10+0800\n"
11 +"POT-Creation-Date: 2016-11-25 22:50+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -726,11 +726,11 @@ msgstr ""
726 msgid "prepend prefix to each pathname in the archive"
727 msgstr ""
728
729 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
730 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
731 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
732 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
733 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
729 +#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
730 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
731 +#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
732 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
733 +#: parse-options.h:153
734 msgid "file"
735 msgstr ""
736
@@ -2494,7 +2494,7 @@ msgstr ""
2494
2495 #: sequencer.c:251
2496 #, c-format
2497 -msgid "could not write eol to '%s"
2497 +msgid "could not write eol to '%s'"
2498 msgstr ""
2499
2500 #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
@@ -13269,12 +13269,12 @@ msgstr ""
13269 msgid "See git-${cmd}(1) for details."
13270 msgstr ""
13271
13272 -#: git-rebase--interactive.sh:131
13272 +#: git-rebase--interactive.sh:140
13273 #, sh-format
13274 msgid "Rebasing ($new_count/$total)"
13275 msgstr ""
13276
13277 -#: git-rebase--interactive.sh:147
13277 +#: git-rebase--interactive.sh:156
13278 msgid ""
13279 "\n"
13280 "Commands:\n"
@@ -13289,19 +13289,19 @@ msgid ""
13289 "These lines can be re-ordered; they are executed from top to bottom.\n"
13290 msgstr ""
13291
13292 -#: git-rebase--interactive.sh:162
13292 +#: git-rebase--interactive.sh:171
13293 msgid ""
13294 "\n"
13295 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
13296 msgstr ""
13297
13298 -#: git-rebase--interactive.sh:166
13298 +#: git-rebase--interactive.sh:175
13299 msgid ""
13300 "\n"
13301 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
13302 msgstr ""
13303
13304 -#: git-rebase--interactive.sh:202
13304 +#: git-rebase--interactive.sh:211
13305 #, sh-format
13306 msgid ""
13307 "You can amend the commit now, with\n"
@@ -13313,87 +13313,87 @@ msgid ""
13313 "\tgit rebase --continue"
13314 msgstr ""
13315
13316 -#: git-rebase--interactive.sh:227
13316 +#: git-rebase--interactive.sh:236
13317 #, sh-format
13318 msgid "$sha1: not a commit that can be picked"
13319 msgstr ""
13320
13321 -#: git-rebase--interactive.sh:266
13321 +#: git-rebase--interactive.sh:275
13322 #, sh-format
13323 msgid "Invalid commit name: $sha1"
13324 msgstr ""
13325
13326 -#: git-rebase--interactive.sh:308
13326 +#: git-rebase--interactive.sh:317
13327 msgid "Cannot write current commit's replacement sha1"
13328 msgstr ""
13329
13330 -#: git-rebase--interactive.sh:360
13330 +#: git-rebase--interactive.sh:369
13331 #, sh-format
13332 msgid "Fast-forward to $sha1"
13333 msgstr ""
13334
13335 -#: git-rebase--interactive.sh:362
13335 +#: git-rebase--interactive.sh:371
13336 #, sh-format
13337 msgid "Cannot fast-forward to $sha1"
13338 msgstr ""
13339
13340 -#: git-rebase--interactive.sh:371
13340 +#: git-rebase--interactive.sh:380
13341 #, sh-format
13342 msgid "Cannot move HEAD to $first_parent"
13343 msgstr ""
13344
13345 -#: git-rebase--interactive.sh:376
13345 +#: git-rebase--interactive.sh:385
13346 #, sh-format
13347 msgid "Refusing to squash a merge: $sha1"
13348 msgstr ""
13349
13350 -#: git-rebase--interactive.sh:390
13350 +#: git-rebase--interactive.sh:399
13351 #, sh-format
13352 msgid "Error redoing merge $sha1"
13353 msgstr ""
13354
13355 -#: git-rebase--interactive.sh:398
13355 +#: git-rebase--interactive.sh:407
13356 #, sh-format
13357 msgid "Could not pick $sha1"
13358 msgstr ""
13359
13360 -#: git-rebase--interactive.sh:407
13360 +#: git-rebase--interactive.sh:416
13361 #, sh-format
13362 msgid "This is the commit message #${n}:"
13363 msgstr ""
13364
13365 -#: git-rebase--interactive.sh:412
13365 +#: git-rebase--interactive.sh:421
13366 #, sh-format
13367 msgid "The commit message #${n} will be skipped:"
13368 msgstr ""
13369
13370 -#: git-rebase--interactive.sh:423
13370 +#: git-rebase--interactive.sh:432
13371 #, sh-format
13372 msgid "This is a combination of $count commit."
13373 msgid_plural "This is a combination of $count commits."
13374 msgstr[0] ""
13375 msgstr[1] ""
13376
13377 -#: git-rebase--interactive.sh:431
13377 +#: git-rebase--interactive.sh:440
13378 #, sh-format
13379 msgid "Cannot write $fixup_msg"
13380 msgstr ""
13381
13382 -#: git-rebase--interactive.sh:434
13382 +#: git-rebase--interactive.sh:443
13383 msgid "This is a combination of 2 commits."
13384 msgstr ""
13385
13386 -#: git-rebase--interactive.sh:435
13386 +#: git-rebase--interactive.sh:444
13387 msgid "This is the 1st commit message:"
13388 msgstr ""
13389
13390 -#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
13391 -#: git-rebase--interactive.sh:521
13390 +#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
13391 +#: git-rebase--interactive.sh:530
13392 #, sh-format
13393 msgid "Could not apply $sha1... $rest"
13394 msgstr ""
13395
13396 -#: git-rebase--interactive.sh:549
13396 +#: git-rebase--interactive.sh:558
13397 #, sh-format
13398 msgid ""
13399 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -13403,31 +13403,31 @@ msgid ""
13403 "you are able to reword the commit."
13404 msgstr ""
13405
13406 -#: git-rebase--interactive.sh:564
13406 +#: git-rebase--interactive.sh:573
13407 #, sh-format
13408 msgid "Stopped at $sha1_abbrev... $rest"
13409 msgstr ""
13410
13411 -#: git-rebase--interactive.sh:579
13411 +#: git-rebase--interactive.sh:588
13412 #, sh-format
13413 msgid "Cannot '$squash_style' without a previous commit"
13414 msgstr ""
13415
13416 -#: git-rebase--interactive.sh:621
13416 +#: git-rebase--interactive.sh:630
13417 #, sh-format
13418 msgid "Executing: $rest"
13419 msgstr ""
13420
13421 -#: git-rebase--interactive.sh:629
13421 +#: git-rebase--interactive.sh:638
13422 #, sh-format
13423 msgid "Execution failed: $rest"
13424 msgstr ""
13425
13426 -#: git-rebase--interactive.sh:631
13426 +#: git-rebase--interactive.sh:640
13427 msgid "and made changes to the index and/or the working tree"
13428 msgstr ""
13429
13430 -#: git-rebase--interactive.sh:633
13430 +#: git-rebase--interactive.sh:642
13431 msgid ""
13432 "You can fix the problem, and then run\n"
13433 "\n"
@@ -13435,7 +13435,7 @@ msgid ""
13435 msgstr ""
13436
13437 #. TRANSLATORS: after these lines is a command to be issued by the user
13438 -#: git-rebase--interactive.sh:646
13438 +#: git-rebase--interactive.sh:655
13439 #, sh-format
13440 msgid ""
13441 "Execution succeeded: $rest\n"
@@ -13445,49 +13445,49 @@ msgid ""
13445 "\tgit rebase --continue"
13446 msgstr ""
13447
13448 -#: git-rebase--interactive.sh:657
13448 +#: git-rebase--interactive.sh:666
13449 #, sh-format
13450 msgid "Unknown command: $command $sha1 $rest"
13451 msgstr ""
13452
13453 -#: git-rebase--interactive.sh:658
13453 +#: git-rebase--interactive.sh:667
13454 msgid "Please fix this using 'git rebase --edit-todo'."
13455 msgstr ""
13456
13457 -#: git-rebase--interactive.sh:693
13457 +#: git-rebase--interactive.sh:702
13458 #, sh-format
13459 msgid "Successfully rebased and updated $head_name."
13460 msgstr ""
13461
13462 -#: git-rebase--interactive.sh:740
13462 +#: git-rebase--interactive.sh:749
13463 msgid "Could not skip unnecessary pick commands"
13464 msgstr ""
13465
13466 -#: git-rebase--interactive.sh:898
13466 +#: git-rebase--interactive.sh:907
13467 #, sh-format
13468 msgid ""
13469 "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
13470 " - $line"
13471 msgstr ""
13472
13473 -#: git-rebase--interactive.sh:931
13473 +#: git-rebase--interactive.sh:940
13474 #, sh-format
13475 msgid ""
13476 "Warning: the command isn't recognized in the following line:\n"
13477 " - $line"
13478 msgstr ""
13479
13480 -#: git-rebase--interactive.sh:970
13480 +#: git-rebase--interactive.sh:979
13481 msgid "could not detach HEAD"
13482 msgstr ""
13483
13484 -#: git-rebase--interactive.sh:1008
13484 +#: git-rebase--interactive.sh:1017
13485 msgid ""
13486 "Warning: some commits may have been dropped accidentally.\n"
13487 "Dropped commits (newer to older):"
13488 msgstr ""
13489
13490 -#: git-rebase--interactive.sh:1016
13490 +#: git-rebase--interactive.sh:1025
13491 msgid ""
13492 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
13493 "\n"
@@ -13496,28 +13496,28 @@ msgid ""
13496 "The possible behaviours are: ignore, warn, error."
13497 msgstr ""
13498
13499 -#: git-rebase--interactive.sh:1027
13499 +#: git-rebase--interactive.sh:1036
13500 #, sh-format
13501 msgid ""
13502 "Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
13503 "Ignoring."
13504 msgstr ""
13505
13506 -#: git-rebase--interactive.sh:1044
13506 +#: git-rebase--interactive.sh:1053
13507 msgid ""
13508 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
13509 "continue'."
13510 msgstr ""
13511
13512 -#: git-rebase--interactive.sh:1045
13512 +#: git-rebase--interactive.sh:1054
13513 msgid "Or you can abort the rebase with 'git rebase --abort'."
13514 msgstr ""
13515
13516 -#: git-rebase--interactive.sh:1069
13516 +#: git-rebase--interactive.sh:1078
13517 msgid "Could not remove CHERRY_PICK_HEAD"
13518 msgstr ""
13519
13520 -#: git-rebase--interactive.sh:1074
13520 +#: git-rebase--interactive.sh:1083
13521 #, sh-format
13522 msgid ""
13523 "You have staged changes in your working tree.\n"
@@ -13535,21 +13535,21 @@ msgid ""
13535 " git rebase --continue\n"
13536 msgstr ""
13537
13538 -#: git-rebase--interactive.sh:1091
13538 +#: git-rebase--interactive.sh:1100
13539 msgid "Error trying to find the author identity to amend commit"
13540 msgstr ""
13541
13542 -#: git-rebase--interactive.sh:1096
13542 +#: git-rebase--interactive.sh:1105
13543 msgid ""
13544 "You have uncommitted changes in your working tree. Please commit them\n"
13545 "first and then run 'git rebase --continue' again."
13546 msgstr ""
13547
13548 -#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
13548 +#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114
13549 msgid "Could not commit staged changes."
13550 msgstr ""
13551
13552 -#: git-rebase--interactive.sh:1129
13552 +#: git-rebase--interactive.sh:1138
13553 msgid ""
13554 "\n"
13555 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -13558,47 +13558,47 @@ msgid ""
13558 "\n"
13559 msgstr ""
13560
13561 -#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
13561 +#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304
13562 msgid "Could not execute editor"
13563 msgstr ""
13564
13565 -#: git-rebase--interactive.sh:1150
13565 +#: git-rebase--interactive.sh:1159
13566 #, sh-format
13567 msgid "Could not checkout $switch_to"
13568 msgstr ""
13569
13570 -#: git-rebase--interactive.sh:1155
13570 +#: git-rebase--interactive.sh:1164
13571 msgid "No HEAD?"
13572 msgstr ""
13573
13574 -#: git-rebase--interactive.sh:1156
13574 +#: git-rebase--interactive.sh:1165
13575 #, sh-format
13576 msgid "Could not create temporary $state_dir"
13577 msgstr ""
13578
13579 -#: git-rebase--interactive.sh:1158
13579 +#: git-rebase--interactive.sh:1167
13580 msgid "Could not mark as interactive"
13581 msgstr ""
13582
13583 -#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
13583 +#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
13584 msgid "Could not init rewritten commits"
13585 msgstr ""
13586
13587 -#: git-rebase--interactive.sh:1273
13587 +#: git-rebase--interactive.sh:1282
13588 #, sh-format
13589 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
13590 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
13591 msgstr[0] ""
13592 msgstr[1] ""
13593
13594 -#: git-rebase--interactive.sh:1278
13594 +#: git-rebase--interactive.sh:1287
13595 msgid ""
13596 "\n"
13597 "However, if you remove everything, the rebase will be aborted.\n"
13598 "\n"
13599 msgstr ""
13600
13601 -#: git-rebase--interactive.sh:1285
13601 +#: git-rebase--interactive.sh:1294
13602 msgid "Note that empty commits are commented out"
13603 msgstr ""
13604
po/ko.po
+3 -3
@@ -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-22 22:10+0800\n"
62 -"PO-Revision-Date: 2016-11-22 22:16+0800\n"
61 +"POT-Creation-Date: 2016-11-25 22:50+0800\n"
62 +"PO-Revision-Date: 2016-11-25 22:56+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"
@@ -2650,7 +2650,7 @@ msgstr "'%s'에 쓸 수 없습니다"
2650
2651 #: sequencer.c:251
2652 #, c-format
2653 -msgid "could not write eol to '%s"
2653 +msgid "could not write eol to '%s'"
2654 msgstr "'%s'에 줄바꿈을 쓸 수 없습니다"
2655
2656 #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
po/pt_PT.po
+3 -3
@@ -9,8 +9,8 @@ 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-22 22:10+0800\n"
13 -"PO-Revision-Date: 2016-11-13 16:37+0000\n"
12 +"POT-Creation-Date: 2016-11-25 22:50+0800\n"
13 +"PO-Revision-Date: 2016-11-25 22:58+0800\n"
14 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
15 "Language-Team: Portuguese\n"
16 "Language: pt\n"
@@ -2665,7 +2665,7 @@ msgstr "não foi possível escrever em '%s'"
2665
2666 #: sequencer.c:251
2667 #, c-format
2668 -msgid "could not write eol to '%s"
2668 +msgid "could not write eol to '%s'"
2669 msgstr "não foi possível escrever fim de linha em '%s'"
2670
2671 #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
po/sv.po
+3 -3
@@ -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-22 22:10+0800\n"
11 -"PO-Revision-Date: 2016-11-22 22:16+0800\n"
10 +"POT-Creation-Date: 2016-11-25 22:50+0800\n"
11 +"PO-Revision-Date: 2016-11-25 22:59+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"
@@ -2655,7 +2655,7 @@ msgstr "kunde inte skriva till \"%s\""
2655
2656 #: sequencer.c:251
2657 #, c-format
2658 -msgid "could not write eol to '%s"
2658 +msgid "could not write eol to '%s'"
2659 msgstr "kunde inte skriva radslut till \"%s\""
2660
2661 #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
po/vi.po
+3 -3
@@ -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-22 22:10+0800\n"
12 -"PO-Revision-Date: 2016-11-22 22:17+0800\n"
11 +"POT-Creation-Date: 2016-11-25 22:50+0800\n"
12 +"PO-Revision-Date: 2016-11-25 23:00+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"
@@ -2638,7 +2638,7 @@ msgstr "không thể ghi vào “%s”"
2638
2639 #: sequencer.c:251
2640 #, c-format
2641 -msgid "could not write eol to '%s"
2641 +msgid "could not write eol to '%s'"
2642 msgstr "không thể ghi eol vào “%s”"
2643
2644 #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
po/zh_CN.po
+3 -3
@@ -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-22 22:10+0800\n"
139 -"PO-Revision-Date: 2016-11-22 22:15+0800\n"
138 +"POT-Creation-Date: 2016-11-25 22:50+0800\n"
139 +"PO-Revision-Date: 2016-11-25 22:54+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"
@@ -2732,7 +2732,7 @@ msgstr "不能写入 '%s'"
2732
2733 #: sequencer.c:251
2734 #, c-format
2735 -msgid "could not write eol to '%s"
2735 +msgid "could not write eol to '%s'"
2736 msgstr "不能将换行符写入 '%s'"
2737
2738 #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216