@matheusbsbs / matheus-bagliano / commits / 5bd166d8af

l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)

Generate po/git.pot from v2.10.0-rc2 for git v2.10.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Aug 27, 2016 at 23:23 UTC 5bd166d8afb3cd8a7a1eb1897b1d75dcf432d109
1 file changed +189 -342
po/git.pot
+189 -342
@@ -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-08-15 22:43+0800\n"
11 +"POT-Creation-Date: 2016-08-27 23:21+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"
@@ -567,122 +567,93 @@ msgstr ""
567 msgid "bad config line %d in %s"
568 msgstr ""
569
570 -#: config.c:660
571 -#, c-format
572 -msgid "bad numeric config value '%s' for '%s': out of range"
570 +#: config.c:655
571 +msgid "out of range"
572 msgstr ""
573
575 -#: config.c:661
576 -#, c-format
577 -msgid "bad numeric config value '%s' for '%s': invalid unit"
574 +#: config.c:655
575 +msgid "invalid unit"
576 msgstr ""
577
580 -#: config.c:667
578 +#: config.c:661
579 #, c-format
582 -msgid "bad numeric config value '%s' for '%s' in blob %s: out of range"
580 +msgid "bad numeric config value '%s' for '%s': %s"
581 msgstr ""
582
585 -#: config.c:668
583 +#: config.c:666
584 #, c-format
587 -msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
585 +msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
586 msgstr ""
587
590 -#: config.c:672
588 +#: config.c:669
589 #, c-format
592 -msgid "bad numeric config value '%s' for '%s' in file %s: out of range"
590 +msgid "bad numeric config value '%s' for '%s' in file %s: %s"
591 msgstr ""
592
595 -#: config.c:673
593 +#: config.c:672
594 #, c-format
597 -msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
595 +msgid "bad numeric config value '%s' for '%s' in standard input: %s"
596 msgstr ""
597
600 -#: config.c:677
598 +#: config.c:675
599 #, c-format
602 -msgid "bad numeric config value '%s' for '%s' in standard input: out of range"
600 +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
601 msgstr ""
602
603 #: config.c:678
604 #, c-format
607 -msgid "bad numeric config value '%s' for '%s' in standard input: invalid unit"
608 -msgstr ""
609 -
610 -#: config.c:682
611 -#, c-format
612 -msgid ""
613 -"bad numeric config value '%s' for '%s' in submodule-blob %s: out of range"
614 -msgstr ""
615 -
616 -#: config.c:683
617 -#, c-format
618 -msgid ""
619 -"bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
620 -msgstr ""
621 -
622 -#: config.c:687
623 -#, c-format
624 -msgid "bad numeric config value '%s' for '%s' in command line %s: out of range"
625 -msgstr ""
626 -
627 -#: config.c:688
628 -#, c-format
629 -msgid "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
630 -msgstr ""
631 -
632 -#: config.c:692
633 -#, c-format
634 -msgid "bad numeric config value '%s' for '%s' in %s: out of range"
605 +msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
606 msgstr ""
607
637 -#: config.c:693
608 +#: config.c:681
609 #, c-format
639 -msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
610 +msgid "bad numeric config value '%s' for '%s' in %s: %s"
611 msgstr ""
612
642 -#: config.c:780
613 +#: config.c:768
614 #, c-format
615 msgid "failed to expand user dir in: '%s'"
616 msgstr ""
617
647 -#: config.c:861 config.c:872
618 +#: config.c:849 config.c:860
619 #, c-format
620 msgid "bad zlib compression level %d"
621 msgstr ""
622
652 -#: config.c:990
623 +#: config.c:978
624 #, c-format
625 msgid "invalid mode for object creation: %s"
626 msgstr ""
627
657 -#: config.c:1324
628 +#: config.c:1312
629 msgid "unable to parse command-line config"
630 msgstr ""
631
661 -#: config.c:1374
632 +#: config.c:1362
633 msgid "unknown error occurred while reading the configuration files"
634 msgstr ""
635
665 -#: config.c:1728
636 +#: config.c:1716
637 #, c-format
638 msgid "unable to parse '%s' from command-line config"
639 msgstr ""
640
670 -#: config.c:1730
641 +#: config.c:1718
642 #, c-format
643 msgid "bad config variable '%s' in file '%s' at line %d"
644 msgstr ""
645
675 -#: config.c:1789
646 +#: config.c:1777
647 #, c-format
648 msgid "%s has multiple values"
649 msgstr ""
650
680 -#: config.c:2323
651 +#: config.c:2311
652 #, c-format
653 msgid "could not set '%s' to '%s'"
654 msgstr ""
655
685 -#: config.c:2325
656 +#: config.c:2313
657 #, c-format
658 msgid "could not unset '%s'"
659 msgstr ""
@@ -941,233 +912,233 @@ msgstr ""
912 msgid "unable to write new index file"
913 msgstr ""
914
944 -#: merge-recursive.c:212
915 +#: merge-recursive.c:209
916 msgid "(bad commit)\n"
917 msgstr ""
918
948 -#: merge-recursive.c:234
919 +#: merge-recursive.c:231
920 #, c-format
921 msgid "addinfo_cache failed for path '%s'"
922 msgstr ""
923
953 -#: merge-recursive.c:304
924 +#: merge-recursive.c:301
925 msgid "error building trees"
926 msgstr ""
927
957 -#: merge-recursive.c:723
928 +#: merge-recursive.c:720
929 #, c-format
930 msgid "failed to create path '%s'%s"
931 msgstr ""
932
962 -#: merge-recursive.c:734
933 +#: merge-recursive.c:731
934 #, c-format
935 msgid "Removing %s to make room for subdirectory\n"
936 msgstr ""
937
967 -#: merge-recursive.c:748 merge-recursive.c:767
938 +#: merge-recursive.c:745 merge-recursive.c:764
939 msgid ": perhaps a D/F conflict?"
940 msgstr ""
941
971 -#: merge-recursive.c:757
942 +#: merge-recursive.c:754
943 #, c-format
944 msgid "refusing to lose untracked file at '%s'"
945 msgstr ""
946
976 -#: merge-recursive.c:799
947 +#: merge-recursive.c:796
948 #, c-format
949 msgid "cannot read object %s '%s'"
950 msgstr ""
951
981 -#: merge-recursive.c:801
952 +#: merge-recursive.c:798
953 #, c-format
954 msgid "blob expected for %s '%s'"
955 msgstr ""
956
986 -#: merge-recursive.c:825
957 +#: merge-recursive.c:822
958 #, c-format
959 msgid "failed to open '%s': %s"
960 msgstr ""
961
991 -#: merge-recursive.c:836
962 +#: merge-recursive.c:833
963 #, c-format
964 msgid "failed to symlink '%s': %s"
965 msgstr ""
966
996 -#: merge-recursive.c:841
967 +#: merge-recursive.c:838
968 #, c-format
969 msgid "do not know what to do with %06o %s '%s'"
970 msgstr ""
971
1001 -#: merge-recursive.c:981
972 +#: merge-recursive.c:978
973 msgid "Failed to execute internal merge"
974 msgstr ""
975
1005 -#: merge-recursive.c:985
976 +#: merge-recursive.c:982
977 #, c-format
978 msgid "Unable to add %s to database"
979 msgstr ""
980
1010 -#: merge-recursive.c:1084 merge-recursive.c:1098
981 +#: merge-recursive.c:1081 merge-recursive.c:1095
982 #, c-format
983 msgid ""
984 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
985 "in tree."
986 msgstr ""
987
1017 -#: merge-recursive.c:1090 merge-recursive.c:1103
988 +#: merge-recursive.c:1087 merge-recursive.c:1100
989 #, c-format
990 msgid ""
991 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
992 "in tree at %s."
993 msgstr ""
994
1024 -#: merge-recursive.c:1146
995 +#: merge-recursive.c:1143
996 msgid "rename"
997 msgstr ""
998
1028 -#: merge-recursive.c:1146
999 +#: merge-recursive.c:1143
1000 msgid "renamed"
1001 msgstr ""
1002
1032 -#: merge-recursive.c:1203
1003 +#: merge-recursive.c:1200
1004 #, c-format
1005 msgid "%s is a directory in %s adding as %s instead"
1006 msgstr ""
1007
1037 -#: merge-recursive.c:1228
1008 +#: merge-recursive.c:1225
1009 #, c-format
1010 msgid ""
1011 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
1012 "\"->\"%s\" in \"%s\"%s"
1013 msgstr ""
1014
1044 -#: merge-recursive.c:1233
1015 +#: merge-recursive.c:1230
1016 msgid " (left unresolved)"
1017 msgstr ""
1018
1048 -#: merge-recursive.c:1295
1019 +#: merge-recursive.c:1292
1020 #, c-format
1021 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
1022 msgstr ""
1023
1053 -#: merge-recursive.c:1328
1024 +#: merge-recursive.c:1325
1025 #, c-format
1026 msgid "Renaming %s to %s and %s to %s instead"
1027 msgstr ""
1028
1058 -#: merge-recursive.c:1534
1029 +#: merge-recursive.c:1531
1030 #, c-format
1031 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
1032 msgstr ""
1033
1063 -#: merge-recursive.c:1549
1034 +#: merge-recursive.c:1546
1035 #, c-format
1036 msgid "Adding merged %s"
1037 msgstr ""
1038
1068 -#: merge-recursive.c:1556 merge-recursive.c:1769
1039 +#: merge-recursive.c:1553 merge-recursive.c:1766
1040 #, c-format
1041 msgid "Adding as %s instead"
1042 msgstr ""
1043
1073 -#: merge-recursive.c:1613
1044 +#: merge-recursive.c:1610
1045 #, c-format
1046 msgid "cannot read object %s"
1047 msgstr ""
1048
1078 -#: merge-recursive.c:1616
1049 +#: merge-recursive.c:1613
1050 #, c-format
1051 msgid "object %s is not a blob"
1052 msgstr ""
1053
1083 -#: merge-recursive.c:1669
1054 +#: merge-recursive.c:1666
1055 msgid "modify"
1056 msgstr ""
1057
1087 -#: merge-recursive.c:1669
1058 +#: merge-recursive.c:1666
1059 msgid "modified"
1060 msgstr ""
1061
1091 -#: merge-recursive.c:1679
1062 +#: merge-recursive.c:1676
1063 msgid "content"
1064 msgstr ""
1065
1095 -#: merge-recursive.c:1686
1066 +#: merge-recursive.c:1683
1067 msgid "add/add"
1068 msgstr ""
1069
1099 -#: merge-recursive.c:1721
1070 +#: merge-recursive.c:1718
1071 #, c-format
1072 msgid "Skipped %s (merged same as existing)"
1073 msgstr ""
1074
1104 -#: merge-recursive.c:1735
1075 +#: merge-recursive.c:1732
1076 #, c-format
1077 msgid "Auto-merging %s"
1078 msgstr ""
1079
1109 -#: merge-recursive.c:1739 git-submodule.sh:919
1080 +#: merge-recursive.c:1736 git-submodule.sh:919
1081 msgid "submodule"
1082 msgstr ""
1083
1113 -#: merge-recursive.c:1740
1084 +#: merge-recursive.c:1737
1085 #, c-format
1086 msgid "CONFLICT (%s): Merge conflict in %s"
1087 msgstr ""
1088
1118 -#: merge-recursive.c:1834
1089 +#: merge-recursive.c:1831
1090 #, c-format
1091 msgid "Removing %s"
1092 msgstr ""
1093
1123 -#: merge-recursive.c:1860
1094 +#: merge-recursive.c:1857
1095 msgid "file/directory"
1096 msgstr ""
1097
1127 -#: merge-recursive.c:1866
1098 +#: merge-recursive.c:1863
1099 msgid "directory/file"
1100 msgstr ""
1101
1131 -#: merge-recursive.c:1871
1102 +#: merge-recursive.c:1868
1103 #, c-format
1104 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
1105 msgstr ""
1106
1136 -#: merge-recursive.c:1880
1107 +#: merge-recursive.c:1877
1108 #, c-format
1109 msgid "Adding %s"
1110 msgstr ""
1111
1141 -#: merge-recursive.c:1917
1112 +#: merge-recursive.c:1914
1113 msgid "Already up-to-date!"
1114 msgstr ""
1115
1145 -#: merge-recursive.c:1926
1116 +#: merge-recursive.c:1923
1117 #, c-format
1118 msgid "merging of trees %s and %s failed"
1119 msgstr ""
1120
1150 -#: merge-recursive.c:2009
1121 +#: merge-recursive.c:2006
1122 msgid "Merging:"
1123 msgstr ""
1124
1154 -#: merge-recursive.c:2022
1125 +#: merge-recursive.c:2019
1126 #, c-format
1127 msgid "found %u common ancestor:"
1128 msgid_plural "found %u common ancestors:"
1129 msgstr[0] ""
1130 msgstr[1] ""
1131
1161 -#: merge-recursive.c:2061
1132 +#: merge-recursive.c:2058
1133 msgid "merge returned no commit"
1134 msgstr ""
1135
1165 -#: merge-recursive.c:2124
1136 +#: merge-recursive.c:2121
1137 #, c-format
1138 msgid "Could not parse object '%s'"
1139 msgstr ""
1140
1170 -#: merge-recursive.c:2138 builtin/merge.c:641 builtin/merge.c:788
1141 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
1142 msgid "Unable to write index."
1143 msgstr ""
1144
@@ -1227,7 +1198,7 @@ msgstr ""
1198 msgid "malformed object name '%s'"
1199 msgstr ""
1200
1230 -#: path.c:796
1201 +#: path.c:798
1202 #, c-format
1203 msgid "Could not make %s writable by group"
1204 msgstr ""
@@ -1745,7 +1716,7 @@ msgid "git %s: failed to refresh the index"
1716 msgstr ""
1717
1718 #: sequencer.c:705
1748 -msgid "Cannot revert during a another revert."
1719 +msgid "Cannot revert during another revert."
1720 msgstr ""
1721
1722 #: sequencer.c:706
@@ -2841,7 +2812,7 @@ msgstr ""
2812 msgid "interactive picking"
2813 msgstr ""
2814
2844 -#: builtin/add.c:257 builtin/checkout.c:1156 builtin/reset.c:286
2815 +#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
2816 msgid "select hunks interactively"
2817 msgstr ""
2818
@@ -4454,7 +4425,7 @@ msgstr ""
4425 msgid "terminate input and output records by a NUL character"
4426 msgstr ""
4427
4457 -#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
4428 +#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
4429 msgid "suppress progress reporting"
4430 msgstr ""
4431
@@ -4626,45 +4597,45 @@ msgstr ""
4597 msgid "Can not do reflog for '%s': %s\n"
4598 msgstr ""
4599
4629 -#: builtin/checkout.c:663
4600 +#: builtin/checkout.c:664
4601 msgid "HEAD is now at"
4602 msgstr ""
4603
4633 -#: builtin/checkout.c:667 builtin/clone.c:661
4604 +#: builtin/checkout.c:668 builtin/clone.c:661
4605 msgid "unable to update HEAD"
4606 msgstr ""
4607
4637 -#: builtin/checkout.c:671
4608 +#: builtin/checkout.c:672
4609 #, c-format
4610 msgid "Reset branch '%s'\n"
4611 msgstr ""
4612
4642 -#: builtin/checkout.c:674
4613 +#: builtin/checkout.c:675
4614 #, c-format
4615 msgid "Already on '%s'\n"
4616 msgstr ""
4617
4647 -#: builtin/checkout.c:678
4618 +#: builtin/checkout.c:679
4619 #, c-format
4620 msgid "Switched to and reset branch '%s'\n"
4621 msgstr ""
4622
4652 -#: builtin/checkout.c:680 builtin/checkout.c:1069
4623 +#: builtin/checkout.c:681 builtin/checkout.c:1070
4624 #, c-format
4625 msgid "Switched to a new branch '%s'\n"
4626 msgstr ""
4627
4657 -#: builtin/checkout.c:682
4628 +#: builtin/checkout.c:683
4629 #, c-format
4630 msgid "Switched to branch '%s'\n"
4631 msgstr ""
4632
4662 -#: builtin/checkout.c:733
4633 +#: builtin/checkout.c:734
4634 #, c-format
4635 msgid " ... and %d more.\n"
4636 msgstr ""
4637
4667 -#: builtin/checkout.c:739
4638 +#: builtin/checkout.c:740
4639 #, c-format
4640 msgid ""
4641 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4679,7 +4650,7 @@ msgid_plural ""
4650 msgstr[0] ""
4651 msgstr[1] ""
4652
4682 -#: builtin/checkout.c:758
4653 +#: builtin/checkout.c:759
4654 #, c-format
4655 msgid ""
4656 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4696,162 +4667,162 @@ msgid_plural ""
4667 msgstr[0] ""
4668 msgstr[1] ""
4669
4699 -#: builtin/checkout.c:794
4670 +#: builtin/checkout.c:795
4671 msgid "internal error in revision walk"
4672 msgstr ""
4673
4703 -#: builtin/checkout.c:798
4674 +#: builtin/checkout.c:799
4675 msgid "Previous HEAD position was"
4676 msgstr ""
4677
4707 -#: builtin/checkout.c:825 builtin/checkout.c:1064
4678 +#: builtin/checkout.c:826 builtin/checkout.c:1065
4679 msgid "You are on a branch yet to be born"
4680 msgstr ""
4681
4711 -#: builtin/checkout.c:970
4682 +#: builtin/checkout.c:971
4683 #, c-format
4684 msgid "only one reference expected, %d given."
4685 msgstr ""
4686
4716 -#: builtin/checkout.c:1010 builtin/worktree.c:214
4687 +#: builtin/checkout.c:1011 builtin/worktree.c:214
4688 #, c-format
4689 msgid "invalid reference: %s"
4690 msgstr ""
4691
4721 -#: builtin/checkout.c:1039
4692 +#: builtin/checkout.c:1040
4693 #, c-format
4694 msgid "reference is not a tree: %s"
4695 msgstr ""
4696
4726 -#: builtin/checkout.c:1078
4697 +#: builtin/checkout.c:1079
4698 msgid "paths cannot be used with switching branches"
4699 msgstr ""
4700
4730 -#: builtin/checkout.c:1081 builtin/checkout.c:1085
4701 +#: builtin/checkout.c:1082 builtin/checkout.c:1086
4702 #, c-format
4703 msgid "'%s' cannot be used with switching branches"
4704 msgstr ""
4705
4735 -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
4736 -#: builtin/checkout.c:1100
4706 +#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
4707 +#: builtin/checkout.c:1101
4708 #, c-format
4709 msgid "'%s' cannot be used with '%s'"
4710 msgstr ""
4711
4741 -#: builtin/checkout.c:1105
4712 +#: builtin/checkout.c:1106
4713 #, c-format
4714 msgid "Cannot switch branch to a non-commit '%s'"
4715 msgstr ""
4716
4746 -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:88
4717 +#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
4718 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
4719 #: builtin/worktree.c:326
4720 msgid "branch"
4721 msgstr ""
4722
4752 -#: builtin/checkout.c:1139
4723 +#: builtin/checkout.c:1140
4724 msgid "create and checkout a new branch"
4725 msgstr ""
4726
4756 -#: builtin/checkout.c:1141
4727 +#: builtin/checkout.c:1142
4728 msgid "create/reset and checkout a branch"
4729 msgstr ""
4730
4760 -#: builtin/checkout.c:1142
4731 +#: builtin/checkout.c:1143
4732 msgid "create reflog for new branch"
4733 msgstr ""
4734
4764 -#: builtin/checkout.c:1143 builtin/worktree.c:328
4735 +#: builtin/checkout.c:1144 builtin/worktree.c:328
4736 msgid "detach HEAD at named commit"
4737 msgstr ""
4738
4768 -#: builtin/checkout.c:1144
4739 +#: builtin/checkout.c:1145
4740 msgid "set upstream info for new branch"
4741 msgstr ""
4742
4772 -#: builtin/checkout.c:1146
4743 +#: builtin/checkout.c:1147
4744 msgid "new-branch"
4745 msgstr ""
4746
4776 -#: builtin/checkout.c:1146
4747 +#: builtin/checkout.c:1147
4748 msgid "new unparented branch"
4749 msgstr ""
4750
4780 -#: builtin/checkout.c:1147
4751 +#: builtin/checkout.c:1148
4752 msgid "checkout our version for unmerged files"
4753 msgstr ""
4754
4784 -#: builtin/checkout.c:1149
4755 +#: builtin/checkout.c:1150
4756 msgid "checkout their version for unmerged files"
4757 msgstr ""
4758
4788 -#: builtin/checkout.c:1151
4759 +#: builtin/checkout.c:1152
4760 msgid "force checkout (throw away local modifications)"
4761 msgstr ""
4762
4792 -#: builtin/checkout.c:1152
4763 +#: builtin/checkout.c:1153
4764 msgid "perform a 3-way merge with the new branch"
4765 msgstr ""
4766
4796 -#: builtin/checkout.c:1153 builtin/merge.c:231
4767 +#: builtin/checkout.c:1154 builtin/merge.c:231
4768 msgid "update ignored files (default)"
4769 msgstr ""
4770
4800 -#: builtin/checkout.c:1154 builtin/log.c:1459 parse-options.h:250
4771 +#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
4772 msgid "style"
4773 msgstr ""
4774
4804 -#: builtin/checkout.c:1155
4775 +#: builtin/checkout.c:1156
4776 msgid "conflict style (merge or diff3)"
4777 msgstr ""
4778
4808 -#: builtin/checkout.c:1158
4779 +#: builtin/checkout.c:1159
4780 msgid "do not limit pathspecs to sparse entries only"
4781 msgstr ""
4782
4812 -#: builtin/checkout.c:1160
4783 +#: builtin/checkout.c:1161
4784 msgid "second guess 'git checkout <no-such-branch>'"
4785 msgstr ""
4786
4816 -#: builtin/checkout.c:1162
4787 +#: builtin/checkout.c:1163
4788 msgid "do not check if another worktree is holding the given ref"
4789 msgstr ""
4790
4820 -#: builtin/checkout.c:1163 builtin/clone.c:60 builtin/fetch.c:117
4791 +#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
4792 #: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
4793 #: builtin/send-pack.c:168
4794 msgid "force progress reporting"
4795 msgstr ""
4796
4826 -#: builtin/checkout.c:1194
4797 +#: builtin/checkout.c:1195
4798 msgid "-b, -B and --orphan are mutually exclusive"
4799 msgstr ""
4800
4830 -#: builtin/checkout.c:1211
4801 +#: builtin/checkout.c:1212
4802 msgid "--track needs a branch name"
4803 msgstr ""
4804
4834 -#: builtin/checkout.c:1216
4805 +#: builtin/checkout.c:1217
4806 msgid "Missing branch name; try -b"
4807 msgstr ""
4808
4838 -#: builtin/checkout.c:1252
4809 +#: builtin/checkout.c:1253
4810 msgid "invalid path specification"
4811 msgstr ""
4812
4842 -#: builtin/checkout.c:1259
4813 +#: builtin/checkout.c:1260
4814 #, c-format
4815 msgid ""
4816 "Cannot update paths and switch to branch '%s' at the same time.\n"
4817 "Did you intend to checkout '%s' which can not be resolved as commit?"
4818 msgstr ""
4819
4849 -#: builtin/checkout.c:1264
4820 +#: builtin/checkout.c:1265
4821 #, c-format
4822 msgid "git checkout: --detach does not take a path argument '%s'"
4823 msgstr ""
4824
4854 -#: builtin/checkout.c:1268
4825 +#: builtin/checkout.c:1269
4826 msgid ""
4827 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4828 "checking out of the index."
@@ -5221,7 +5192,7 @@ msgstr ""
5192 msgid "cannot unlink temporary alternates file"
5193 msgstr ""
5194
5224 -#: builtin/clone.c:863 builtin/receive-pack.c:1857
5195 +#: builtin/clone.c:863 builtin/receive-pack.c:1855
5196 msgid "Too many arguments."
5197 msgstr ""
5198
@@ -7065,48 +7036,48 @@ msgstr ""
7036 msgid "no info viewer handled the request"
7037 msgstr ""
7038
7068 -#: builtin/help.c:408
7039 +#: builtin/help.c:401
7040 msgid "Defining attributes per path"
7041 msgstr ""
7042
7072 -#: builtin/help.c:409
7043 +#: builtin/help.c:402
7044 msgid "Everyday Git With 20 Commands Or So"
7045 msgstr ""
7046
7076 -#: builtin/help.c:410
7047 +#: builtin/help.c:403
7048 msgid "A Git glossary"
7049 msgstr ""
7050
7080 -#: builtin/help.c:411
7051 +#: builtin/help.c:404
7052 msgid "Specifies intentionally untracked files to ignore"
7053 msgstr ""
7054
7084 -#: builtin/help.c:412
7055 +#: builtin/help.c:405
7056 msgid "Defining submodule properties"
7057 msgstr ""
7058
7088 -#: builtin/help.c:413
7059 +#: builtin/help.c:406
7060 msgid "Specifying revisions and ranges for Git"
7061 msgstr ""
7062
7092 -#: builtin/help.c:414
7063 +#: builtin/help.c:407
7064 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
7065 msgstr ""
7066
7096 -#: builtin/help.c:415
7067 +#: builtin/help.c:408
7068 msgid "An overview of recommended workflows with Git"
7069 msgstr ""
7070
7100 -#: builtin/help.c:427
7071 +#: builtin/help.c:420
7072 msgid "The common Git guides are:\n"
7073 msgstr ""
7074
7104 -#: builtin/help.c:448 builtin/help.c:465
7075 +#: builtin/help.c:441 builtin/help.c:458
7076 #, c-format
7077 msgid "usage: %s%s"
7078 msgstr ""
7079
7109 -#: builtin/help.c:481
7080 +#: builtin/help.c:474
7081 #, c-format
7082 msgid "`git %s' is aliased to `%s'"
7083 msgstr ""
@@ -9643,11 +9614,11 @@ msgstr ""
9614 msgid "git receive-pack <git-dir>"
9615 msgstr ""
9616
9646 -#: builtin/receive-pack.c:1845
9617 +#: builtin/receive-pack.c:1843
9618 msgid "quiet"
9619 msgstr ""
9620
9650 -#: builtin/receive-pack.c:1859
9621 +#: builtin/receive-pack.c:1857
9622 msgid "You must specify a directory."
9623 msgstr ""
9624
@@ -12606,167 +12577,43 @@ msgstr ""
12577 msgid "Could not pick $sha1"
12578 msgstr ""
12579
12609 -#: git-rebase--interactive.sh:408 git-rebase--interactive.sh:474
12610 -msgid "This is the 1st commit message:"
12611 -msgstr ""
12612 -
12613 -#: git-rebase--interactive.sh:409
12614 -msgid "This is the 2nd commit message:"
12615 -msgstr ""
12616 -
12617 -#: git-rebase--interactive.sh:410
12618 -msgid "This is the 3rd commit message:"
12619 -msgstr ""
12620 -
12621 -#: git-rebase--interactive.sh:411
12622 -msgid "This is the 4th commit message:"
12580 +#: git-rebase--interactive.sh:407
12581 +#, sh-format
12582 +msgid "This is the commit message #${n}:"
12583 msgstr ""
12584
12585 #: git-rebase--interactive.sh:412
12626 -msgid "This is the 5th commit message:"
12627 -msgstr ""
12628 -
12629 -#: git-rebase--interactive.sh:413
12630 -msgid "This is the 6th commit message:"
12631 -msgstr ""
12632 -
12633 -#: git-rebase--interactive.sh:414
12634 -msgid "This is the 7th commit message:"
12635 -msgstr ""
12636 -
12637 -#: git-rebase--interactive.sh:415
12638 -msgid "This is the 8th commit message:"
12639 -msgstr ""
12640 -
12641 -#: git-rebase--interactive.sh:416
12642 -msgid "This is the 9th commit message:"
12643 -msgstr ""
12644 -
12645 -#: git-rebase--interactive.sh:417
12646 -msgid "This is the 10th commit message:"
12647 -msgstr ""
12648 -
12649 -#. TRANSLATORS: if the language you are translating into
12650 -#. doesn't allow you to compose a sentence in this fashion,
12651 -#. consider translating as if this and the following few strings
12652 -#. were "This is the commit message ${n}:"
12653 -#: git-rebase--interactive.sh:422
12586 #, sh-format
12655 -msgid "This is the ${n}th commit message:"
12587 +msgid "The commit message #${n} will be skipped:"
12588 msgstr ""
12589
12590 #: git-rebase--interactive.sh:423
12591 #, sh-format
12660 -msgid "This is the ${n}st commit message:"
12661 -msgstr ""
12662 -
12663 -#: git-rebase--interactive.sh:424
12664 -#, sh-format
12665 -msgid "This is the ${n}nd commit message:"
12666 -msgstr ""
12667 -
12668 -#: git-rebase--interactive.sh:425
12669 -#, sh-format
12670 -msgid "This is the ${n}rd commit message:"
12671 -msgstr ""
12672 -
12673 -#: git-rebase--interactive.sh:426
12674 -#, sh-format
12675 -msgid "This is the commit message ${n}:"
12676 -msgstr ""
12677 -
12678 -#: git-rebase--interactive.sh:432
12679 -msgid "The 1st commit message will be skipped:"
12680 -msgstr ""
12681 -
12682 -#: git-rebase--interactive.sh:433
12683 -msgid "The 2nd commit message will be skipped:"
12684 -msgstr ""
12685 -
12686 -#: git-rebase--interactive.sh:434
12687 -msgid "The 3rd commit message will be skipped:"
12688 -msgstr ""
12689 -
12690 -#: git-rebase--interactive.sh:435
12691 -msgid "The 4th commit message will be skipped:"
12692 -msgstr ""
12693 -
12694 -#: git-rebase--interactive.sh:436
12695 -msgid "The 5th commit message will be skipped:"
12696 -msgstr ""
12697 -
12698 -#: git-rebase--interactive.sh:437
12699 -msgid "The 6th commit message will be skipped:"
12700 -msgstr ""
12701 -
12702 -#: git-rebase--interactive.sh:438
12703 -msgid "The 7th commit message will be skipped:"
12704 -msgstr ""
12705 -
12706 -#: git-rebase--interactive.sh:439
12707 -msgid "The 8th commit message will be skipped:"
12708 -msgstr ""
12709 -
12710 -#: git-rebase--interactive.sh:440
12711 -msgid "The 9th commit message will be skipped:"
12712 -msgstr ""
12713 -
12714 -#: git-rebase--interactive.sh:441
12715 -msgid "The 10th commit message will be skipped:"
12716 -msgstr ""
12717 -
12718 -#. TRANSLATORS: if the language you are translating into
12719 -#. doesn't allow you to compose a sentence in this fashion,
12720 -#. consider translating as if this and the following few strings
12721 -#. were "The commit message ${n} will be skipped:"
12722 -#: git-rebase--interactive.sh:446
12723 -#, sh-format
12724 -msgid "The ${n}th commit message will be skipped:"
12725 -msgstr ""
12726 -
12727 -#: git-rebase--interactive.sh:447
12728 -#, sh-format
12729 -msgid "The ${n}st commit message will be skipped:"
12730 -msgstr ""
12731 -
12732 -#: git-rebase--interactive.sh:448
12733 -#, sh-format
12734 -msgid "The ${n}nd commit message will be skipped:"
12735 -msgstr ""
12736 -
12737 -#: git-rebase--interactive.sh:449
12738 -#, sh-format
12739 -msgid "The ${n}rd commit message will be skipped:"
12740 -msgstr ""
12741 -
12742 -#: git-rebase--interactive.sh:450
12743 -#, sh-format
12744 -msgid "The commit message ${n} will be skipped:"
12745 -msgstr ""
12746 -
12747 -#: git-rebase--interactive.sh:462
12748 -#, sh-format
12592 msgid "This is a combination of $count commit."
12593 msgid_plural "This is a combination of $count commits."
12594 msgstr[0] ""
12595 msgstr[1] ""
12596
12754 -#: git-rebase--interactive.sh:470
12597 +#: git-rebase--interactive.sh:431
12598 #, sh-format
12599 msgid "Cannot write $fixup_msg"
12600 msgstr ""
12601
12759 -#: git-rebase--interactive.sh:473
12602 +#: git-rebase--interactive.sh:434
12603 msgid "This is a combination of 2 commits."
12604 msgstr ""
12605
12763 -#: git-rebase--interactive.sh:514 git-rebase--interactive.sh:557
12764 -#: git-rebase--interactive.sh:560
12606 +#: git-rebase--interactive.sh:435
12607 +msgid "This is the 1st commit message:"
12608 +msgstr ""
12609 +
12610 +#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
12611 +#: git-rebase--interactive.sh:521
12612 #, sh-format
12613 msgid "Could not apply $sha1... $rest"
12614 msgstr ""
12615
12769 -#: git-rebase--interactive.sh:588
12616 +#: git-rebase--interactive.sh:549
12617 #, sh-format
12618 msgid ""
12619 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -12776,31 +12623,31 @@ msgid ""
12623 "you are able to reword the commit."
12624 msgstr ""
12625
12779 -#: git-rebase--interactive.sh:603
12626 +#: git-rebase--interactive.sh:564
12627 #, sh-format
12628 msgid "Stopped at $sha1_abbrev... $rest"
12629 msgstr ""
12630
12784 -#: git-rebase--interactive.sh:618
12631 +#: git-rebase--interactive.sh:579
12632 #, sh-format
12633 msgid "Cannot '$squash_style' without a previous commit"
12634 msgstr ""
12635
12789 -#: git-rebase--interactive.sh:660
12636 +#: git-rebase--interactive.sh:621
12637 #, sh-format
12638 msgid "Executing: $rest"
12639 msgstr ""
12640
12794 -#: git-rebase--interactive.sh:668
12641 +#: git-rebase--interactive.sh:629
12642 #, sh-format
12643 msgid "Execution failed: $rest"
12644 msgstr ""
12645
12799 -#: git-rebase--interactive.sh:670
12646 +#: git-rebase--interactive.sh:631
12647 msgid "and made changes to the index and/or the working tree"
12648 msgstr ""
12649
12803 -#: git-rebase--interactive.sh:672
12650 +#: git-rebase--interactive.sh:633
12651 msgid ""
12652 "You can fix the problem, and then run\n"
12653 "\n"
@@ -12808,7 +12655,7 @@ msgid ""
12655 msgstr ""
12656
12657 #. TRANSLATORS: after these lines is a command to be issued by the user
12811 -#: git-rebase--interactive.sh:685
12658 +#: git-rebase--interactive.sh:646
12659 #, sh-format
12660 msgid ""
12661 "Execution succeeded: $rest\n"
@@ -12818,49 +12665,49 @@ msgid ""
12665 "\tgit rebase --continue"
12666 msgstr ""
12667
12821 -#: git-rebase--interactive.sh:696
12668 +#: git-rebase--interactive.sh:657
12669 #, sh-format
12670 msgid "Unknown command: $command $sha1 $rest"
12671 msgstr ""
12672
12826 -#: git-rebase--interactive.sh:697
12673 +#: git-rebase--interactive.sh:658
12674 msgid "Please fix this using 'git rebase --edit-todo'."
12675 msgstr ""
12676
12830 -#: git-rebase--interactive.sh:732
12677 +#: git-rebase--interactive.sh:693
12678 #, sh-format
12679 msgid "Successfully rebased and updated $head_name."
12680 msgstr ""
12681
12835 -#: git-rebase--interactive.sh:779
12682 +#: git-rebase--interactive.sh:740
12683 msgid "Could not skip unnecessary pick commands"
12684 msgstr ""
12685
12839 -#: git-rebase--interactive.sh:937
12686 +#: git-rebase--interactive.sh:898
12687 #, sh-format
12688 msgid ""
12689 "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
12690 " - $line"
12691 msgstr ""
12692
12846 -#: git-rebase--interactive.sh:970
12693 +#: git-rebase--interactive.sh:931
12694 #, sh-format
12695 msgid ""
12696 "Warning: the command isn't recognized in the following line:\n"
12697 " - $line"
12698 msgstr ""
12699
12853 -#: git-rebase--interactive.sh:1009
12700 +#: git-rebase--interactive.sh:970
12701 msgid "could not detach HEAD"
12702 msgstr ""
12703
12857 -#: git-rebase--interactive.sh:1047
12704 +#: git-rebase--interactive.sh:1008
12705 msgid ""
12706 "Warning: some commits may have been dropped accidentally.\n"
12707 "Dropped commits (newer to older):"
12708 msgstr ""
12709
12863 -#: git-rebase--interactive.sh:1055
12710 +#: git-rebase--interactive.sh:1016
12711 msgid ""
12712 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
12713 "\n"
@@ -12869,26 +12716,26 @@ msgid ""
12716 "The possible behaviours are: ignore, warn, error."
12717 msgstr ""
12718
12872 -#: git-rebase--interactive.sh:1066
12719 +#: git-rebase--interactive.sh:1027
12720 #, sh-format
12721 msgid ""
12722 "Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
12723 "Ignoring."
12724 msgstr ""
12725
12879 -#: git-rebase--interactive.sh:1083
12726 +#: git-rebase--interactive.sh:1044
12727 msgid "You can fix this with 'git rebase --edit-todo'."
12728 msgstr ""
12729
12883 -#: git-rebase--interactive.sh:1084
12730 +#: git-rebase--interactive.sh:1045
12731 msgid "Or you can abort the rebase with 'git rebase --abort'."
12732 msgstr ""
12733
12887 -#: git-rebase--interactive.sh:1108
12734 +#: git-rebase--interactive.sh:1069
12735 msgid "Could not remove CHERRY_PICK_HEAD"
12736 msgstr ""
12737
12891 -#: git-rebase--interactive.sh:1113
12738 +#: git-rebase--interactive.sh:1074
12739 #, sh-format
12740 msgid ""
12741 "You have staged changes in your working tree.\n"
@@ -12906,21 +12753,21 @@ msgid ""
12753 " git rebase --continue\n"
12754 msgstr ""
12755
12909 -#: git-rebase--interactive.sh:1130
12756 +#: git-rebase--interactive.sh:1091
12757 msgid "Error trying to find the author identity to amend commit"
12758 msgstr ""
12759
12913 -#: git-rebase--interactive.sh:1135
12760 +#: git-rebase--interactive.sh:1096
12761 msgid ""
12762 "You have uncommitted changes in your working tree. Please commit them\n"
12763 "first and then run 'git rebase --continue' again."
12764 msgstr ""
12765
12919 -#: git-rebase--interactive.sh:1140 git-rebase--interactive.sh:1144
12766 +#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
12767 msgid "Could not commit staged changes."
12768 msgstr ""
12769
12923 -#: git-rebase--interactive.sh:1168
12770 +#: git-rebase--interactive.sh:1129
12771 msgid ""
12772 "\n"
12773 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -12929,51 +12776,51 @@ msgid ""
12776 "\n"
12777 msgstr ""
12778
12932 -#: git-rebase--interactive.sh:1176 git-rebase--interactive.sh:1337
12779 +#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
12780 msgid "Could not execute editor"
12781 msgstr ""
12782
12936 -#: git-rebase--interactive.sh:1184
12783 +#: git-rebase--interactive.sh:1145
12784 msgid "You need to set your committer info first"
12785 msgstr ""
12786
12940 -#: git-rebase--interactive.sh:1192
12787 +#: git-rebase--interactive.sh:1153
12788 #, sh-format
12789 msgid "Could not checkout $switch_to"
12790 msgstr ""
12791
12945 -#: git-rebase--interactive.sh:1197
12792 +#: git-rebase--interactive.sh:1158
12793 msgid "No HEAD?"
12794 msgstr ""
12795
12949 -#: git-rebase--interactive.sh:1198
12796 +#: git-rebase--interactive.sh:1159
12797 #, sh-format
12798 msgid "Could not create temporary $state_dir"
12799 msgstr ""
12800
12954 -#: git-rebase--interactive.sh:1200
12801 +#: git-rebase--interactive.sh:1161
12802 msgid "Could not mark as interactive"
12803 msgstr ""
12804
12958 -#: git-rebase--interactive.sh:1210 git-rebase--interactive.sh:1215
12805 +#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
12806 msgid "Could not init rewritten commits"
12807 msgstr ""
12808
12962 -#: git-rebase--interactive.sh:1315
12809 +#: git-rebase--interactive.sh:1276
12810 #, sh-format
12811 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
12812 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
12813 msgstr[0] ""
12814 msgstr[1] ""
12815
12969 -#: git-rebase--interactive.sh:1320
12816 +#: git-rebase--interactive.sh:1281
12817 msgid ""
12818 "\n"
12819 "However, if you remove everything, the rebase will be aborted.\n"
12820 "\n"
12821 msgstr ""
12822
12976 -#: git-rebase--interactive.sh:1327
12823 +#: git-rebase--interactive.sh:1288
12824 msgid "Note that empty commits are commented out"
12825 msgstr ""
12826