9b7388a855 · matheusbsbs/matheus-bagliano

@@ -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: 2018-03-16 07:29+0800\n"

11 +"POT-Creation-Date: 2018-05-31 23:32+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"

@@ -18,59 +18,59 @@ msgstr ""

18 "Content-Transfer-Encoding: 8bit\n"

19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

20

21 -#: advice.c:62

21 +#: advice.c:92

22 #, c-format

23 -msgid "hint: %.*s\n"

23 +msgid "%shint: %.*s%s\n"

24 msgstr ""

25

26 -#: advice.c:90

26 +#: advice.c:137

27 msgid "Cherry-picking is not possible because you have unmerged files."

28 msgstr ""

29

30 -#: advice.c:92

30 +#: advice.c:139

31 msgid "Committing is not possible because you have unmerged files."

32 msgstr ""

33

34 -#: advice.c:94

34 +#: advice.c:141

35 msgid "Merging is not possible because you have unmerged files."

36 msgstr ""

37

38 -#: advice.c:96

38 +#: advice.c:143

39 msgid "Pulling is not possible because you have unmerged files."

40 msgstr ""

41

42 -#: advice.c:98

42 +#: advice.c:145

43 msgid "Reverting is not possible because you have unmerged files."

44 msgstr ""

45

46 -#: advice.c:100

46 +#: advice.c:147

47 #, c-format

48 msgid "It is not possible to %s because you have unmerged files."

49 msgstr ""

50

51 -#: advice.c:108

51 +#: advice.c:155

52 msgid ""

53 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

54 "as appropriate to mark resolution and make a commit."

55 msgstr ""

56

57 -#: advice.c:116

57 +#: advice.c:163

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:121 builtin/merge.c:1251

61 +#: advice.c:168 builtin/merge.c:1249

62 msgid "You have not concluded your merge (MERGE_HEAD exists)."

63 msgstr ""

64

65 -#: advice.c:123

65 +#: advice.c:170

66 msgid "Please, commit your changes before merging."

67 msgstr ""

68

69 -#: advice.c:124

69 +#: advice.c:171

70 msgid "Exiting because of unfinished merge."

71 msgstr ""

72

73 -#: advice.c:130

73 +#: advice.c:177

74 #, c-format

75 msgid ""

76 "Note: checking out '%s'.\n"

@@ -315,7 +315,7 @@ msgstr ""

315 msgid "cannot checkout %s"

316 msgstr ""

317

318 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

318 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

319 #, c-format

320 msgid "failed to read %s"

321 msgstr ""

@@ -514,7 +514,7 @@ msgstr[1] ""

514 msgid "truncating .rej filename to %.*s.rej"

515 msgstr ""

516

517 -#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025

517 +#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

518 #, c-format

519 msgid "cannot open %s"

520 msgstr ""

@@ -568,15 +568,15 @@ msgid_plural "%d lines applied after fixing whitespace errors."

568 msgstr[0] ""

569 msgstr[1] ""

570

571 -#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390

571 +#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

572 msgid "Unable to write new index file"

573 msgstr ""

574

575 #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

576 -#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193

577 -#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197

578 -#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567

579 -#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787

576 +#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

577 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

578 +#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

579 +#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

580 #: git-add--interactive.perl:197

581 msgid "path"

582 msgstr ""

@@ -651,7 +651,7 @@ msgstr ""

651

652 #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

653 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

654 -#: builtin/pack-objects.c:3035

654 +#: builtin/pack-objects.c:3177

655 msgid "action"

656 msgstr ""

657

@@ -679,9 +679,9 @@ msgstr ""

679 msgid "allow overlapping hunks"

680 msgstr ""

681

682 -#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21

683 -#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665

684 -#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125

682 +#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21

683 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

684 +#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

685 msgid "be verbose"

686 msgstr ""

687

@@ -718,7 +718,7 @@ msgstr ""

718 msgid "git archive --remote <repo> [--exec <cmd>] --list"

719 msgstr ""

720

721 -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

721 +#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

722 #, c-format

723 msgid "pathspec '%s' did not match any files"

724 msgstr ""

@@ -739,10 +739,10 @@ msgstr ""

739 msgid "prepend prefix to each pathname in the archive"

740 msgstr ""

741

742 -#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62

743 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869

742 +#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

743 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

744 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

745 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

745 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

746 #: parse-options.h:165

747 msgid "file"

748 msgstr ""

@@ -775,8 +775,8 @@ msgstr ""

775 msgid "list supported archive formats"

776 msgstr ""

777

778 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111

779 -#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576

778 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

779 +#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

780 msgid "repo"

781 msgstr ""

782

@@ -825,43 +825,43 @@ msgid ""

825 "Use '\\!' for literal leading exclamation."

826 msgstr ""

827

828 -#: bisect.c:460

828 +#: bisect.c:461

829 #, c-format

830 msgid "Badly quoted content in file '%s': %s"

831 msgstr ""

832

833 -#: bisect.c:668

833 +#: bisect.c:669

834 #, c-format

835 msgid "We cannot bisect more!\n"

836 msgstr ""

837

838 -#: bisect.c:722

838 +#: bisect.c:723

839 #, c-format

840 msgid "Not a valid commit name %s"

841 msgstr ""

842

843 -#: bisect.c:746

843 +#: bisect.c:747

844 #, c-format

845 msgid ""

846 "The merge base %s is bad.\n"

847 "This means the bug has been fixed between %s and [%s].\n"

848 msgstr ""

849

850 -#: bisect.c:751

850 +#: bisect.c:752

851 #, c-format

852 msgid ""

853 "The merge base %s is new.\n"

854 "The property has changed between %s and [%s].\n"

855 msgstr ""

856

857 -#: bisect.c:756

857 +#: bisect.c:757

858 #, c-format

859 msgid ""

860 "The merge base %s is %s.\n"

861 "This means the first '%s' commit is between %s and [%s].\n"

862 msgstr ""

863

864 -#: bisect.c:764

864 +#: bisect.c:765

865 #, c-format

866 msgid ""

867 "Some %s revs are not ancestors of the %s rev.\n"

@@ -869,7 +869,7 @@ msgid ""

869 "Maybe you mistook %s and %s revs?\n"

870 msgstr ""

871

872 -#: bisect.c:777

872 +#: bisect.c:778

873 #, c-format

874 msgid ""

875 "the merge base between %s and [%s] must be skipped.\n"

@@ -877,43 +877,43 @@ msgid ""

877 "We continue anyway."

878 msgstr ""

879

880 -#: bisect.c:810

880 +#: bisect.c:811

881 #, c-format

882 msgid "Bisecting: a merge base must be tested\n"

883 msgstr ""

884

885 -#: bisect.c:850

885 +#: bisect.c:851

886 #, c-format

887 msgid "a %s revision is needed"

888 msgstr ""

889

890 -#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235

890 +#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

891 #, c-format

892 msgid "could not create file '%s'"

893 msgstr ""

894

895 -#: bisect.c:920

895 +#: bisect.c:921

896 #, c-format

897 msgid "could not read file '%s'"

898 msgstr ""

899

900 -#: bisect.c:950

900 +#: bisect.c:951

901 msgid "reading bisect refs failed"

902 msgstr ""

903

904 -#: bisect.c:969

904 +#: bisect.c:970

905 #, c-format

906 msgid "%s was both %s and %s\n"

907 msgstr ""

908

909 -#: bisect.c:977

909 +#: bisect.c:978

910 #, c-format

911 msgid ""

912 "No testable commit found.\n"

913 "Maybe you started with bad path parameters?\n"

914 msgstr ""

915

916 -#: bisect.c:996

916 +#: bisect.c:997

917 #, c-format

918 msgid "(roughly %d step)"

919 msgid_plural "(roughly %d steps)"

@@ -923,48 +923,48 @@ msgstr[1] ""

923 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

924 #. steps)" translation.

925 #.

926 -#: bisect.c:1002

926 +#: bisect.c:1003

927 #, c-format

928 msgid "Bisecting: %d revision left to test after this %s\n"

929 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

930 msgstr[0] ""

931 msgstr[1] ""

932

933 -#: blame.c:1758

933 +#: blame.c:1756

934 msgid "--contents and --reverse do not blend well."

935 msgstr ""

936

937 -#: blame.c:1769

937 +#: blame.c:1767

938 msgid "cannot use --contents with final commit object name"

939 msgstr ""

940

941 -#: blame.c:1789

941 +#: blame.c:1787

942 msgid "--reverse and --first-parent together require specified latest commit"

943 msgstr ""

944

945 -#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699

946 -#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920

947 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370

948 -#: builtin/shortlog.c:191

945 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860

946 +#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

947 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371

948 +#: builtin/shortlog.c:192

949 msgid "revision walk setup failed"

950 msgstr ""

951

952 -#: blame.c:1816

952 +#: blame.c:1814

953 msgid ""

954 "--reverse --first-parent together require range along first-parent chain"

955 msgstr ""

956

957 -#: blame.c:1827

957 +#: blame.c:1825

958 #, c-format

959 msgid "no such path %s in %s"

960 msgstr ""

961

962 -#: blame.c:1838

962 +#: blame.c:1836

963 #, c-format

964 msgid "cannot read blob %s for path %s"

965 msgstr ""

966

967 -#: branch.c:53

967 +#: branch.c:54

968 #, c-format

969 msgid ""

970 "\n"

@@ -973,85 +973,85 @@ msgid ""

973 "\"git branch --set-upstream-to=%s%s%s\"."

974 msgstr ""

975

976 -#: branch.c:67

976 +#: branch.c:68

977 #, c-format

978 msgid "Not setting branch %s as its own upstream."

979 msgstr ""

980

981 -#: branch.c:93

981 +#: branch.c:94

982 #, c-format

983 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

984 msgstr ""

985

986 -#: branch.c:94

986 +#: branch.c:95

987 #, c-format

988 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

989 msgstr ""

990

991 -#: branch.c:98

991 +#: branch.c:99

992 #, c-format

993 msgid "Branch '%s' set up to track local branch '%s' by rebasing."

994 msgstr ""

995

996 -#: branch.c:99

996 +#: branch.c:100

997 #, c-format

998 msgid "Branch '%s' set up to track local branch '%s'."

999 msgstr ""

1000

1001 -#: branch.c:104

1001 +#: branch.c:105

1002 #, c-format

1003 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1004 msgstr ""

1005

1006 -#: branch.c:105

1006 +#: branch.c:106

1007 #, c-format

1008 msgid "Branch '%s' set up to track remote ref '%s'."

1009 msgstr ""

1010

1011 -#: branch.c:109

1011 +#: branch.c:110

1012 #, c-format

1013 msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1014 msgstr ""

1015

1016 -#: branch.c:110

1016 +#: branch.c:111

1017 #, c-format

1018 msgid "Branch '%s' set up to track local ref '%s'."

1019 msgstr ""

1020

1021 -#: branch.c:119

1021 +#: branch.c:120

1022 msgid "Unable to write upstream branch configuration"

1023 msgstr ""

1024

1025 -#: branch.c:156

1025 +#: branch.c:157

1026 #, c-format

1027 msgid "Not tracking: ambiguous information for ref %s"

1028 msgstr ""

1029

1030 -#: branch.c:189

1030 +#: branch.c:190

1031 #, c-format

1032 msgid "'%s' is not a valid branch name."

1033 msgstr ""

1034

1035 -#: branch.c:208

1035 +#: branch.c:209

1036 #, c-format

1037 msgid "A branch named '%s' already exists."

1038 msgstr ""

1039

1040 -#: branch.c:213

1040 +#: branch.c:214

1041 msgid "Cannot force update the current branch."

1042 msgstr ""

1043

1044 -#: branch.c:233

1044 +#: branch.c:234

1045 #, c-format

1046 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

1047 msgstr ""

1048

1049 -#: branch.c:235

1049 +#: branch.c:236

1050 #, c-format

1051 msgid "the requested upstream branch '%s' does not exist"

1052 msgstr ""

1053

1054 -#: branch.c:237

1054 +#: branch.c:238

1055 msgid ""

1056 "\n"

1057 "If you are planning on basing your work on an upstream\n"

@@ -1063,27 +1063,27 @@ msgid ""

1063 "\"git push -u\" to set the upstream config as you push."

1064 msgstr ""

1065

1066 -#: branch.c:280

1066 +#: branch.c:281

1067 #, c-format

1068 msgid "Not a valid object name: '%s'."

1069 msgstr ""

1070

1071 -#: branch.c:300

1071 +#: branch.c:301

1072 #, c-format

1073 msgid "Ambiguous object name: '%s'."

1074 msgstr ""

1075

1076 -#: branch.c:305

1076 +#: branch.c:306

1077 #, c-format

1078 msgid "Not a valid branch point: '%s'."

1079 msgstr ""

1080

1081 -#: branch.c:359

1081 +#: branch.c:360

1082 #, c-format

1083 msgid "'%s' is already checked out at '%s'"

1084 msgstr ""

1085

1086 -#: branch.c:382

1086 +#: branch.c:383

1087 #, c-format

1088 msgid "HEAD of working tree %s is not updated"

1089 msgstr ""

@@ -1098,7 +1098,7 @@ msgstr ""

1098 msgid "unrecognized header: %s%s (%d)"

1099 msgstr ""

1100

1101 -#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750

1101 +#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755

1102 #, c-format

1103 msgid "could not open '%s'"

1104 msgstr ""

@@ -1142,7 +1142,7 @@ msgstr ""

1142 msgid "ref '%s' is excluded by the rev-list options"

1143 msgstr ""

1144

1145 -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296

1145 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

1146 #, c-format

1147 msgid "unrecognized argument: %s"

1148 msgstr ""

@@ -1165,188 +1165,215 @@ msgstr ""

1165 msgid "invalid color value: %.*s"

1166 msgstr ""

1167

1168 -#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465

1169 -#: builtin/am.c:1436 builtin/am.c:2072

1168 +#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465

1169 +#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

1170 +#: builtin/replace.c:448

1171 #, c-format

1172 msgid "could not parse %s"

1173 msgstr ""

1174

1174 -#: commit.c:43

1175 +#: commit.c:45

1176 #, c-format

1177 msgid "%s %s is not a commit!"

1178 msgstr ""

1179

1179 -#: commit.c:1506

1180 +#: commit.c:182

1181 +msgid ""

1182 +"Support for <GIT_DIR>/info/grafts is deprecated\n"

1183 +"and will be removed in a future Git version.\n"

1184 +"\n"

1185 +"Please use \"git replace --convert-graft-file\"\n"

1186 +"to convert the grafts into replace refs.\n"

1187 +"\n"

1188 +"Turn this message off by running\n"

1189 +"\"git config advice.graftFileDeprecated false\""

1190 +msgstr ""

1191 +

1192 +#: commit.c:1537

1193 msgid ""

1194 "Warning: commit message did not conform to UTF-8.\n"

1195 "You may want to amend it after fixing the message, or set the config\n"

1196 "variable i18n.commitencoding to the encoding your project uses.\n"

1197 msgstr ""

1198

1199 +#: commit-graph.c:669

1200 +#, c-format

1201 +msgid "the commit graph format cannot write %d commits"

1202 +msgstr ""

1203 +

1204 +#: commit-graph.c:696

1205 +msgid "too many commits to write graph"

1206 +msgstr ""

1207 +

1208 +#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1209 +#, c-format

1210 +msgid "cannot mkdir %s"

1211 +msgstr ""

1212 +

1213 #: compat/obstack.c:405 compat/obstack.c:407

1214 msgid "memory exhausted"

1215 msgstr ""

1216

1190 -#: config.c:186

1217 +#: config.c:187

1218 msgid "relative config include conditionals must come from files"

1219 msgstr ""

1220

1194 -#: config.c:720

1221 +#: config.c:788

1222 #, c-format

1223 msgid "bad config line %d in blob %s"

1224 msgstr ""

1225

1199 -#: config.c:724

1226 +#: config.c:792

1227 #, c-format

1228 msgid "bad config line %d in file %s"

1229 msgstr ""

1230

1204 -#: config.c:728

1231 +#: config.c:796

1232 #, c-format

1233 msgid "bad config line %d in standard input"

1234 msgstr ""

1235

1209 -#: config.c:732

1236 +#: config.c:800

1237 #, c-format

1238 msgid "bad config line %d in submodule-blob %s"

1239 msgstr ""

1240

1214 -#: config.c:736

1241 +#: config.c:804

1242 #, c-format

1243 msgid "bad config line %d in command line %s"

1244 msgstr ""

1245

1219 -#: config.c:740

1246 +#: config.c:808

1247 #, c-format

1248 msgid "bad config line %d in %s"

1249 msgstr ""

1250

1224 -#: config.c:868

1251 +#: config.c:936

1252 msgid "out of range"

1253 msgstr ""

1254

1228 -#: config.c:868

1255 +#: config.c:936

1256 msgid "invalid unit"

1257 msgstr ""

1258

1232 -#: config.c:874

1259 +#: config.c:942

1260 #, c-format

1261 msgid "bad numeric config value '%s' for '%s': %s"

1262 msgstr ""

1263

1237 -#: config.c:879

1264 +#: config.c:947

1265 #, c-format

1266 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1267 msgstr ""

1268

1242 -#: config.c:882

1269 +#: config.c:950

1270 #, c-format

1271 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1272 msgstr ""

1273

1247 -#: config.c:885

1274 +#: config.c:953

1275 #, c-format

1276 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1277 msgstr ""

1278

1252 -#: config.c:888

1279 +#: config.c:956

1280 #, c-format

1281 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1282 msgstr ""

1283

1257 -#: config.c:891

1284 +#: config.c:959

1285 #, c-format

1286 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1287 msgstr ""

1288

1262 -#: config.c:894

1289 +#: config.c:962

1290 #, c-format

1291 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1292 msgstr ""

1293

1267 -#: config.c:989

1294 +#: config.c:1057

1295 #, c-format

1296 msgid "failed to expand user dir in: '%s'"

1297 msgstr ""

1298

1272 -#: config.c:998

1299 +#: config.c:1066

1300 #, c-format

1301 msgid "'%s' for '%s' is not a valid timestamp"

1302 msgstr ""

1303

1277 -#: config.c:1094 config.c:1105

1304 +#: config.c:1171 config.c:1182

1305 #, c-format

1306 msgid "bad zlib compression level %d"

1307 msgstr ""

1308

1282 -#: config.c:1225

1309 +#: config.c:1307

1310 #, c-format

1311 msgid "invalid mode for object creation: %s"

1312 msgstr ""

1313

1287 -#: config.c:1386

1314 +#: config.c:1473

1315 #, c-format

1316 msgid "bad pack compression level %d"

1317 msgstr ""

1318

1292 -#: config.c:1582

1319 +#: config.c:1681

1320 msgid "unable to parse command-line config"

1321 msgstr ""

1322

1296 -#: config.c:1914

1323 +#: config.c:2013

1324 msgid "unknown error occurred while reading the configuration files"

1325 msgstr ""

1326

1300 -#: config.c:2101

1327 +#: config.c:2200

1328 #, c-format

1329 msgid "Invalid %s: '%s'"

1330 msgstr ""

1331

1305 -#: config.c:2144

1332 +#: config.c:2243

1333 #, c-format

1334 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1335 msgstr ""

1336

1310 -#: config.c:2170

1337 +#: config.c:2269

1338 #, c-format

1339 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1340 msgstr ""

1341

1315 -#: config.c:2195

1342 +#: config.c:2294

1343 #, c-format

1344 msgid "unable to parse '%s' from command-line config"

1345 msgstr ""

1346

1320 -#: config.c:2197

1347 +#: config.c:2296

1348 #, c-format

1349 msgid "bad config variable '%s' in file '%s' at line %d"

1350 msgstr ""

1351

1325 -#: config.c:2256

1352 +#: config.c:2402

1353 #, c-format

1354 msgid "%s has multiple values"

1355 msgstr ""

1356

1330 -#: config.c:2599 config.c:2816

1357 +#: config.c:2766 config.c:3019

1358 #, c-format

1359 msgid "fstat on %s failed"

1360 msgstr ""

1361

1335 -#: config.c:2706

1362 +#: config.c:2905

1363 #, c-format

1364 msgid "could not set '%s' to '%s'"

1365 msgstr ""

1366

1340 -#: config.c:2708 builtin/remote.c:776

1367 +#: config.c:2907 builtin/remote.c:779

1368 #, c-format

1369 msgid "could not unset '%s'"

1370 msgstr ""

1371

1345 -#: connect.c:52

1372 +#: connect.c:60

1373 msgid "The remote end hung up upon initial contact"

1374 msgstr ""

1375

1349 -#: connect.c:54

1376 +#: connect.c:62

1377 msgid ""

1378 "Could not read from remote repository.\n"

1379 "\n"

@@ -1354,7 +1381,7 @@ msgid ""

1381 "and the repository exists."

1382 msgstr ""

1383

1357 -#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144

1384 +#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1385 msgid "Checking connectivity"

1386 msgstr ""

1387

@@ -1370,30 +1397,68 @@ msgstr ""

1397 msgid "failed to close rev-list's stdin"

1398 msgstr ""

1399

1373 -#: convert.c:205

1400 +#: convert.c:206

1401 #, c-format

1402 msgid "CRLF would be replaced by LF in %s."

1403 msgstr ""

1404

1378 -#: convert.c:207

1405 +#: convert.c:208

1406 #, c-format

1407 msgid ""

1408 "CRLF will be replaced by LF in %s.\n"

1409 "The file will have its original line endings in your working directory."

1410 msgstr ""

1411

1385 -#: convert.c:215

1412 +#: convert.c:216

1413 #, c-format

1414 msgid "LF would be replaced by CRLF in %s"

1415 msgstr ""

1416

1390 -#: convert.c:217

1417 +#: convert.c:218

1418 #, c-format

1419 msgid ""

1420 "LF will be replaced by CRLF in %s.\n"

1421 "The file will have its original line endings in your working directory."

1422 msgstr ""

1423

1424 +#: convert.c:279

1425 +#, c-format

1426 +msgid "BOM is prohibited in '%s' if encoded as %s"

1427 +msgstr ""

1428 +

1429 +#: convert.c:286

1430 +#, c-format

1431 +msgid ""

1432 +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

1433 +"tree-encoding."

1434 +msgstr ""

1435 +

1436 +#: convert.c:304

1437 +#, c-format

1438 +msgid "BOM is required in '%s' if encoded as %s"

1439 +msgstr ""

1440 +

1441 +#: convert.c:306

1442 +#, c-format

1443 +msgid ""

1444 +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

1445 +"%sLE (depending on the byte order) as working-tree-encoding."

1446 +msgstr ""

1447 +

1448 +#: convert.c:424

1449 +#, c-format

1450 +msgid "failed to encode '%s' from %s to %s"

1451 +msgstr ""

1452 +

1453 +#: convert.c:467

1454 +#, c-format

1455 +msgid "encoding '%s' from %s to %s and back is not the same"

1456 +msgstr ""

1457 +

1458 +#: convert.c:1225

1459 +msgid "true/false are no valid working-tree-encodings"

1460 +msgstr ""

1461 +

1462 #: date.c:116

1463 msgid "in the future"

1464 msgstr ""

@@ -1504,68 +1569,68 @@ msgid ""

1569 "%s"

1570 msgstr ""

1571

1507 -#: diff.c:3822

1572 +#: diff.c:3823

1573 #, c-format

1574 msgid "external diff died, stopping at %s"

1575 msgstr ""

1576

1512 -#: diff.c:4146

1577 +#: diff.c:4153

1578 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1579 msgstr ""

1580

1516 -#: diff.c:4149

1581 +#: diff.c:4156

1582 msgid "-G, -S and --find-object are mutually exclusive"

1583 msgstr ""

1584

1520 -#: diff.c:4237

1585 +#: diff.c:4244

1586 msgid "--follow requires exactly one pathspec"

1587 msgstr ""

1588

1524 -#: diff.c:4403

1589 +#: diff.c:4410

1590 #, c-format

1591 msgid ""

1592 "Failed to parse --dirstat/-X option parameter:\n"

1593 "%s"

1594 msgstr ""

1595

1531 -#: diff.c:4417

1596 +#: diff.c:4424

1597 #, c-format

1598 msgid "Failed to parse --submodule option parameter: '%s'"

1599 msgstr ""

1600

1536 -#: diff.c:5493

1601 +#: diff.c:5500

1602 msgid "inexact rename detection was skipped due to too many files."

1603 msgstr ""

1604

1540 -#: diff.c:5496

1605 +#: diff.c:5503

1606 msgid "only found copies from modified paths due to too many files."

1607 msgstr ""

1608

1544 -#: diff.c:5499

1609 +#: diff.c:5506

1610 #, c-format

1611 msgid ""

1612 "you may want to set your %s variable to at least %d and retry the command."

1613 msgstr ""

1614

1550 -#: dir.c:1866

1615 +#: dir.c:1867

1616 #, c-format

1617 msgid "could not open directory '%s'"

1618 msgstr ""

1619

1555 -#: dir.c:2108

1620 +#: dir.c:2109

1621 msgid "failed to get kernel name and information"

1622 msgstr ""

1623

1559 -#: dir.c:2232

1624 +#: dir.c:2233

1625 msgid "Untracked cache is disabled on this system or location."

1626 msgstr ""

1627

1563 -#: dir.c:3024 dir.c:3029

1628 +#: dir.c:3075 dir.c:3080

1629 #, c-format

1630 msgid "could not create directories for %s"

1631 msgstr ""

1632

1568 -#: dir.c:3054

1633 +#: dir.c:3109

1634 #, c-format

1635 msgid "could not migrate git directory from '%s' to '%s'"

1636 msgstr ""

@@ -1588,201 +1653,205 @@ msgstr ""

1653 msgid "Remote with no URL"

1654 msgstr ""

1655

1591 -#: fetch-pack.c:253

1656 +#: fetch-pack.c:254

1657 msgid "git fetch-pack: expected shallow list"

1658 msgstr ""

1659

1595 -#: fetch-pack.c:265

1660 +#: fetch-pack.c:266

1661 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

1662 msgstr ""

1663

1599 -#: fetch-pack.c:284 builtin/archive.c:63

1664 +#: fetch-pack.c:285 builtin/archive.c:63

1665 #, c-format

1666 msgid "remote error: %s"

1667 msgstr ""

1668

1604 -#: fetch-pack.c:285

1669 +#: fetch-pack.c:286

1670 #, c-format

1671 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1672 msgstr ""

1673

1609 -#: fetch-pack.c:337

1674 +#: fetch-pack.c:338

1675 msgid "--stateless-rpc requires multi_ack_detailed"

1676 msgstr ""

1677

1613 -#: fetch-pack.c:428

1678 +#: fetch-pack.c:429 fetch-pack.c:1310

1679 #, c-format

1680 msgid "invalid shallow line: %s"

1681 msgstr ""

1682

1618 -#: fetch-pack.c:434

1683 +#: fetch-pack.c:435 fetch-pack.c:1316

1684 #, c-format

1685 msgid "invalid unshallow line: %s"

1686 msgstr ""

1687

1623 -#: fetch-pack.c:436

1688 +#: fetch-pack.c:437 fetch-pack.c:1318

1689 #, c-format

1690 msgid "object not found: %s"

1691 msgstr ""

1692

1628 -#: fetch-pack.c:439

1693 +#: fetch-pack.c:440 fetch-pack.c:1321

1694 #, c-format

1695 msgid "error in object: %s"

1696 msgstr ""

1697

1633 -#: fetch-pack.c:441

1698 +#: fetch-pack.c:442 fetch-pack.c:1323

1699 #, c-format

1700 msgid "no shallow found: %s"

1701 msgstr ""

1702

1638 -#: fetch-pack.c:444

1703 +#: fetch-pack.c:445 fetch-pack.c:1326

1704 #, c-format

1705 msgid "expected shallow/unshallow, got %s"

1706 msgstr ""

1707

1643 -#: fetch-pack.c:485

1708 +#: fetch-pack.c:486

1709 #, c-format

1710 msgid "got %s %d %s"

1711 msgstr ""

1712

1648 -#: fetch-pack.c:499

1713 +#: fetch-pack.c:500

1714 #, c-format

1715 msgid "invalid commit %s"

1716 msgstr ""

1717

1653 -#: fetch-pack.c:532

1718 +#: fetch-pack.c:533

1719 msgid "giving up"

1720 msgstr ""

1721

1657 -#: fetch-pack.c:542 progress.c:229

1722 +#: fetch-pack.c:543 progress.c:229

1723 msgid "done"

1724 msgstr ""

1725

1661 -#: fetch-pack.c:554

1726 +#: fetch-pack.c:555

1727 #, c-format

1728 msgid "got %s (%d) %s"

1729 msgstr ""

1730

1666 -#: fetch-pack.c:600

1731 +#: fetch-pack.c:601

1732 #, c-format

1733 msgid "Marking %s as complete"

1734 msgstr ""

1735

1671 -#: fetch-pack.c:788

1736 +#: fetch-pack.c:828

1737 #, c-format

1738 msgid "already have %s (%s)"

1739 msgstr ""

1740

1676 -#: fetch-pack.c:829

1741 +#: fetch-pack.c:869

1742 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1743 msgstr ""

1744

1680 -#: fetch-pack.c:837

1745 +#: fetch-pack.c:877

1746 msgid "protocol error: bad pack header"

1747 msgstr ""

1748

1684 -#: fetch-pack.c:895

1749 +#: fetch-pack.c:944

1750 #, c-format

1751 msgid "fetch-pack: unable to fork off %s"

1752 msgstr ""

1753

1689 -#: fetch-pack.c:911

1754 +#: fetch-pack.c:960

1755 #, c-format

1756 msgid "%s failed"

1757 msgstr ""

1758

1694 -#: fetch-pack.c:913

1759 +#: fetch-pack.c:962

1760 msgid "error in sideband demultiplexer"

1761 msgstr ""

1762

1698 -#: fetch-pack.c:940

1763 +#: fetch-pack.c:989

1764 msgid "Server does not support shallow clients"

1765 msgstr ""

1766

1702 -#: fetch-pack.c:944

1767 +#: fetch-pack.c:993

1768 msgid "Server supports multi_ack_detailed"

1769 msgstr ""

1770

1706 -#: fetch-pack.c:947

1771 +#: fetch-pack.c:996

1772 msgid "Server supports no-done"

1773 msgstr ""

1774

1710 -#: fetch-pack.c:953

1775 +#: fetch-pack.c:1002

1776 msgid "Server supports multi_ack"

1777 msgstr ""

1778

1714 -#: fetch-pack.c:957

1779 +#: fetch-pack.c:1006

1780 msgid "Server supports side-band-64k"

1781 msgstr ""

1782

1718 -#: fetch-pack.c:961

1783 +#: fetch-pack.c:1010

1784 msgid "Server supports side-band"

1785 msgstr ""

1786

1722 -#: fetch-pack.c:965

1787 +#: fetch-pack.c:1014

1788 msgid "Server supports allow-tip-sha1-in-want"

1789 msgstr ""

1790

1726 -#: fetch-pack.c:969

1791 +#: fetch-pack.c:1018

1792 msgid "Server supports allow-reachable-sha1-in-want"

1793 msgstr ""

1794

1730 -#: fetch-pack.c:979

1795 +#: fetch-pack.c:1028

1796 msgid "Server supports ofs-delta"

1797 msgstr ""

1798

1734 -#: fetch-pack.c:985

1799 +#: fetch-pack.c:1034 fetch-pack.c:1204

1800 msgid "Server supports filter"

1801 msgstr ""

1802

1738 -#: fetch-pack.c:993

1803 +#: fetch-pack.c:1042

1804 #, c-format

1805 msgid "Server version is %.*s"

1806 msgstr ""

1807

1743 -#: fetch-pack.c:999

1808 +#: fetch-pack.c:1048

1809 msgid "Server does not support --shallow-since"

1810 msgstr ""

1811

1747 -#: fetch-pack.c:1003

1812 +#: fetch-pack.c:1052

1813 msgid "Server does not support --shallow-exclude"

1814 msgstr ""

1815

1751 -#: fetch-pack.c:1005

1816 +#: fetch-pack.c:1054

1817 msgid "Server does not support --deepen"

1818 msgstr ""

1819

1755 -#: fetch-pack.c:1016

1820 +#: fetch-pack.c:1065

1821 msgid "no common commits"

1822 msgstr ""

1823

1759 -#: fetch-pack.c:1028

1824 +#: fetch-pack.c:1077 fetch-pack.c:1414

1825 msgid "git fetch-pack: fetch failed."

1826 msgstr ""

1827

1763 -#: fetch-pack.c:1190

1828 +#: fetch-pack.c:1199

1829 +msgid "Server does not support shallow requests"

1830 +msgstr ""

1831 +

1832 +#: fetch-pack.c:1584

1833 msgid "no matching remote head"

1834 msgstr ""

1835

1767 -#: fetch-pack.c:1212

1836 +#: fetch-pack.c:1610

1837 #, c-format

1838 msgid "no such remote ref %s"

1839 msgstr ""

1840

1772 -#: fetch-pack.c:1215

1841 +#: fetch-pack.c:1613

1842 #, c-format

1843 msgid "Server does not allow request for unadvertised object %s"

1844 msgstr ""

1845

1777 -#: gpg-interface.c:181

1846 +#: gpg-interface.c:185

1847 msgid "gpg failed to sign the data"

1848 msgstr ""

1849

1781 -#: gpg-interface.c:211

1850 +#: gpg-interface.c:210

1851 msgid "could not create temporary file"

1852 msgstr ""

1853

1785 -#: gpg-interface.c:214

1854 +#: gpg-interface.c:213

1855 #, c-format

1856 msgid "failed writing detached signature to '%s'"

1857 msgstr ""

@@ -1792,18 +1861,18 @@ msgstr ""

1861 msgid "ignore invalid color '%.*s' in log.graphColors"

1862 msgstr ""

1863

1795 -#: grep.c:2022

1864 +#: grep.c:2020

1865 #, c-format

1866 msgid "'%s': unable to read %s"

1867 msgstr ""

1868

1800 -#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81

1869 +#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

1870 #: builtin/rm.c:134

1871 #, c-format

1872 msgid "failed to stat '%s'"

1873 msgstr ""

1874

1806 -#: grep.c:2050

1875 +#: grep.c:2048

1876 #, c-format

1877 msgid "'%s': short read"

1878 msgstr ""

@@ -1924,7 +1993,7 @@ msgstr ""

1993 msgid "name consists only of disallowed characters: %s"

1994 msgstr ""

1995

1927 -#: ident.c:416 builtin/commit.c:582

1996 +#: ident.c:416 builtin/commit.c:587

1997 #, c-format

1998 msgid "invalid date format: %s"

1999 msgstr ""

@@ -1954,261 +2023,378 @@ msgstr ""

2023 msgid "Unable to create '%s.lock': %s"

2024 msgstr ""

2025

1957 -#: merge.c:74

2026 +#: merge.c:71

2027 msgid "failed to read the cache"

2028 msgstr ""

2029

1961 -#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

1962 -#: builtin/checkout.c:599 builtin/clone.c:759

2030 +#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2031 +#: builtin/checkout.c:606 builtin/clone.c:761

2032 msgid "unable to write new index file"

2033 msgstr ""

2034

1966 -#: merge-recursive.c:235

2035 +#: merge-recursive.c:298

2036 msgid "(bad commit)\n"

2037 msgstr ""

2038

1970 -#: merge-recursive.c:257 merge-recursive.c:265

2039 +#: merge-recursive.c:320

2040 +#, c-format

2041 +msgid "add_cacheinfo failed for path '%s'; merge aborting."

2042 +msgstr ""

2043 +

2044 +#: merge-recursive.c:328

2045 #, c-format

1972 -msgid "addinfo_cache failed for path '%s'"

2046 +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2047 msgstr ""

2048

1975 -#: merge-recursive.c:329

2049 +#: merge-recursive.c:410

2050 msgid "error building trees"

2051 msgstr ""

2052

1979 -#: merge-recursive.c:771

2053 +#: merge-recursive.c:881

2054 #, c-format

2055 msgid "failed to create path '%s'%s"

2056 msgstr ""

2057

1984 -#: merge-recursive.c:782

2058 +#: merge-recursive.c:892

2059 #, c-format

2060 msgid "Removing %s to make room for subdirectory\n"

2061 msgstr ""

2062

1989 -#: merge-recursive.c:796 merge-recursive.c:815

2063 +#: merge-recursive.c:906 merge-recursive.c:925

2064 msgid ": perhaps a D/F conflict?"

2065 msgstr ""

2066

1993 -#: merge-recursive.c:805

2067 +#: merge-recursive.c:915

2068 #, c-format

2069 msgid "refusing to lose untracked file at '%s'"

2070 msgstr ""

2071

1998 -#: merge-recursive.c:847 builtin/cat-file.c:37

2072 +#: merge-recursive.c:957 builtin/cat-file.c:37

2073 #, c-format

2074 msgid "cannot read object %s '%s'"

2075 msgstr ""

2076

2003 -#: merge-recursive.c:849

2077 +#: merge-recursive.c:959

2078 #, c-format

2079 msgid "blob expected for %s '%s'"

2080 msgstr ""

2081

2008 -#: merge-recursive.c:873

2082 +#: merge-recursive.c:983

2083 #, c-format

2084 msgid "failed to open '%s': %s"

2085 msgstr ""

2086

2013 -#: merge-recursive.c:884

2087 +#: merge-recursive.c:994

2088 #, c-format

2089 msgid "failed to symlink '%s': %s"

2090 msgstr ""

2091

2018 -#: merge-recursive.c:889

2092 +#: merge-recursive.c:999

2093 #, c-format

2094 msgid "do not know what to do with %06o %s '%s'"

2095 msgstr ""

2096

2023 -#: merge-recursive.c:1029

2097 +#: merge-recursive.c:1186

2098 +#, c-format

2099 +msgid "Failed to merge submodule %s (not checked out)"

2100 +msgstr ""

2101 +

2102 +#: merge-recursive.c:1193

2103 +#, c-format

2104 +msgid "Failed to merge submodule %s (commits not present)"

2105 +msgstr ""

2106 +

2107 +#: merge-recursive.c:1200

2108 +#, c-format

2109 +msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2110 +msgstr ""

2111 +

2112 +#: merge-recursive.c:1208 merge-recursive.c:1220

2113 +#, c-format

2114 +msgid "Fast-forwarding submodule %s to the following commit:"

2115 +msgstr ""

2116 +

2117 +#: merge-recursive.c:1211 merge-recursive.c:1223

2118 +#, c-format

2119 +msgid "Fast-forwarding submodule %s to %s"

2120 +msgstr ""

2121 +

2122 +#: merge-recursive.c:1245

2123 +#, c-format

2124 +msgid "Failed to merge submodule %s (merge following commits not found)"

2125 +msgstr ""

2126 +

2127 +#: merge-recursive.c:1249

2128 +#, c-format

2129 +msgid "Failed to merge submodule %s (not fast-forward)"

2130 +msgstr ""

2131 +

2132 +#: merge-recursive.c:1250

2133 +msgid "Found a possible merge resolution for the submodule:\n"

2134 +msgstr ""

2135 +

2136 +#: merge-recursive.c:1253

2137 +#, c-format

2138 +msgid ""

2139 +"If this is correct simply add it to the index for example\n"

2140 +"by using:\n"

2141 +"\n"

2142 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

2143 +"\n"

2144 +"which will accept this suggestion.\n"

2145 +msgstr ""

2146 +

2147 +#: merge-recursive.c:1262

2148 +#, c-format

2149 +msgid "Failed to merge submodule %s (multiple merges found)"

2150 +msgstr ""

2151 +

2152 +#: merge-recursive.c:1321

2153 msgid "Failed to execute internal merge"

2154 msgstr ""

2155

2027 -#: merge-recursive.c:1034

2156 +#: merge-recursive.c:1326

2157 #, c-format

2158 msgid "Unable to add %s to database"

2159 msgstr ""

2160

2032 -#: merge-recursive.c:1146

2161 +#: merge-recursive.c:1358

2162 +#, c-format

2163 +msgid "Auto-merging %s"

2164 +msgstr ""

2165 +

2166 +#: merge-recursive.c:1423

2167 +#, c-format

2168 +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

2169 +msgstr ""

2170 +

2171 +#: merge-recursive.c:1475

2172 #, c-format

2173 msgid ""

2174 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

2175 "in tree."

2176 msgstr ""

2177

2039 -#: merge-recursive.c:1151

2178 +#: merge-recursive.c:1480

2179 #, c-format

2180 msgid ""

2181 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2182 "left in tree."

2183 msgstr ""

2184

2046 -#: merge-recursive.c:1158

2185 +#: merge-recursive.c:1487

2186 #, c-format

2187 msgid ""

2188 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

2189 "in tree at %s."

2190 msgstr ""

2191

2053 -#: merge-recursive.c:1163

2192 +#: merge-recursive.c:1492

2193 #, c-format

2194 msgid ""

2195 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2196 "left in tree at %s."

2197 msgstr ""

2198

2060 -#: merge-recursive.c:1197

2199 +#: merge-recursive.c:1526

2200 msgid "rename"

2201 msgstr ""

2202

2064 -#: merge-recursive.c:1197

2203 +#: merge-recursive.c:1526

2204 msgid "renamed"

2205 msgstr ""

2206

2068 -#: merge-recursive.c:1254

2207 +#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2208 +#: merge-recursive.c:3086

2209 +#, c-format

2210 +msgid "Refusing to lose dirty file at %s"

2211 +msgstr ""

2212 +

2213 +#: merge-recursive.c:1594

2214 #, c-format

2215 msgid "%s is a directory in %s adding as %s instead"

2216 msgstr ""

2217

2073 -#: merge-recursive.c:1279

2218 +#: merge-recursive.c:1599

2219 +#, c-format

2220 +msgid "Refusing to lose untracked file at %s; adding as %s instead"

2221 +msgstr ""

2222 +

2223 +#: merge-recursive.c:1625

2224 #, c-format

2225 msgid ""

2226 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

2227 "\"->\"%s\" in \"%s\"%s"

2228 msgstr ""

2229

2080 -#: merge-recursive.c:1284

2230 +#: merge-recursive.c:1630

2231 msgid " (left unresolved)"

2232 msgstr ""

2233

2084 -#: merge-recursive.c:1346

2234 +#: merge-recursive.c:1694

2235 #, c-format

2236 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2237 msgstr ""

2238

2089 -#: merge-recursive.c:1379

2239 +#: merge-recursive.c:1733

2240 #, c-format

2241 msgid "Renaming %s to %s and %s to %s instead"

2242 msgstr ""

2243

2094 -#: merge-recursive.c:1582

2244 +#: merge-recursive.c:1745

2245 +#, c-format

2246 +msgid "Refusing to lose untracked file at %s, even though it's in the way."

2247 +msgstr ""

2248 +

2249 +#: merge-recursive.c:1951

2250 +#, c-format

2251 +msgid ""

2252 +"CONFLICT (directory rename split): Unclear where to place %s because "

2253 +"directory %s was renamed to multiple other directories, with no destination "

2254 +"getting a majority of the files."

2255 +msgstr ""

2256 +

2257 +#: merge-recursive.c:1983

2258 +#, c-format

2259 +msgid ""

2260 +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

2261 +"implicit directory rename(s) putting the following path(s) there: %s."

2262 +msgstr ""

2263 +

2264 +#: merge-recursive.c:1993

2265 +#, c-format

2266 +msgid ""

2267 +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

2268 +"implicit directory renames tried to put these paths there: %s"

2269 +msgstr ""

2270 +

2271 +#: merge-recursive.c:2085

2272 +#, c-format

2273 +msgid ""

2274 +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

2275 +">%s in %s"

2276 +msgstr ""

2277 +

2278 +#: merge-recursive.c:2330

2279 +#, c-format

2280 +msgid ""

2281 +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

2282 +"renamed."

2283 +msgstr ""

2284 +

2285 +#: merge-recursive.c:2736

2286 #, c-format

2287 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2288 msgstr ""

2289

2099 -#: merge-recursive.c:1597

2290 +#: merge-recursive.c:2751

2291 #, c-format

2292 msgid "Adding merged %s"

2293 msgstr ""

2294

2104 -#: merge-recursive.c:1604 merge-recursive.c:1834

2295 +#: merge-recursive.c:2758 merge-recursive.c:3089

2296 #, c-format

2297 msgid "Adding as %s instead"

2298 msgstr ""

2299

2109 -#: merge-recursive.c:1661

2300 +#: merge-recursive.c:2914

2301 #, c-format

2302 msgid "cannot read object %s"

2303 msgstr ""

2304

2114 -#: merge-recursive.c:1664

2305 +#: merge-recursive.c:2917

2306 #, c-format

2307 msgid "object %s is not a blob"

2308 msgstr ""

2309

2119 -#: merge-recursive.c:1733

2310 +#: merge-recursive.c:2986

2311 msgid "modify"

2312 msgstr ""

2313

2123 -#: merge-recursive.c:1733

2314 +#: merge-recursive.c:2986

2315 msgid "modified"

2316 msgstr ""

2317

2127 -#: merge-recursive.c:1743

2318 +#: merge-recursive.c:2997

2319 msgid "content"

2320 msgstr ""

2321

2131 -#: merge-recursive.c:1750

2322 +#: merge-recursive.c:3004

2323 msgid "add/add"

2324 msgstr ""

2325

2135 -#: merge-recursive.c:1786

2326 +#: merge-recursive.c:3046

2327 #, c-format

2328 msgid "Skipped %s (merged same as existing)"

2329 msgstr ""

2330

2140 -#: merge-recursive.c:1800

2141 -#, c-format

2142 -msgid "Auto-merging %s"

2143 -msgstr ""

2144 -

2145 -#: merge-recursive.c:1804 git-submodule.sh:879

2331 +#: merge-recursive.c:3055 git-submodule.sh:895

2332 msgid "submodule"

2333 msgstr ""

2334

2149 -#: merge-recursive.c:1805

2335 +#: merge-recursive.c:3056

2336 #, c-format

2337 msgid "CONFLICT (%s): Merge conflict in %s"

2338 msgstr ""

2339

2154 -#: merge-recursive.c:1899

2340 +#: merge-recursive.c:3178

2341 #, c-format

2342 msgid "Removing %s"

2343 msgstr ""

2344

2159 -#: merge-recursive.c:1925

2345 +#: merge-recursive.c:3204

2346 msgid "file/directory"

2347 msgstr ""

2348

2163 -#: merge-recursive.c:1931

2349 +#: merge-recursive.c:3210

2350 msgid "directory/file"

2351 msgstr ""

2352

2167 -#: merge-recursive.c:1938

2353 +#: merge-recursive.c:3217

2354 #, c-format

2355 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2356 msgstr ""

2357

2172 -#: merge-recursive.c:1947

2358 +#: merge-recursive.c:3226

2359 #, c-format

2360 msgid "Adding %s"

2361 msgstr ""

2362

2177 -#: merge-recursive.c:1987

2363 +#: merge-recursive.c:3267

2364 #, c-format

2365 msgid "Dirty index: cannot merge (dirty: %s)"

2366 msgstr ""

2367

2182 -#: merge-recursive.c:1991

2368 +#: merge-recursive.c:3271

2369 msgid "Already up to date!"

2370 msgstr ""

2371

2186 -#: merge-recursive.c:2000

2372 +#: merge-recursive.c:3280

2373 #, c-format

2374 msgid "merging of trees %s and %s failed"

2375 msgstr ""

2376

2191 -#: merge-recursive.c:2097

2377 +#: merge-recursive.c:3379

2378 msgid "Merging:"

2379 msgstr ""

2380

2195 -#: merge-recursive.c:2110

2381 +#: merge-recursive.c:3392

2382 #, c-format

2383 msgid "found %u common ancestor:"

2384 msgid_plural "found %u common ancestors:"

2385 msgstr[0] ""

2386 msgstr[1] ""

2387

2202 -#: merge-recursive.c:2149

2388 +#: merge-recursive.c:3431

2389 msgid "merge returned no commit"

2390 msgstr ""

2391

2206 -#: merge-recursive.c:2212

2392 +#: merge-recursive.c:3495

2393 #, c-format

2394 msgid "Could not parse object '%s'"

2395 msgstr ""

2396

2211 -#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816

2397 +#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815

2398 msgid "Unable to write index."

2399 msgstr ""

2400

@@ -2248,30 +2434,30 @@ msgstr ""

2434 msgid "Bad %s value: '%s'"

2435 msgstr ""

2436

2251 -#: object.c:239

2437 +#: object.c:242

2438 #, c-format

2439 msgid "unable to parse object: %s"

2440 msgstr ""

2441

2256 -#: packfile.c:561

2442 +#: packfile.c:563

2443 msgid "offset before end of packfile (broken .idx?)"

2444 msgstr ""

2445

2260 -#: packfile.c:1694

2446 +#: packfile.c:1742

2447 #, c-format

2448 msgid "offset before start of pack index for %s (corrupt index?)"

2449 msgstr ""

2450

2265 -#: packfile.c:1698

2451 +#: packfile.c:1746

2452 #, c-format

2453 msgid "offset beyond end of pack index for %s (truncated index?)"

2454 msgstr ""

2455

2270 -#: parse-options.c:619

2456 +#: parse-options.c:621

2457 msgid "..."

2458 msgstr ""

2459

2274 -#: parse-options.c:638

2460 +#: parse-options.c:640

2461 #, c-format

2462 msgid "usage: %s"

2463 msgstr ""

@@ -2279,26 +2465,31 @@ msgstr ""

2465 #. TRANSLATORS: the colon here should align with the

2466 #. one in "usage: %s" translation.

2467 #.

2282 -#: parse-options.c:644

2468 +#: parse-options.c:646

2469 #, c-format

2470 msgid " or: %s"

2471 msgstr ""

2472

2287 -#: parse-options.c:647

2473 +#: parse-options.c:649

2474 #, c-format

2475 msgid " %s"

2476 msgstr ""

2477

2292 -#: parse-options.c:686

2478 +#: parse-options.c:688

2479 msgid "-NUM"

2480 msgstr ""

2481

2296 -#: parse-options-cb.c:108

2482 +#: parse-options-cb.c:44

2483 +#, c-format

2484 +msgid "malformed expiration date '%s'"

2485 +msgstr ""

2486 +

2487 +#: parse-options-cb.c:112

2488 #, c-format

2489 msgid "malformed object name '%s'"

2490 msgstr ""

2491

2301 -#: path.c:891

2492 +#: path.c:892

2493 #, c-format

2494 msgid "Could not make %s writable by group"

2495 msgstr ""

@@ -2378,66 +2569,67 @@ msgstr ""

2569 msgid "unable to parse --pretty format"

2570 msgstr ""

2571

2381 -#: read-cache.c:1473

2572 +#: read-cache.c:1500

2573 #, c-format

2574 msgid ""

2575 "index.version set, but the value is invalid.\n"

2576 "Using version %i"

2577 msgstr ""

2578

2388 -#: read-cache.c:1483

2579 +#: read-cache.c:1510

2580 #, c-format

2581 msgid ""

2582 "GIT_INDEX_VERSION set, but the value is invalid.\n"

2583 "Using version %i"

2584 msgstr ""

2585

2395 -#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049

2586 +#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047

2587 #, c-format

2588 msgid "could not close '%s'"

2589 msgstr ""

2590

2400 -#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627

2591 +#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233

2592 #, c-format

2593 msgid "could not stat '%s'"

2594 msgstr ""

2595

2405 -#: read-cache.c:2461

2596 +#: read-cache.c:2490

2597 #, c-format

2598 msgid "unable to open git dir: %s"

2599 msgstr ""

2600

2410 -#: read-cache.c:2473

2601 +#: read-cache.c:2502

2602 #, c-format

2603 msgid "unable to unlink: %s"

2604 msgstr ""

2605

2415 -#: refs.c:706

2606 +#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395

2607 +#: builtin/am.c:779

2608 #, c-format

2417 -msgid "Could not open '%s' for writing"

2609 +msgid "could not open '%s' for writing"

2610 msgstr ""

2611

2420 -#: refs.c:1850

2612 +#: refs.c:1880

2613 msgid "ref updates forbidden inside quarantine environment"

2614 msgstr ""

2615

2424 -#: refs/files-backend.c:1189

2616 +#: refs/files-backend.c:1191

2617 #, c-format

2618 msgid "could not remove reference %s"

2619 msgstr ""

2620

2429 -#: refs/files-backend.c:1203 refs/packed-backend.c:1528

2430 -#: refs/packed-backend.c:1538

2621 +#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2622 +#: refs/packed-backend.c:1541

2623 #, c-format

2624 msgid "could not delete reference %s: %s"

2625 msgstr ""

2626

2435 -#: refs/files-backend.c:1206 refs/packed-backend.c:1541

2627 +#: refs/files-backend.c:1208 refs/packed-backend.c:1544

2628 #, c-format

2629 msgid "could not delete references: %s"

2630 msgstr ""

2631

2440 -#: ref-filter.c:35 wt-status.c:1842

2632 +#: ref-filter.c:35 wt-status.c:1850

2633 msgid "gone"

2634 msgstr ""

2635

@@ -2456,157 +2648,162 @@ msgstr ""

2648 msgid "ahead %d, behind %d"

2649 msgstr ""

2650

2459 -#: ref-filter.c:107

2651 +#: ref-filter.c:121

2652 #, c-format

2653 msgid "expected format: %%(color:<color>)"

2654 msgstr ""

2655

2464 -#: ref-filter.c:109

2656 +#: ref-filter.c:123

2657 #, c-format

2658 msgid "unrecognized color: %%(color:%s)"

2659 msgstr ""

2660

2469 -#: ref-filter.c:129

2661 +#: ref-filter.c:145

2662 #, c-format

2663 msgid "Integer value expected refname:lstrip=%s"

2664 msgstr ""

2665

2474 -#: ref-filter.c:133

2666 +#: ref-filter.c:149

2667 #, c-format

2668 msgid "Integer value expected refname:rstrip=%s"

2669 msgstr ""

2670

2479 -#: ref-filter.c:135

2671 +#: ref-filter.c:151

2672 #, c-format

2673 msgid "unrecognized %%(%s) argument: %s"

2674 msgstr ""

2675

2484 -#: ref-filter.c:184

2676 +#: ref-filter.c:206

2677 #, c-format

2678 msgid "%%(body) does not take arguments"

2679 msgstr ""

2680

2489 -#: ref-filter.c:191

2681 +#: ref-filter.c:215

2682 #, c-format

2683 msgid "%%(subject) does not take arguments"

2684 msgstr ""

2685

2494 -#: ref-filter.c:209

2686 +#: ref-filter.c:235

2687 #, c-format

2688 msgid "unknown %%(trailers) argument: %s"

2689 msgstr ""

2690

2499 -#: ref-filter.c:232

2691 +#: ref-filter.c:264

2692 #, c-format

2693 msgid "positive value expected contents:lines=%s"

2694 msgstr ""

2695

2504 -#: ref-filter.c:234

2696 +#: ref-filter.c:266

2697 #, c-format

2698 msgid "unrecognized %%(contents) argument: %s"

2699 msgstr ""

2700

2509 -#: ref-filter.c:247

2701 +#: ref-filter.c:281

2702 #, c-format

2703 msgid "positive value expected objectname:short=%s"

2704 msgstr ""

2705

2514 -#: ref-filter.c:251

2706 +#: ref-filter.c:285

2707 #, c-format

2708 msgid "unrecognized %%(objectname) argument: %s"

2709 msgstr ""

2710

2519 -#: ref-filter.c:278

2711 +#: ref-filter.c:315

2712 #, c-format

2713 msgid "expected format: %%(align:<width>,<position>)"

2714 msgstr ""

2715

2524 -#: ref-filter.c:290

2716 +#: ref-filter.c:327

2717 #, c-format

2718 msgid "unrecognized position:%s"

2719 msgstr ""

2720

2529 -#: ref-filter.c:294

2721 +#: ref-filter.c:334

2722 #, c-format

2723 msgid "unrecognized width:%s"

2724 msgstr ""

2725

2534 -#: ref-filter.c:300

2726 +#: ref-filter.c:343

2727 #, c-format

2728 msgid "unrecognized %%(align) argument: %s"

2729 msgstr ""

2730

2539 -#: ref-filter.c:304

2731 +#: ref-filter.c:351

2732 #, c-format

2733 msgid "positive width expected with the %%(align) atom"

2734 msgstr ""

2735

2544 -#: ref-filter.c:319

2736 +#: ref-filter.c:369

2737 #, c-format

2738 msgid "unrecognized %%(if) argument: %s"

2739 msgstr ""

2740

2549 -#: ref-filter.c:409

2741 +#: ref-filter.c:464

2742 #, c-format

2743 msgid "malformed field name: %.*s"

2744 msgstr ""

2745

2554 -#: ref-filter.c:435

2746 +#: ref-filter.c:491

2747 #, c-format

2748 msgid "unknown field name: %.*s"

2749 msgstr ""

2750

2559 -#: ref-filter.c:547

2751 +#: ref-filter.c:608

2752 #, c-format

2753 msgid "format: %%(if) atom used without a %%(then) atom"

2754 msgstr ""

2755

2564 -#: ref-filter.c:607

2756 +#: ref-filter.c:671

2757 #, c-format

2758 msgid "format: %%(then) atom used without an %%(if) atom"

2759 msgstr ""

2760

2569 -#: ref-filter.c:609

2761 +#: ref-filter.c:673

2762 #, c-format

2763 msgid "format: %%(then) atom used more than once"

2764 msgstr ""

2765

2574 -#: ref-filter.c:611

2766 +#: ref-filter.c:675

2767 #, c-format

2768 msgid "format: %%(then) atom used after %%(else)"

2769 msgstr ""

2770

2579 -#: ref-filter.c:637

2771 +#: ref-filter.c:703

2772 #, c-format

2773 msgid "format: %%(else) atom used without an %%(if) atom"

2774 msgstr ""

2775

2584 -#: ref-filter.c:639

2776 +#: ref-filter.c:705

2777 #, c-format

2778 msgid "format: %%(else) atom used without a %%(then) atom"

2779 msgstr ""

2780

2589 -#: ref-filter.c:641

2781 +#: ref-filter.c:707

2782 #, c-format

2783 msgid "format: %%(else) atom used more than once"

2784 msgstr ""

2785

2594 -#: ref-filter.c:654

2786 +#: ref-filter.c:722

2787 #, c-format

2788 msgid "format: %%(end) atom used without corresponding atom"

2789 msgstr ""

2790

2599 -#: ref-filter.c:709

2791 +#: ref-filter.c:779

2792 #, c-format

2793 msgid "malformed format string %s"

2794 msgstr ""

2795

2604 -#: ref-filter.c:1313

2796 +#: ref-filter.c:1387

2797 #, c-format

2798 msgid "(no branch, rebasing %s)"

2799 msgstr ""

2800

2609 -#: ref-filter.c:1316

2801 +#: ref-filter.c:1390

2802 +#, c-format

2803 +msgid "(no branch, rebasing detached HEAD %s)"

2804 +msgstr ""

2805 +

2806 +#: ref-filter.c:1393

2807 #, c-format

2808 msgid "(no branch, bisect started on %s)"

2809 msgstr ""

@@ -2614,7 +2811,7 @@ msgstr ""

2811 #. TRANSLATORS: make sure this matches "HEAD

2812 #. detached at " in wt-status.c

2813 #.

2617 -#: ref-filter.c:1324

2814 +#: ref-filter.c:1401

2815 #, c-format

2816 msgid "(HEAD detached at %s)"

2817 msgstr ""

@@ -2622,147 +2819,147 @@ msgstr ""

2819 #. TRANSLATORS: make sure this matches "HEAD

2820 #. detached from " in wt-status.c

2821 #.

2625 -#: ref-filter.c:1331

2822 +#: ref-filter.c:1408

2823 #, c-format

2824 msgid "(HEAD detached from %s)"

2825 msgstr ""

2826

2630 -#: ref-filter.c:1335

2827 +#: ref-filter.c:1412

2828 msgid "(no branch)"

2829 msgstr ""

2830

2634 -#: ref-filter.c:1364

2831 +#: ref-filter.c:1442

2832 #, c-format

2833 msgid "missing object %s for %s"

2834 msgstr ""

2835

2639 -#: ref-filter.c:1367

2836 +#: ref-filter.c:1445

2837 #, c-format

2838 msgid "parse_object_buffer failed on %s for %s"

2839 msgstr ""

2840

2644 -#: ref-filter.c:1819

2841 +#: ref-filter.c:1902

2842 #, c-format

2843 msgid "malformed object at '%s'"

2844 msgstr ""

2845

2649 -#: ref-filter.c:1886

2846 +#: ref-filter.c:1984

2847 #, c-format

2848 msgid "ignoring ref with broken name %s"

2849 msgstr ""

2850

2654 -#: ref-filter.c:1891

2851 +#: ref-filter.c:1989

2852 #, c-format

2853 msgid "ignoring broken ref %s"

2854 msgstr ""

2855

2659 -#: ref-filter.c:2152

2856 +#: ref-filter.c:2261

2857 #, c-format

2858 msgid "format: %%(end) atom missing"

2859 msgstr ""

2860

2664 -#: ref-filter.c:2246

2861 +#: ref-filter.c:2365

2862 #, c-format

2863 msgid "malformed object name %s"

2864 msgstr ""

2865

2669 -#: remote.c:795

2866 +#: remote.c:605

2867 #, c-format

2868 msgid "Cannot fetch both %s and %s to %s"

2869 msgstr ""

2870

2674 -#: remote.c:799

2871 +#: remote.c:609

2872 #, c-format

2873 msgid "%s usually tracks %s, not %s"

2874 msgstr ""

2875

2679 -#: remote.c:803

2876 +#: remote.c:613

2877 #, c-format

2878 msgid "%s tracks both %s and %s"

2879 msgstr ""

2880

2684 -#: remote.c:811

2881 +#: remote.c:621

2882 msgid "Internal error"

2883 msgstr ""

2884

2688 -#: remote.c:1726 remote.c:1828

2885 +#: remote.c:1534 remote.c:1635

2886 msgid "HEAD does not point to a branch"

2887 msgstr ""

2888

2692 -#: remote.c:1735

2889 +#: remote.c:1543

2890 #, c-format

2891 msgid "no such branch: '%s'"

2892 msgstr ""

2893

2697 -#: remote.c:1738

2894 +#: remote.c:1546

2895 #, c-format

2896 msgid "no upstream configured for branch '%s'"

2897 msgstr ""

2898

2702 -#: remote.c:1744

2899 +#: remote.c:1552

2900 #, c-format

2901 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2902 msgstr ""

2903

2707 -#: remote.c:1759

2904 +#: remote.c:1567

2905 #, c-format

2906 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2907 msgstr ""

2908

2712 -#: remote.c:1771

2909 +#: remote.c:1579

2910 #, c-format

2911 msgid "branch '%s' has no remote for pushing"

2912 msgstr ""

2913

2717 -#: remote.c:1782

2914 +#: remote.c:1589

2915 #, c-format

2916 msgid "push refspecs for '%s' do not include '%s'"

2917 msgstr ""

2918

2722 -#: remote.c:1795

2919 +#: remote.c:1602

2920 msgid "push has no destination (push.default is 'nothing')"

2921 msgstr ""

2922

2726 -#: remote.c:1817

2923 +#: remote.c:1624

2924 msgid "cannot resolve 'simple' push to a single destination"

2925 msgstr ""

2926

2730 -#: remote.c:2132

2927 +#: remote.c:1939

2928 #, c-format

2929 msgid "Your branch is based on '%s', but the upstream is gone.\n"

2930 msgstr ""

2931

2735 -#: remote.c:2136

2932 +#: remote.c:1943

2933 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2934 msgstr ""

2935

2739 -#: remote.c:2139

2936 +#: remote.c:1946

2937 #, c-format

2938 msgid "Your branch is up to date with '%s'.\n"

2939 msgstr ""

2940

2744 -#: remote.c:2143

2941 +#: remote.c:1950

2942 #, c-format

2943 msgid "Your branch and '%s' refer to different commits.\n"

2944 msgstr ""

2945

2749 -#: remote.c:2146

2946 +#: remote.c:1953

2947 #, c-format

2948 msgid " (use \"%s\" for details)\n"

2949 msgstr ""

2950

2754 -#: remote.c:2150

2951 +#: remote.c:1957

2952 #, c-format

2953 msgid "Your branch is ahead of '%s' by %d commit.\n"

2954 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

2955 msgstr[0] ""

2956 msgstr[1] ""

2957

2761 -#: remote.c:2156

2958 +#: remote.c:1963

2959 msgid " (use \"git push\" to publish your local commits)\n"

2960 msgstr ""

2961

2765 -#: remote.c:2159

2962 +#: remote.c:1966

2963 #, c-format

2964 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

2965 msgid_plural ""

@@ -2770,11 +2967,11 @@ msgid_plural ""

2967 msgstr[0] ""

2968 msgstr[1] ""

2969

2773 -#: remote.c:2167

2970 +#: remote.c:1974

2971 msgid " (use \"git pull\" to update your local branch)\n"

2972 msgstr ""

2973

2777 -#: remote.c:2170

2974 +#: remote.c:1977

2975 #, c-format

2976 msgid ""

2977 "Your branch and '%s' have diverged,\n"

@@ -2785,28 +2982,28 @@ msgid_plural ""

2982 msgstr[0] ""

2983 msgstr[1] ""

2984

2788 -#: remote.c:2180

2985 +#: remote.c:1987

2986 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

2987 msgstr ""

2988

2792 -#: revision.c:2277

2989 +#: revision.c:2289

2990 msgid "your current branch appears to be broken"

2991 msgstr ""

2992

2796 -#: revision.c:2280

2993 +#: revision.c:2292

2994 #, c-format

2995 msgid "your current branch '%s' does not have any commits yet"

2996 msgstr ""

2997

2801 -#: revision.c:2477

2998 +#: revision.c:2489

2999 msgid "--first-parent is incompatible with --bisect"

3000 msgstr ""

3001

2805 -#: run-command.c:731

3002 +#: run-command.c:728

3003 msgid "open /dev/null failed"

3004 msgstr ""

3005

2809 -#: run-command.c:1274

3006 +#: run-command.c:1271

3007 #, c-format

3008 msgid ""

3009 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -2849,78 +3046,85 @@ msgstr ""

3046 msgid "the receiving end does not support push options"

3047 msgstr ""

3048

2852 -#: sequencer.c:158

3049 +#: sequencer.c:174

3050 #, c-format

3051 msgid "invalid commit message cleanup mode '%s'"

3052 msgstr ""

3053

2857 -#: sequencer.c:267

3054 +#: sequencer.c:274

3055 +#, c-format

3056 +msgid "could not delete '%s'"

3057 +msgstr ""

3058 +

3059 +#: sequencer.c:300

3060 msgid "revert"

3061 msgstr ""

3062

2861 -#: sequencer.c:269

3063 +#: sequencer.c:302

3064 msgid "cherry-pick"

3065 msgstr ""

3066

2865 -#: sequencer.c:271

3067 +#: sequencer.c:304

3068 msgid "rebase -i"

3069 msgstr ""

3070

2869 -#: sequencer.c:273

3071 +#: sequencer.c:306

3072 #, c-format

3073 msgid "Unknown action: %d"

3074 msgstr ""

3075

2874 -#: sequencer.c:330

3076 +#: sequencer.c:363

3077 msgid ""

3078 "after resolving the conflicts, mark the corrected paths\n"

3079 "with 'git add <paths>' or 'git rm <paths>'"

3080 msgstr ""

3081

2880 -#: sequencer.c:333

3082 +#: sequencer.c:366

3083 msgid ""

3084 "after resolving the conflicts, mark the corrected paths\n"

3085 "with 'git add <paths>' or 'git rm <paths>'\n"

3086 "and commit the result with 'git commit'"

3087 msgstr ""

3088

2887 -#: sequencer.c:346 sequencer.c:2245

3089 +#: sequencer.c:379 sequencer.c:2467

3090 #, c-format

3091 msgid "could not lock '%s'"

3092 msgstr ""

3093

2892 -#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264

2893 -#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656

3094 +#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485

3095 +#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656

3096 #, c-format

3097 msgid "could not write to '%s'"

3098 msgstr ""

3099

2898 -#: sequencer.c:353

3100 +#: sequencer.c:386

3101 #, c-format

3102 msgid "could not write eol to '%s'"

3103 msgstr ""

3104

2903 -#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252

3105 +#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487

3106 +#: sequencer.c:2701

3107 #, c-format

3108 msgid "failed to finalize '%s'"

3109 msgstr ""

3110

2908 -#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259

2909 -#: builtin/commit.c:722 builtin/merge.c:1047

3111 +#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370

3112 +#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727

3113 +#: builtin/merge.c:1045

3114 #, c-format

3115 msgid "could not read '%s'"

3116 msgstr ""

3117

2914 -#: sequencer.c:405

3118 +#: sequencer.c:440

3119 #, c-format

3120 msgid "your local changes would be overwritten by %s."

3121 msgstr ""

3122

2919 -#: sequencer.c:409

3123 +#: sequencer.c:444

3124 msgid "commit your changes or stash them to proceed."

3125 msgstr ""

3126

2923 -#: sequencer.c:438

3127 +#: sequencer.c:473

3128 #, c-format

3129 msgid "%s: fast-forward"

3130 msgstr ""

@@ -2928,20 +3132,20 @@ msgstr ""

3132 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3133 #. "rebase -i".

3134 #.

2931 -#: sequencer.c:526

3135 +#: sequencer.c:562

3136 #, c-format

3137 msgid "%s: Unable to write new index file"

3138 msgstr ""

3139

2936 -#: sequencer.c:542

2937 -msgid "could not resolve HEAD commit"

3140 +#: sequencer.c:578

3141 +msgid "unable to update cache tree"

3142 msgstr ""

3143

2940 -#: sequencer.c:562

2941 -msgid "unable to update cache tree"

3144 +#: sequencer.c:591

3145 +msgid "could not resolve HEAD commit"

3146 msgstr ""

3147

2944 -#: sequencer.c:658

3148 +#: sequencer.c:748

3149 #, c-format

3150 msgid ""

3151 "you have staged changes in your working tree\n"

@@ -2958,11 +3162,15 @@ msgid ""

3162 " git rebase --continue\n"

3163 msgstr ""

3164

2961 -#: sequencer.c:915

3165 +#: sequencer.c:817

3166 +msgid "writing root commit"

3167 +msgstr ""

3168 +

3169 +#: sequencer.c:1042

3170 msgid "'prepare-commit-msg' hook failed"

3171 msgstr ""

3172

2965 -#: sequencer.c:922

3173 +#: sequencer.c:1049

3174 msgid ""

3175 "Your name and email address were configured automatically based\n"

3176 "on your username and hostname. Please check that they are accurate.\n"

@@ -2977,7 +3185,7 @@ msgid ""

3185 " git commit --amend --reset-author\n"

3186 msgstr ""

3187

2980 -#: sequencer.c:935

3188 +#: sequencer.c:1062

3189 msgid ""

3190 "Your name and email address were configured automatically based\n"

3191 "on your username and hostname. Please check that they are accurate.\n"

@@ -2991,321 +3199,313 @@ msgid ""

3199 " git commit --amend --reset-author\n"

3200 msgstr ""

3201

2994 -#: sequencer.c:975

3202 +#: sequencer.c:1102

3203 msgid "couldn't look up newly created commit"

3204 msgstr ""

3205

2998 -#: sequencer.c:977

3206 +#: sequencer.c:1104

3207 msgid "could not parse newly created commit"

3208 msgstr ""

3209

3002 -#: sequencer.c:1023

3210 +#: sequencer.c:1150

3211 msgid "unable to resolve HEAD after creating commit"

3212 msgstr ""

3213

3006 -#: sequencer.c:1025

3214 +#: sequencer.c:1152

3215 msgid "detached HEAD"

3216 msgstr ""

3217

3010 -#: sequencer.c:1029

3218 +#: sequencer.c:1156

3219 msgid " (root-commit)"

3220 msgstr ""

3221

3014 -#: sequencer.c:1050

3222 +#: sequencer.c:1177

3223 msgid "could not parse HEAD"

3224 msgstr ""

3225

3018 -#: sequencer.c:1052

3226 +#: sequencer.c:1179

3227 #, c-format

3228 msgid "HEAD %s is not a commit!"

3229 msgstr ""

3230

3023 -#: sequencer.c:1056 builtin/commit.c:1491

3231 +#: sequencer.c:1183 builtin/commit.c:1528

3232 msgid "could not parse HEAD commit"

3233 msgstr ""

3234

3027 -#: sequencer.c:1107 sequencer.c:1673

3235 +#: sequencer.c:1234 sequencer.c:1831

3236 msgid "unable to parse commit author"

3237 msgstr ""

3238

3031 -#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643

3239 +#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644

3240 msgid "git write-tree failed to write a tree"

3241 msgstr ""

3242

3035 -#: sequencer.c:1134 sequencer.c:1186

3243 +#: sequencer.c:1261 sequencer.c:1316

3244 #, c-format

3245 msgid "unable to read commit message from '%s'"

3246 msgstr ""

3247

3040 -#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826

3041 -#: builtin/merge.c:851

3248 +#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824

3249 +#: builtin/merge.c:849

3250 msgid "failed to write commit object"

3251 msgstr ""

3252

3045 -#: sequencer.c:1213

3253 +#: sequencer.c:1343

3254 #, c-format

3255 msgid "could not parse commit %s"

3256 msgstr ""

3257

3050 -#: sequencer.c:1218

3258 +#: sequencer.c:1348

3259 #, c-format

3260 msgid "could not parse parent commit %s"

3261 msgstr ""

3262

3055 -#: sequencer.c:1347

3056 -#, c-format

3057 -msgid ""

3058 -"unexpected 1st line of squash message:\n"

3059 -"\n"

3060 -"\t%.*s"

3061 -msgstr ""

3062 -

3063 -#: sequencer.c:1353

3064 -#, c-format

3065 -msgid ""

3066 -"invalid 1st line of squash message:\n"

3067 -"\n"

3068 -"\t%.*s"

3069 -msgstr ""

3070 -

3071 -#: sequencer.c:1359 sequencer.c:1384

3263 +#: sequencer.c:1499 sequencer.c:1524

3264 #, c-format

3265 msgid "This is a combination of %d commits."

3266 msgstr ""

3267

3076 -#: sequencer.c:1368 sequencer.c:3265

3268 +#: sequencer.c:1509 sequencer.c:4354

3269 msgid "need a HEAD to fixup"

3270 msgstr ""

3271

3080 -#: sequencer.c:1370

3272 +#: sequencer.c:1511 sequencer.c:2728

3273 msgid "could not read HEAD"

3274 msgstr ""

3275

3084 -#: sequencer.c:1372

3276 +#: sequencer.c:1513

3277 msgid "could not read HEAD's commit message"

3278 msgstr ""

3279

3088 -#: sequencer.c:1378

3280 +#: sequencer.c:1519

3281 #, c-format

3282 msgid "cannot write '%s'"

3283 msgstr ""

3284

3093 -#: sequencer.c:1387 git-rebase--interactive.sh:452

3285 +#: sequencer.c:1526 git-rebase--interactive.sh:457

3286 msgid "This is the 1st commit message:"

3287 msgstr ""

3288

3097 -#: sequencer.c:1395

3289 +#: sequencer.c:1534

3290 #, c-format

3291 msgid "could not read commit message of %s"

3292 msgstr ""

3293

3102 -#: sequencer.c:1402

3294 +#: sequencer.c:1541

3295 #, c-format

3296 msgid "This is the commit message #%d:"

3297 msgstr ""

3298

3107 -#: sequencer.c:1407

3299 +#: sequencer.c:1547

3300 #, c-format

3301 msgid "The commit message #%d will be skipped:"

3302 msgstr ""

3303

3112 -#: sequencer.c:1412

3304 +#: sequencer.c:1552

3305 #, c-format

3306 msgid "unknown command: %d"

3307 msgstr ""

3308

3117 -#: sequencer.c:1479

3309 +#: sequencer.c:1630

3310 msgid "your index file is unmerged."

3311 msgstr ""

3312

3121 -#: sequencer.c:1498

3313 +#: sequencer.c:1637

3314 +msgid "cannot fixup root commit"

3315 +msgstr ""

3316 +

3317 +#: sequencer.c:1656

3318 #, c-format

3319 msgid "commit %s is a merge but no -m option was given."

3320 msgstr ""

3321

3126 -#: sequencer.c:1506

3322 +#: sequencer.c:1664

3323 #, c-format

3324 msgid "commit %s does not have parent %d"

3325 msgstr ""

3326

3131 -#: sequencer.c:1510

3327 +#: sequencer.c:1668

3328 #, c-format

3329 msgid "mainline was specified but commit %s is not a merge."

3330 msgstr ""

3331

3136 -#: sequencer.c:1516

3332 +#: sequencer.c:1674

3333 #, c-format

3334 msgid "cannot get commit message for %s"

3335 msgstr ""

3336

3337 #. TRANSLATORS: The first %s will be a "todo" command like

3338 #. "revert" or "pick", the second %s a SHA1.

3143 -#: sequencer.c:1535

3339 +#: sequencer.c:1693

3340 #, c-format

3341 msgid "%s: cannot parse parent commit %s"

3342 msgstr ""

3343

3148 -#: sequencer.c:1600 sequencer.c:2397

3344 +#: sequencer.c:1758

3345 #, c-format

3346 msgid "could not rename '%s' to '%s'"

3347 msgstr ""

3348

3153 -#: sequencer.c:1654

3349 +#: sequencer.c:1812

3350 #, c-format

3351 msgid "could not revert %s... %s"

3352 msgstr ""

3353

3158 -#: sequencer.c:1655

3354 +#: sequencer.c:1813

3355 #, c-format

3356 msgid "could not apply %s... %s"

3357 msgstr ""

3358

3163 -#: sequencer.c:1702

3359 +#: sequencer.c:1863

3360 msgid "empty commit set passed"

3361 msgstr ""

3362

3167 -#: sequencer.c:1712

3363 +#: sequencer.c:1873

3364 #, c-format

3365 msgid "git %s: failed to read the index"

3366 msgstr ""

3367

3172 -#: sequencer.c:1718

3368 +#: sequencer.c:1880

3369 #, c-format

3370 msgid "git %s: failed to refresh the index"

3371 msgstr ""

3372

3177 -#: sequencer.c:1792

3373 +#: sequencer.c:1960

3374 #, c-format

3375 msgid "%s does not accept arguments: '%s'"

3376 msgstr ""

3377

3182 -#: sequencer.c:1801

3378 +#: sequencer.c:1969

3379 #, c-format

3380 msgid "missing arguments for %s"

3381 msgstr ""

3382

3187 -#: sequencer.c:1844

3383 +#: sequencer.c:2028

3384 #, c-format

3385 msgid "invalid line %d: %.*s"

3386 msgstr ""

3387

3192 -#: sequencer.c:1852

3388 +#: sequencer.c:2036

3389 #, c-format

3390 msgid "cannot '%s' without a previous commit"

3391 msgstr ""

3392

3197 -#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091

3393 +#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172

3394 #, c-format

3395 msgid "could not read '%s'."

3396 msgstr ""

3397

3202 -#: sequencer.c:1906

3398 +#: sequencer.c:2107

3399 msgid "please fix this using 'git rebase --edit-todo'."

3400 msgstr ""

3401

3206 -#: sequencer.c:1908

3402 +#: sequencer.c:2109

3403 #, c-format

3404 msgid "unusable instruction sheet: '%s'"

3405 msgstr ""

3406

3211 -#: sequencer.c:1913

3407 +#: sequencer.c:2114

3408 msgid "no commits parsed."

3409 msgstr ""

3410

3215 -#: sequencer.c:1924

3411 +#: sequencer.c:2125

3412 msgid "cannot cherry-pick during a revert."

3413 msgstr ""

3414

3219 -#: sequencer.c:1926

3415 +#: sequencer.c:2127

3416 msgid "cannot revert during a cherry-pick."

3417 msgstr ""

3418

3223 -#: sequencer.c:1993

3419 +#: sequencer.c:2194

3420 #, c-format

3421 msgid "invalid key: %s"

3422 msgstr ""

3423

3228 -#: sequencer.c:1996

3424 +#: sequencer.c:2197

3425 #, c-format

3426 msgid "invalid value for %s: %s"

3427 msgstr ""

3428

3233 -#: sequencer.c:2062

3429 +#: sequencer.c:2268

3430 +msgid "unusable squash-onto"

3431 +msgstr ""

3432 +

3433 +#: sequencer.c:2284

3434 #, c-format

3435 msgid "malformed options sheet: '%s'"

3436 msgstr ""

3437

3238 -#: sequencer.c:2100

3438 +#: sequencer.c:2322

3439 msgid "a cherry-pick or revert is already in progress"

3440 msgstr ""

3441

3242 -#: sequencer.c:2101

3442 +#: sequencer.c:2323

3443 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3444 msgstr ""

3445

3246 -#: sequencer.c:2104

3446 +#: sequencer.c:2326

3447 #, c-format

3448 msgid "could not create sequencer directory '%s'"

3449 msgstr ""

3450

3251 -#: sequencer.c:2118

3451 +#: sequencer.c:2340

3452 msgid "could not lock HEAD"

3453 msgstr ""

3454

3255 -#: sequencer.c:2173 sequencer.c:2761

3455 +#: sequencer.c:2395 sequencer.c:3402

3456 msgid "no cherry-pick or revert in progress"

3457 msgstr ""

3458

3259 -#: sequencer.c:2175

3459 +#: sequencer.c:2397

3460 msgid "cannot resolve HEAD"

3461 msgstr ""

3462

3263 -#: sequencer.c:2177 sequencer.c:2212

3463 +#: sequencer.c:2399 sequencer.c:2434

3464 msgid "cannot abort from a branch yet to be born"

3465 msgstr ""

3466

3267 -#: sequencer.c:2198 builtin/grep.c:720

3467 +#: sequencer.c:2420 builtin/grep.c:720

3468 #, c-format

3469 msgid "cannot open '%s'"

3470 msgstr ""

3471

3272 -#: sequencer.c:2200

3472 +#: sequencer.c:2422

3473 #, c-format

3474 msgid "cannot read '%s': %s"

3475 msgstr ""

3476

3277 -#: sequencer.c:2201

3477 +#: sequencer.c:2423

3478 msgid "unexpected end of file"

3479 msgstr ""

3480

3281 -#: sequencer.c:2207

3481 +#: sequencer.c:2429

3482 #, c-format

3483 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3484 msgstr ""

3485

3286 -#: sequencer.c:2218

3486 +#: sequencer.c:2440

3487 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3488 msgstr ""

3489

3290 -#: sequencer.c:2324 sequencer.c:2679

3490 +#: sequencer.c:2544 sequencer.c:3320

3491 #, c-format

3492 msgid "could not update %s"

3493 msgstr ""

3494

3295 -#: sequencer.c:2362 sequencer.c:2659

3495 +#: sequencer.c:2582 sequencer.c:3300

3496 msgid "cannot read HEAD"

3497 msgstr ""

3498

3299 -#: sequencer.c:2402 builtin/difftool.c:639

3499 +#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639

3500 #, c-format

3501 msgid "could not copy '%s' to '%s'"

3502 msgstr ""

3503

3304 -#: sequencer.c:2421

3504 +#: sequencer.c:2640

3505 msgid "could not read index"

3506 msgstr ""

3507

3308 -#: sequencer.c:2426

3508 +#: sequencer.c:2645

3509 #, c-format

3510 msgid ""

3511 "execution failed: %s\n"

@@ -3315,11 +3515,11 @@ msgid ""

3515 "\n"

3516 msgstr ""

3517

3318 -#: sequencer.c:2432

3518 +#: sequencer.c:2651

3519 msgid "and made changes to the index and/or the working tree\n"

3520 msgstr ""

3521

3322 -#: sequencer.c:2438

3522 +#: sequencer.c:2657

3523 #, c-format

3524 msgid ""

3525 "execution succeeded: %s\n"

@@ -3330,17 +3530,62 @@ msgid ""

3530 "\n"

3531 msgstr ""

3532

3333 -#: sequencer.c:2497

3533 +#: sequencer.c:2770

3534 +msgid "writing fake root commit"

3535 +msgstr ""

3536 +

3537 +#: sequencer.c:2775

3538 +msgid "writing squash-onto"

3539 +msgstr ""

3540 +

3541 +#: sequencer.c:2810

3542 +#, c-format

3543 +msgid "failed to find tree of %s"

3544 +msgstr ""

3545 +

3546 +#: sequencer.c:2828

3547 +msgid "could not write index"

3548 +msgstr ""

3549 +

3550 +#: sequencer.c:2860

3551 +msgid "cannot merge without a current revision"

3552 +msgstr ""

3553 +

3554 +#: sequencer.c:2883

3555 +#, c-format

3556 +msgid "could not resolve '%s'"

3557 +msgstr ""

3558 +

3559 +#: sequencer.c:2905

3560 +#, c-format

3561 +msgid "could not get commit message of '%s'"

3562 +msgstr ""

3563 +

3564 +#: sequencer.c:2915 sequencer.c:2940

3565 +#, c-format

3566 +msgid "could not write '%s'"

3567 +msgstr ""

3568 +

3569 +#: sequencer.c:3004

3570 +#, c-format

3571 +msgid "could not even attempt to merge '%.*s'"

3572 +msgstr ""

3573 +

3574 +#: sequencer.c:3020

3575 +msgid "merge: Unable to write new index file"

3576 +msgstr ""

3577 +

3578 +#: sequencer.c:3087

3579 #, c-format

3580 msgid "Applied autostash.\n"

3581 msgstr ""

3582

3338 -#: sequencer.c:2509

3583 +#: sequencer.c:3099

3584 #, c-format

3585 msgid "cannot store %s"

3586 msgstr ""

3587

3343 -#: sequencer.c:2512 git-rebase.sh:178

3588 +#: sequencer.c:3102 git-rebase.sh:188

3589 #, c-format

3590 msgid ""

3591 "Applying autostash resulted in conflicts.\n"

@@ -3348,103 +3593,121 @@ msgid ""

3593 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

3594 msgstr ""

3595

3351 -#: sequencer.c:2595

3596 +#: sequencer.c:3133

3597 +#, c-format

3598 +msgid ""

3599 +"Could not execute the todo command\n"

3600 +"\n"

3601 +" %.*s\n"

3602 +"It has been rescheduled; To edit the command before continuing, please\n"

3603 +"edit the todo list first:\n"

3604 +"\n"

3605 +" git rebase --edit-todo\n"

3606 +" git rebase --continue\n"

3607 +msgstr ""

3608 +

3609 +#: sequencer.c:3201

3610 #, c-format

3611 msgid "Stopped at %s... %.*s\n"

3612 msgstr ""

3613

3356 -#: sequencer.c:2637

3614 +#: sequencer.c:3263

3615 #, c-format

3616 msgid "unknown command %d"

3617 msgstr ""

3618

3361 -#: sequencer.c:2667

3619 +#: sequencer.c:3308

3620 msgid "could not read orig-head"

3621 msgstr ""

3622

3365 -#: sequencer.c:2672 sequencer.c:3262

3623 +#: sequencer.c:3313 sequencer.c:4351

3624 msgid "could not read 'onto'"

3625 msgstr ""

3626

3369 -#: sequencer.c:2686

3627 +#: sequencer.c:3327

3628 #, c-format

3629 msgid "could not update HEAD to %s"

3630 msgstr ""

3631

3374 -#: sequencer.c:2770

3632 +#: sequencer.c:3413

3633 msgid "cannot rebase: You have unstaged changes."

3634 msgstr ""

3635

3378 -#: sequencer.c:2775

3379 -msgid "could not remove CHERRY_PICK_HEAD"

3380 -msgstr ""

3381 -

3382 -#: sequencer.c:2784

3636 +#: sequencer.c:3422

3637 msgid "cannot amend non-existing commit"

3638 msgstr ""

3639

3386 -#: sequencer.c:2786

3640 +#: sequencer.c:3424

3641 #, c-format

3642 msgid "invalid file: '%s'"

3643 msgstr ""

3644

3391 -#: sequencer.c:2788

3645 +#: sequencer.c:3426

3646 #, c-format

3647 msgid "invalid contents: '%s'"

3648 msgstr ""

3649

3396 -#: sequencer.c:2791

3650 +#: sequencer.c:3429

3651 msgid ""

3652 "\n"

3653 "You have uncommitted changes in your working tree. Please, commit them\n"

3654 "first and then run 'git rebase --continue' again."

3655 msgstr ""

3656

3403 -#: sequencer.c:2801

3657 +#: sequencer.c:3454 sequencer.c:3492

3658 +#, c-format

3659 +msgid "could not write file: '%s'"

3660 +msgstr ""

3661 +

3662 +#: sequencer.c:3507

3663 +msgid "could not remove CHERRY_PICK_HEAD"

3664 +msgstr ""

3665 +

3666 +#: sequencer.c:3514

3667 msgid "could not commit staged changes."

3668 msgstr ""

3669

3407 -#: sequencer.c:2881

3670 +#: sequencer.c:3611

3671 #, c-format

3672 msgid "%s: can't cherry-pick a %s"

3673 msgstr ""

3674

3412 -#: sequencer.c:2885

3675 +#: sequencer.c:3615

3676 #, c-format

3677 msgid "%s: bad revision"

3678 msgstr ""

3679

3417 -#: sequencer.c:2918

3680 +#: sequencer.c:3648

3681 msgid "can't revert as initial commit"

3682 msgstr ""

3683

3421 -#: sequencer.c:3023

3684 +#: sequencer.c:4097

3685 msgid "make_script: unhandled options"

3686 msgstr ""

3687

3425 -#: sequencer.c:3026

3688 +#: sequencer.c:4100

3689 msgid "make_script: error preparing revisions"

3690 msgstr ""

3691

3429 -#: sequencer.c:3060 sequencer.c:3095

3692 +#: sequencer.c:4141 sequencer.c:4176

3693 #, c-format

3694 msgid "unusable todo list: '%s'"

3695 msgstr ""

3696

3434 -#: sequencer.c:3146

3697 +#: sequencer.c:4235

3698 #, c-format

3699 msgid ""

3700 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3701 msgstr ""

3702

3440 -#: sequencer.c:3212

3703 +#: sequencer.c:4301

3704 #, c-format

3705 msgid ""

3706 "Warning: some commits may have been dropped accidentally.\n"

3707 "Dropped commits (newer to older):\n"

3708 msgstr ""

3709

3447 -#: sequencer.c:3219

3710 +#: sequencer.c:4308

3711 #, c-format

3712 msgid ""

3713 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3455,7 +3718,7 @@ msgid ""

3718 "\n"

3719 msgstr ""

3720

3458 -#: sequencer.c:3231

3721 +#: sequencer.c:4320

3722 #, c-format

3723 msgid ""

3724 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3463,34 +3726,28 @@ msgid ""

3726 "Or you can abort the rebase with 'git rebase --abort'.\n"

3727 msgstr ""

3728

3466 -#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395

3467 -#: builtin/am.c:779

3468 -#, c-format

3469 -msgid "could not open '%s' for writing"

3470 -msgstr ""

3471 -

3472 -#: sequencer.c:3285

3729 +#: sequencer.c:4374

3730 #, c-format

3731 msgid "could not parse commit '%s'"

3732 msgstr ""

3733

3477 -#: sequencer.c:3401

3734 +#: sequencer.c:4489

3735 msgid "the script was already rearranged."

3736 msgstr ""

3737

3481 -#: setup.c:122

3738 +#: setup.c:123

3739 #, c-format

3740 msgid "'%s' is outside repository"

3741 msgstr ""

3742

3486 -#: setup.c:171

3743 +#: setup.c:172

3744 #, c-format

3745 msgid ""

3746 "%s: no such path in the working tree.\n"

3747 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."

3748 msgstr ""

3749

3493 -#: setup.c:184

3750 +#: setup.c:185

3751 #, c-format

3752 msgid ""

3753 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3498,12 +3755,12 @@ msgid ""

3755 "'git <command> [<revision>...] -- [<file>...]'"

3756 msgstr ""

3757

3501 -#: setup.c:233

3758 +#: setup.c:234

3759 #, c-format

3760 msgid "option '%s' must come before non-option arguments"

3761 msgstr ""

3762

3506 -#: setup.c:252

3763 +#: setup.c:253

3764 #, c-format

3765 msgid ""

3766 "ambiguous argument '%s': both revision and filename\n"

@@ -3511,152 +3768,152 @@ msgid ""

3768 "'git <command> [<revision>...] -- [<file>...]'"

3769 msgstr ""

3770

3514 -#: setup.c:388

3771 +#: setup.c:389

3772 msgid "unable to set up work tree using invalid config"

3773 msgstr ""

3774

3518 -#: setup.c:395

3775 +#: setup.c:393

3776 msgid "this operation must be run in a work tree"

3777 msgstr ""

3778

3522 -#: setup.c:506

3779 +#: setup.c:503

3780 #, c-format

3781 msgid "Expected git repo version <= %d, found %d"

3782 msgstr ""

3783

3527 -#: setup.c:514

3784 +#: setup.c:511

3785 msgid "unknown repository extensions found:"

3786 msgstr ""

3787

3531 -#: setup.c:533

3788 +#: setup.c:530

3789 #, c-format

3790 msgid "error opening '%s'"

3791 msgstr ""

3792

3536 -#: setup.c:535

3793 +#: setup.c:532

3794 #, c-format

3795 msgid "too large to be a .git file: '%s'"

3796 msgstr ""

3797

3541 -#: setup.c:537

3798 +#: setup.c:534

3799 #, c-format

3800 msgid "error reading %s"

3801 msgstr ""

3802

3546 -#: setup.c:539

3803 +#: setup.c:536

3804 #, c-format

3805 msgid "invalid gitfile format: %s"

3806 msgstr ""

3807

3551 -#: setup.c:541

3808 +#: setup.c:538

3809 #, c-format

3810 msgid "no path in gitfile: %s"

3811 msgstr ""

3812

3556 -#: setup.c:543

3813 +#: setup.c:540

3814 #, c-format

3815 msgid "not a git repository: %s"

3816 msgstr ""

3817

3561 -#: setup.c:642

3818 +#: setup.c:639

3819 #, c-format

3820 msgid "'$%s' too big"

3821 msgstr ""

3822

3566 -#: setup.c:656

3823 +#: setup.c:653

3824 #, c-format

3825 msgid "not a git repository: '%s'"

3826 msgstr ""

3827

3571 -#: setup.c:685 setup.c:687 setup.c:718

3828 +#: setup.c:682 setup.c:684 setup.c:715

3829 #, c-format

3830 msgid "cannot chdir to '%s'"

3831 msgstr ""

3832

3576 -#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

3833 +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

3834 msgid "cannot come back to cwd"

3835 msgstr ""

3836

3580 -#: setup.c:816

3837 +#: setup.c:813

3838 #, c-format

3839 msgid "not a git repository (or any of the parent directories): %s"

3840 msgstr ""

3841

3585 -#: setup.c:827

3842 +#: setup.c:824

3843 #, c-format

3844 msgid "failed to stat '%*s%s%s'"

3845 msgstr ""

3846

3590 -#: setup.c:1057

3847 +#: setup.c:1054

3848 msgid "Unable to read current working directory"

3849 msgstr ""

3850

3594 -#: setup.c:1069 setup.c:1075

3851 +#: setup.c:1066 setup.c:1072

3852 #, c-format

3853 msgid "cannot change to '%s'"

3854 msgstr ""

3855

3599 -#: setup.c:1088

3856 +#: setup.c:1085

3857 #, c-format

3858 msgid ""

3859 "not a git repository (or any parent up to mount point %s)\n"

3860 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3861 msgstr ""

3862

3606 -#: setup.c:1172

3863 +#: setup.c:1168

3864 #, c-format

3865 msgid ""

3866 "problem with core.sharedRepository filemode value (0%.3o).\n"

3867 "The owner of files must always have read and write permissions."

3868 msgstr ""

3869

3613 -#: setup.c:1215

3870 +#: setup.c:1211

3871 msgid "open /dev/null or dup failed"

3872 msgstr ""

3873

3617 -#: setup.c:1230

3874 +#: setup.c:1226

3875 msgid "fork failed"

3876 msgstr ""

3877

3621 -#: setup.c:1235

3878 +#: setup.c:1231

3879 msgid "setsid failed"

3880 msgstr ""

3881

3625 -#: sha1_file.c:592

3882 +#: sha1-file.c:625

3883 #, c-format

3884 msgid "path '%s' does not exist"

3885 msgstr ""

3886

3630 -#: sha1_file.c:618

3887 +#: sha1-file.c:651

3888 #, c-format

3889 msgid "reference repository '%s' as a linked checkout is not supported yet."

3890 msgstr ""

3891

3635 -#: sha1_file.c:624

3892 +#: sha1-file.c:657

3893 #, c-format

3894 msgid "reference repository '%s' is not a local repository."

3895 msgstr ""

3896

3640 -#: sha1_file.c:630

3897 +#: sha1-file.c:663

3898 #, c-format

3899 msgid "reference repository '%s' is shallow"

3900 msgstr ""

3901

3645 -#: sha1_file.c:638

3902 +#: sha1-file.c:671

3903 #, c-format

3904 msgid "reference repository '%s' is grafted"

3905 msgstr ""

3906

3650 -#: sha1_name.c:422

3907 +#: sha1-name.c:442

3908 #, c-format

3909 msgid "short SHA1 %s is ambiguous"

3910 msgstr ""

3911

3655 -#: sha1_name.c:433

3912 +#: sha1-name.c:453

3913 msgid "The candidates are:"

3914 msgstr ""

3915

3659 -#: sha1_name.c:693

3916 +#: sha1-name.c:695

3917 msgid ""

3918 "Git normally never creates a ref that ends with 40 hex characters\n"

3919 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3669,86 +3926,86 @@ msgid ""

3926 "running \"git config advice.objectNameWarning false\""

3927 msgstr ""

3928

3672 -#: submodule.c:96 submodule.c:130

3929 +#: submodule.c:97 submodule.c:131

3930 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3931 msgstr ""

3932

3676 -#: submodule.c:100 submodule.c:134

3933 +#: submodule.c:101 submodule.c:135

3934 #, c-format

3935 msgid "Could not find section in .gitmodules where path=%s"

3936 msgstr ""

3937

3681 -#: submodule.c:108

3938 +#: submodule.c:109

3939 #, c-format

3940 msgid "Could not update .gitmodules entry %s"

3941 msgstr ""

3942

3686 -#: submodule.c:141

3943 +#: submodule.c:142

3944 #, c-format

3945 msgid "Could not remove .gitmodules entry for %s"

3946 msgstr ""

3947

3691 -#: submodule.c:152

3948 +#: submodule.c:153

3949 msgid "staging updated .gitmodules failed"

3950 msgstr ""

3951

3695 -#: submodule.c:312

3952 +#: submodule.c:315

3953 #, c-format

3954 msgid "in unpopulated submodule '%s'"

3955 msgstr ""

3956

3700 -#: submodule.c:343

3957 +#: submodule.c:346

3958 #, c-format

3959 msgid "Pathspec '%s' is in submodule '%.*s'"

3960 msgstr ""

3961

3705 -#: submodule.c:833

3962 +#: submodule.c:837

3963 #, c-format

3964 msgid "submodule entry '%s' (%s) is a %s, not a commit"

3965 msgstr ""

3966

3710 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

3967 +#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743

3968 msgid "Failed to resolve HEAD as a valid ref."

3969 msgstr ""

3970

3714 -#: submodule.c:1370

3971 +#: submodule.c:1373

3972 #, c-format

3973 msgid "'%s' not recognized as a git repository"

3974 msgstr ""

3975

3719 -#: submodule.c:1508

3976 +#: submodule.c:1511

3977 #, c-format

3978 msgid "could not start 'git status' in submodule '%s'"

3979 msgstr ""

3980

3724 -#: submodule.c:1521

3981 +#: submodule.c:1524

3982 #, c-format

3983 msgid "could not run 'git status' in submodule '%s'"

3984 msgstr ""

3985

3729 -#: submodule.c:1614

3986 +#: submodule.c:1617

3987 #, c-format

3988 msgid "submodule '%s' has dirty index"

3989 msgstr ""

3990

3734 -#: submodule.c:1878

3991 +#: submodule.c:1716

3992 #, c-format

3993 msgid ""

3994 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

3995 msgstr ""

3996

3740 -#: submodule.c:1890 submodule.c:1946

3997 +#: submodule.c:1728 submodule.c:1784

3998 #, c-format

3999 msgid "could not lookup name for submodule '%s'"

4000 msgstr ""

4001

3745 -#: submodule.c:1894 builtin/submodule--helper.c:1246

3746 -#: builtin/submodule--helper.c:1256

4002 +#: submodule.c:1732 builtin/submodule--helper.c:1261

4003 +#: builtin/submodule--helper.c:1271

4004 #, c-format

4005 msgid "could not create directory '%s'"

4006 msgstr ""

4007

3751 -#: submodule.c:1897

4008 +#: submodule.c:1735

4009 #, c-format

4010 msgid ""

4011 "Migrating git directory of '%s%s' from\n"

@@ -3756,29 +4013,30 @@ msgid ""

4013 "'%s'\n"

4014 msgstr ""

4015

3759 -#: submodule.c:1981

4016 +#: submodule.c:1819

4017 #, c-format

4018 msgid "could not recurse into submodule '%s'"

4019 msgstr ""

4020

3764 -#: submodule.c:2025

4021 +#: submodule.c:1863

4022 msgid "could not start ls-files in .."

4023 msgstr ""

4024

3768 -#: submodule.c:2045

3769 -msgid "BUG: returned path string doesn't match cwd?"

4025 +#: submodule.c:1902

4026 +#, c-format

4027 +msgid "ls-tree returned unexpected return code %d"

4028 msgstr ""

4029

3772 -#: submodule.c:2064

4030 +#: submodule-config.c:230

4031 #, c-format

3774 -msgid "ls-tree returned unexpected return code %d"

4032 +msgid "ignoring suspicious submodule name: %s"

4033 msgstr ""

4034

3777 -#: submodule-config.c:263

4035 +#: submodule-config.c:294

4036 msgid "negative values not allowed for submodule.fetchjobs"

4037 msgstr ""

4038

3781 -#: submodule-config.c:436

4039 +#: submodule-config.c:467

4040 #, c-format

4041 msgid "invalid value for %s"

4042 msgstr ""

@@ -3794,7 +4052,7 @@ msgstr ""

4052 msgid "unknown value '%s' for key '%s'"

4053 msgstr ""

4054

3797 -#: trailer.c:539 trailer.c:544 builtin/remote.c:290

4055 +#: trailer.c:539 trailer.c:544 builtin/remote.c:293

4056 #, c-format

4057 msgid "more than one %s"

4058 msgstr ""

@@ -3837,24 +4095,28 @@ msgstr ""

4095 msgid "could not rename temporary file to %s"

4096 msgstr ""

4097

3840 -#: transport.c:63

4098 +#: transport.c:116

4099 #, c-format

4100 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

4101 msgstr ""

4102

3845 -#: transport.c:152

4103 +#: transport.c:208

4104 #, c-format

4105 msgid "transport: invalid depth option '%s'"

4106 msgstr ""

4107

3850 -#: transport.c:916

4108 +#: transport.c:584

4109 +msgid "could not parse transport.color.* config"

4110 +msgstr ""

4111 +

4112 +#: transport.c:996

4113 #, c-format

4114 msgid ""

4115 "The following submodule paths contain changes that can\n"

4116 "not be found on any remote:\n"

4117 msgstr ""

4118

3857 -#: transport.c:920

4119 +#: transport.c:1000

4120 #, c-format

4121 msgid ""

4122 "\n"

@@ -3870,11 +4132,11 @@ msgid ""

4132 "\n"

4133 msgstr ""

4134

3873 -#: transport.c:928

4135 +#: transport.c:1008

4136 msgid "Aborting."

4137 msgstr ""

4138

3877 -#: transport-helper.c:1079

4139 +#: transport-helper.c:1087

4140 #, c-format

4141 msgid "Could not read ref %s"

4142 msgstr ""

@@ -3891,102 +4153,102 @@ msgstr ""

4153 msgid "empty filename in tree entry"

4154 msgstr ""

4155

3894 -#: tree-walk.c:114

4156 +#: tree-walk.c:113

4157 msgid "too-short tree file"

4158 msgstr ""

4159

3898 -#: unpack-trees.c:108

4160 +#: unpack-trees.c:111

4161 #, c-format

4162 msgid ""

4163 "Your local changes to the following files would be overwritten by checkout:\n"

4164 "%%sPlease commit your changes or stash them before you switch branches."

4165 msgstr ""

4166

3905 -#: unpack-trees.c:110

4167 +#: unpack-trees.c:113

4168 #, c-format

4169 msgid ""

4170 "Your local changes to the following files would be overwritten by checkout:\n"

4171 "%%s"

4172 msgstr ""

4173

3912 -#: unpack-trees.c:113

4174 +#: unpack-trees.c:116

4175 #, c-format

4176 msgid ""

4177 "Your local changes to the following files would be overwritten by merge:\n"

4178 "%%sPlease commit your changes or stash them before you merge."

4179 msgstr ""

4180

3919 -#: unpack-trees.c:115

4181 +#: unpack-trees.c:118

4182 #, c-format

4183 msgid ""

4184 "Your local changes to the following files would be overwritten by merge:\n"

4185 "%%s"

4186 msgstr ""

4187

3926 -#: unpack-trees.c:118

4188 +#: unpack-trees.c:121

4189 #, c-format

4190 msgid ""

4191 "Your local changes to the following files would be overwritten by %s:\n"

4192 "%%sPlease commit your changes or stash them before you %s."

4193 msgstr ""

4194

3933 -#: unpack-trees.c:120

4195 +#: unpack-trees.c:123

4196 #, c-format

4197 msgid ""

4198 "Your local changes to the following files would be overwritten by %s:\n"

4199 "%%s"

4200 msgstr ""

4201

3940 -#: unpack-trees.c:125

4202 +#: unpack-trees.c:128

4203 #, c-format

4204 msgid ""

4205 "Updating the following directories would lose untracked files in them:\n"

4206 "%s"

4207 msgstr ""

4208

3947 -#: unpack-trees.c:129

4209 +#: unpack-trees.c:132

4210 #, c-format

4211 msgid ""

4212 "The following untracked working tree files would be removed by checkout:\n"

4213 "%%sPlease move or remove them before you switch branches."

4214 msgstr ""

4215

3954 -#: unpack-trees.c:131

4216 +#: unpack-trees.c:134

4217 #, c-format

4218 msgid ""

4219 "The following untracked working tree files would be removed by checkout:\n"

4220 "%%s"

4221 msgstr ""

4222

3961 -#: unpack-trees.c:134

4223 +#: unpack-trees.c:137

4224 #, c-format

4225 msgid ""

4226 "The following untracked working tree files would be removed by merge:\n"

4227 "%%sPlease move or remove them before you merge."

4228 msgstr ""

4229

3968 -#: unpack-trees.c:136

4230 +#: unpack-trees.c:139

4231 #, c-format

4232 msgid ""

4233 "The following untracked working tree files would be removed by merge:\n"

4234 "%%s"

4235 msgstr ""

4236

3975 -#: unpack-trees.c:139

4237 +#: unpack-trees.c:142

4238 #, c-format

4239 msgid ""

4240 "The following untracked working tree files would be removed by %s:\n"

4241 "%%sPlease move or remove them before you %s."

4242 msgstr ""

4243

3982 -#: unpack-trees.c:141

4244 +#: unpack-trees.c:144

4245 #, c-format

4246 msgid ""

4247 "The following untracked working tree files would be removed by %s:\n"

4248 "%%s"

4249 msgstr ""

4250

3989 -#: unpack-trees.c:146

4251 +#: unpack-trees.c:150

4252 #, c-format

4253 msgid ""

4254 "The following untracked working tree files would be overwritten by "

@@ -3994,7 +4256,7 @@ msgid ""

4256 "%%sPlease move or remove them before you switch branches."

4257 msgstr ""

4258

3997 -#: unpack-trees.c:148

4259 +#: unpack-trees.c:152

4260 #, c-format

4261 msgid ""

4262 "The following untracked working tree files would be overwritten by "

@@ -4002,47 +4264,47 @@ msgid ""

4264 "%%s"

4265 msgstr ""

4266

4005 -#: unpack-trees.c:151

4267 +#: unpack-trees.c:155

4268 #, c-format

4269 msgid ""

4270 "The following untracked working tree files would be overwritten by merge:\n"

4271 "%%sPlease move or remove them before you merge."

4272 msgstr ""

4273

4012 -#: unpack-trees.c:153

4274 +#: unpack-trees.c:157

4275 #, c-format

4276 msgid ""

4277 "The following untracked working tree files would be overwritten by merge:\n"

4278 "%%s"

4279 msgstr ""

4280

4019 -#: unpack-trees.c:156

4281 +#: unpack-trees.c:160

4282 #, c-format

4283 msgid ""

4284 "The following untracked working tree files would be overwritten by %s:\n"

4285 "%%sPlease move or remove them before you %s."

4286 msgstr ""

4287

4026 -#: unpack-trees.c:158

4288 +#: unpack-trees.c:162

4289 #, c-format

4290 msgid ""

4291 "The following untracked working tree files would be overwritten by %s:\n"

4292 "%%s"

4293 msgstr ""

4294

4033 -#: unpack-trees.c:165

4295 +#: unpack-trees.c:170

4296 #, c-format

4297 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4298 msgstr ""

4299

4038 -#: unpack-trees.c:168

4300 +#: unpack-trees.c:173

4301 #, c-format

4302 msgid ""

4303 "Cannot update sparse checkout: the following entries are not up to date:\n"

4304 "%s"

4305 msgstr ""

4306

4045 -#: unpack-trees.c:170

4307 +#: unpack-trees.c:175

4308 #, c-format

4309 msgid ""

4310 "The following working tree files would be overwritten by sparse checkout "

@@ -4050,7 +4312,7 @@ msgid ""

4312 "%s"

4313 msgstr ""

4314

4053 -#: unpack-trees.c:172

4315 +#: unpack-trees.c:177

4316 #, c-format

4317 msgid ""

4318 "The following working tree files would be removed by sparse checkout "

@@ -4058,19 +4320,19 @@ msgid ""

4320 "%s"

4321 msgstr ""

4322

4061 -#: unpack-trees.c:174

4323 +#: unpack-trees.c:179

4324 #, c-format

4325 msgid ""

4326 "Cannot update submodule:\n"

4327 "%s"

4328 msgstr ""

4329

4068 -#: unpack-trees.c:251

4330 +#: unpack-trees.c:262

4331 #, c-format

4332 msgid "Aborting\n"

4333 msgstr ""

4334

4073 -#: unpack-trees.c:333

4335 +#: unpack-trees.c:344

4336 msgid "Checking out files"

4337 msgstr ""

4338

@@ -4139,7 +4401,7 @@ msgid "could not open '%s' for reading and writing"

4401 msgstr ""

4402

4403 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4142 -#: builtin/am.c:862 builtin/merge.c:1044

4404 +#: builtin/am.c:862 builtin/merge.c:1042

4405 #, c-format

4406 msgid "could not open '%s' for reading"

4407 msgstr ""

@@ -4153,374 +4415,374 @@ msgstr ""

4415 msgid "unable to get current working directory"

4416 msgstr ""

4417

4156 -#: wt-status.c:151

4418 +#: wt-status.c:154

4419 msgid "Unmerged paths:"

4420 msgstr ""

4421

4160 -#: wt-status.c:178 wt-status.c:205

4422 +#: wt-status.c:181 wt-status.c:208

4423 #, c-format

4424 msgid " (use \"git reset %s <file>...\" to unstage)"

4425 msgstr ""

4426

4165 -#: wt-status.c:180 wt-status.c:207

4427 +#: wt-status.c:183 wt-status.c:210

4428 msgid " (use \"git rm --cached <file>...\" to unstage)"

4429 msgstr ""

4430

4169 -#: wt-status.c:184

4431 +#: wt-status.c:187

4432 msgid " (use \"git add <file>...\" to mark resolution)"

4433 msgstr ""

4434

4173 -#: wt-status.c:186 wt-status.c:190

4435 +#: wt-status.c:189 wt-status.c:193

4436 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4437 msgstr ""

4438

4177 -#: wt-status.c:188

4439 +#: wt-status.c:191

4440 msgid " (use \"git rm <file>...\" to mark resolution)"

4441 msgstr ""

4442

4181 -#: wt-status.c:199 wt-status.c:1007

4443 +#: wt-status.c:202 wt-status.c:1015

4444 msgid "Changes to be committed:"

4445 msgstr ""

4446

4185 -#: wt-status.c:217 wt-status.c:1016

4447 +#: wt-status.c:220 wt-status.c:1024

4448 msgid "Changes not staged for commit:"

4449 msgstr ""

4450

4189 -#: wt-status.c:221

4451 +#: wt-status.c:224

4452 msgid " (use \"git add <file>...\" to update what will be committed)"

4453 msgstr ""

4454

4193 -#: wt-status.c:223

4455 +#: wt-status.c:226

4456 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4457 msgstr ""

4458

4197 -#: wt-status.c:224

4459 +#: wt-status.c:227

4460 msgid ""

4461 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4462 msgstr ""

4463

4202 -#: wt-status.c:226

4464 +#: wt-status.c:229

4465 msgid " (commit or discard the untracked or modified content in submodules)"

4466 msgstr ""

4467

4206 -#: wt-status.c:238

4468 +#: wt-status.c:241

4469 #, c-format

4470 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4471 msgstr ""

4472

4211 -#: wt-status.c:253

4473 +#: wt-status.c:256

4474 msgid "both deleted:"

4475 msgstr ""

4476

4215 -#: wt-status.c:255

4477 +#: wt-status.c:258

4478 msgid "added by us:"

4479 msgstr ""

4480

4219 -#: wt-status.c:257

4481 +#: wt-status.c:260

4482 msgid "deleted by them:"

4483 msgstr ""

4484

4223 -#: wt-status.c:259

4485 +#: wt-status.c:262

4486 msgid "added by them:"

4487 msgstr ""

4488

4227 -#: wt-status.c:261

4489 +#: wt-status.c:264

4490 msgid "deleted by us:"

4491 msgstr ""

4492

4231 -#: wt-status.c:263

4493 +#: wt-status.c:266

4494 msgid "both added:"

4495 msgstr ""

4496

4235 -#: wt-status.c:265

4497 +#: wt-status.c:268

4498 msgid "both modified:"

4499 msgstr ""

4500

4239 -#: wt-status.c:275

4501 +#: wt-status.c:278

4502 msgid "new file:"

4503 msgstr ""

4504

4243 -#: wt-status.c:277

4505 +#: wt-status.c:280

4506 msgid "copied:"

4507 msgstr ""

4508

4247 -#: wt-status.c:279

4509 +#: wt-status.c:282

4510 msgid "deleted:"

4511 msgstr ""

4512

4251 -#: wt-status.c:281

4513 +#: wt-status.c:284

4514 msgid "modified:"

4515 msgstr ""

4516

4255 -#: wt-status.c:283

4517 +#: wt-status.c:286

4518 msgid "renamed:"

4519 msgstr ""

4520

4259 -#: wt-status.c:285

4521 +#: wt-status.c:288

4522 msgid "typechange:"

4523 msgstr ""

4524

4263 -#: wt-status.c:287

4525 +#: wt-status.c:290

4526 msgid "unknown:"

4527 msgstr ""

4528

4267 -#: wt-status.c:289

4529 +#: wt-status.c:292

4530 msgid "unmerged:"

4531 msgstr ""

4532

4271 -#: wt-status.c:369

4533 +#: wt-status.c:372

4534 msgid "new commits, "

4535 msgstr ""

4536

4275 -#: wt-status.c:371

4537 +#: wt-status.c:374

4538 msgid "modified content, "

4539 msgstr ""

4540

4279 -#: wt-status.c:373

4541 +#: wt-status.c:376

4542 msgid "untracked content, "

4543 msgstr ""

4544

4283 -#: wt-status.c:847

4545 +#: wt-status.c:853

4546 #, c-format

4547 msgid "Your stash currently has %d entry"

4548 msgid_plural "Your stash currently has %d entries"

4549 msgstr[0] ""

4550 msgstr[1] ""

4551

4290 -#: wt-status.c:879

4552 +#: wt-status.c:885

4553 msgid "Submodules changed but not updated:"

4554 msgstr ""

4555

4294 -#: wt-status.c:881

4556 +#: wt-status.c:887

4557 msgid "Submodule changes to be committed:"

4558 msgstr ""

4559

4298 -#: wt-status.c:963

4560 +#: wt-status.c:969

4561 msgid ""

4562 "Do not modify or remove the line above.\n"

4563 "Everything below it will be ignored."

4564 msgstr ""

4565

4304 -#: wt-status.c:1076

4566 +#: wt-status.c:1084

4567 msgid "You have unmerged paths."

4568 msgstr ""

4569

4308 -#: wt-status.c:1079

4570 +#: wt-status.c:1087

4571 msgid " (fix conflicts and run \"git commit\")"

4572 msgstr ""

4573

4312 -#: wt-status.c:1081

4574 +#: wt-status.c:1089

4575 msgid " (use \"git merge --abort\" to abort the merge)"

4576 msgstr ""

4577

4316 -#: wt-status.c:1086

4578 +#: wt-status.c:1094

4579 msgid "All conflicts fixed but you are still merging."

4580 msgstr ""

4581

4320 -#: wt-status.c:1089

4582 +#: wt-status.c:1097

4583 msgid " (use \"git commit\" to conclude merge)"

4584 msgstr ""

4585

4324 -#: wt-status.c:1099

4586 +#: wt-status.c:1107

4587 msgid "You are in the middle of an am session."

4588 msgstr ""

4589

4328 -#: wt-status.c:1102

4590 +#: wt-status.c:1110

4591 msgid "The current patch is empty."

4592 msgstr ""

4593

4332 -#: wt-status.c:1106

4594 +#: wt-status.c:1114

4595 msgid " (fix conflicts and then run \"git am --continue\")"

4596 msgstr ""

4597

4336 -#: wt-status.c:1108

4598 +#: wt-status.c:1116

4599 msgid " (use \"git am --skip\" to skip this patch)"

4600 msgstr ""

4601

4340 -#: wt-status.c:1110

4602 +#: wt-status.c:1118

4603 msgid " (use \"git am --abort\" to restore the original branch)"

4604 msgstr ""

4605

4344 -#: wt-status.c:1242

4606 +#: wt-status.c:1250

4607 msgid "git-rebase-todo is missing."

4608 msgstr ""

4609

4348 -#: wt-status.c:1244

4610 +#: wt-status.c:1252

4611 msgid "No commands done."

4612 msgstr ""

4613

4352 -#: wt-status.c:1247

4614 +#: wt-status.c:1255

4615 #, c-format

4616 msgid "Last command done (%d command done):"

4617 msgid_plural "Last commands done (%d commands done):"

4618 msgstr[0] ""

4619 msgstr[1] ""

4620

4359 -#: wt-status.c:1258

4621 +#: wt-status.c:1266

4622 #, c-format

4623 msgid " (see more in file %s)"

4624 msgstr ""

4625

4364 -#: wt-status.c:1263

4626 +#: wt-status.c:1271

4627 msgid "No commands remaining."

4628 msgstr ""

4629

4368 -#: wt-status.c:1266

4630 +#: wt-status.c:1274

4631 #, c-format

4632 msgid "Next command to do (%d remaining command):"

4633 msgid_plural "Next commands to do (%d remaining commands):"

4634 msgstr[0] ""

4635 msgstr[1] ""

4636

4375 -#: wt-status.c:1274

4637 +#: wt-status.c:1282

4638 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4639 msgstr ""

4640

4379 -#: wt-status.c:1287

4641 +#: wt-status.c:1295

4642 #, c-format

4643 msgid "You are currently rebasing branch '%s' on '%s'."

4644 msgstr ""

4645

4384 -#: wt-status.c:1292

4646 +#: wt-status.c:1300

4647 msgid "You are currently rebasing."

4648 msgstr ""

4649

4388 -#: wt-status.c:1306

4650 +#: wt-status.c:1314

4651 msgid " (fix conflicts and then run \"git rebase --continue\")"

4652 msgstr ""

4653

4392 -#: wt-status.c:1308

4654 +#: wt-status.c:1316

4655 msgid " (use \"git rebase --skip\" to skip this patch)"

4656 msgstr ""

4657

4396 -#: wt-status.c:1310

4658 +#: wt-status.c:1318

4659 msgid " (use \"git rebase --abort\" to check out the original branch)"

4660 msgstr ""

4661

4400 -#: wt-status.c:1316

4662 +#: wt-status.c:1324

4663 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4664 msgstr ""

4665

4404 -#: wt-status.c:1320

4666 +#: wt-status.c:1328

4667 #, c-format

4668 msgid ""

4669 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

4670 msgstr ""

4671

4410 -#: wt-status.c:1325

4672 +#: wt-status.c:1333

4673 msgid "You are currently splitting a commit during a rebase."

4674 msgstr ""

4675

4414 -#: wt-status.c:1328

4676 +#: wt-status.c:1336

4677 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4678 msgstr ""

4679

4418 -#: wt-status.c:1332

4680 +#: wt-status.c:1340

4681 #, c-format

4682 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4683 msgstr ""

4684

4423 -#: wt-status.c:1337

4685 +#: wt-status.c:1345

4686 msgid "You are currently editing a commit during a rebase."

4687 msgstr ""

4688

4427 -#: wt-status.c:1340

4689 +#: wt-status.c:1348

4690 msgid " (use \"git commit --amend\" to amend the current commit)"

4691 msgstr ""

4692

4431 -#: wt-status.c:1342

4693 +#: wt-status.c:1350

4694 msgid ""

4695 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4696 msgstr ""

4697

4436 -#: wt-status.c:1352

4698 +#: wt-status.c:1360

4699 #, c-format

4700 msgid "You are currently cherry-picking commit %s."

4701 msgstr ""

4702

4441 -#: wt-status.c:1357

4703 +#: wt-status.c:1365

4704 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4705 msgstr ""

4706

4445 -#: wt-status.c:1360

4707 +#: wt-status.c:1368

4708 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4709 msgstr ""

4710

4449 -#: wt-status.c:1362

4711 +#: wt-status.c:1370

4712 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4713 msgstr ""

4714

4453 -#: wt-status.c:1371

4715 +#: wt-status.c:1379

4716 #, c-format

4717 msgid "You are currently reverting commit %s."

4718 msgstr ""

4719

4458 -#: wt-status.c:1376

4720 +#: wt-status.c:1384

4721 msgid " (fix conflicts and run \"git revert --continue\")"

4722 msgstr ""

4723

4462 -#: wt-status.c:1379

4724 +#: wt-status.c:1387

4725 msgid " (all conflicts fixed: run \"git revert --continue\")"

4726 msgstr ""

4727

4466 -#: wt-status.c:1381

4728 +#: wt-status.c:1389

4729 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4730 msgstr ""

4731

4470 -#: wt-status.c:1392

4732 +#: wt-status.c:1400

4733 #, c-format

4734 msgid "You are currently bisecting, started from branch '%s'."

4735 msgstr ""

4736

4475 -#: wt-status.c:1396

4737 +#: wt-status.c:1404

4738 msgid "You are currently bisecting."

4739 msgstr ""

4740

4479 -#: wt-status.c:1399

4741 +#: wt-status.c:1407

4742 msgid " (use \"git bisect reset\" to get back to the original branch)"

4743 msgstr ""

4744

4483 -#: wt-status.c:1596

4745 +#: wt-status.c:1604

4746 msgid "On branch "

4747 msgstr ""

4748

4487 -#: wt-status.c:1602

4749 +#: wt-status.c:1610

4750 msgid "interactive rebase in progress; onto "

4751 msgstr ""

4752

4491 -#: wt-status.c:1604

4753 +#: wt-status.c:1612

4754 msgid "rebase in progress; onto "

4755 msgstr ""

4756

4495 -#: wt-status.c:1609

4757 +#: wt-status.c:1617

4758 msgid "HEAD detached at "

4759 msgstr ""

4760

4499 -#: wt-status.c:1611

4761 +#: wt-status.c:1619

4762 msgid "HEAD detached from "

4763 msgstr ""

4764

4503 -#: wt-status.c:1614

4765 +#: wt-status.c:1622

4766 msgid "Not currently on any branch."

4767 msgstr ""

4768

4507 -#: wt-status.c:1634

4769 +#: wt-status.c:1642

4770 msgid "Initial commit"

4771 msgstr ""

4772

4511 -#: wt-status.c:1635

4773 +#: wt-status.c:1643

4774 msgid "No commits yet"

4775 msgstr ""

4776

4515 -#: wt-status.c:1649

4777 +#: wt-status.c:1657

4778 msgid "Untracked files"

4779 msgstr ""

4780

4519 -#: wt-status.c:1651

4781 +#: wt-status.c:1659

4782 msgid "Ignored files"

4783 msgstr ""

4784

4523 -#: wt-status.c:1655

4785 +#: wt-status.c:1663

4786 #, c-format

4787 msgid ""

4788 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4528,97 +4790,97 @@ msgid ""

4790 "new files yourself (see 'git help status')."

4791 msgstr ""

4792

4531 -#: wt-status.c:1661

4793 +#: wt-status.c:1669

4794 #, c-format

4795 msgid "Untracked files not listed%s"

4796 msgstr ""

4797

4536 -#: wt-status.c:1663

4798 +#: wt-status.c:1671

4799 msgid " (use -u option to show untracked files)"

4800 msgstr ""

4801

4540 -#: wt-status.c:1669

4802 +#: wt-status.c:1677

4803 msgid "No changes"

4804 msgstr ""

4805

4544 -#: wt-status.c:1674

4806 +#: wt-status.c:1682

4807 #, c-format

4808 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4809 msgstr ""

4810

4549 -#: wt-status.c:1677

4811 +#: wt-status.c:1685

4812 #, c-format

4813 msgid "no changes added to commit\n"

4814 msgstr ""

4815

4554 -#: wt-status.c:1680

4816 +#: wt-status.c:1688

4817 #, c-format

4818 msgid ""

4819 "nothing added to commit but untracked files present (use \"git add\" to "

4820 "track)\n"

4821 msgstr ""

4822

4561 -#: wt-status.c:1683

4823 +#: wt-status.c:1691

4824 #, c-format

4825 msgid "nothing added to commit but untracked files present\n"

4826 msgstr ""

4827

4566 -#: wt-status.c:1686

4828 +#: wt-status.c:1694

4829 #, c-format

4830 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4831 msgstr ""

4832

4571 -#: wt-status.c:1689 wt-status.c:1694

4833 +#: wt-status.c:1697 wt-status.c:1702

4834 #, c-format

4835 msgid "nothing to commit\n"

4836 msgstr ""

4837

4576 -#: wt-status.c:1692

4838 +#: wt-status.c:1700

4839 #, c-format

4840 msgid "nothing to commit (use -u to show untracked files)\n"

4841 msgstr ""

4842

4581 -#: wt-status.c:1696

4843 +#: wt-status.c:1704

4844 #, c-format

4845 msgid "nothing to commit, working tree clean\n"

4846 msgstr ""

4847

4586 -#: wt-status.c:1809

4848 +#: wt-status.c:1817

4849 msgid "No commits yet on "

4850 msgstr ""

4851

4590 -#: wt-status.c:1813

4852 +#: wt-status.c:1821

4853 msgid "HEAD (no branch)"

4854 msgstr ""

4855

4594 -#: wt-status.c:1844

4856 +#: wt-status.c:1852

4857 msgid "different"

4858 msgstr ""

4859

4598 -#: wt-status.c:1846 wt-status.c:1854

4860 +#: wt-status.c:1854 wt-status.c:1862

4861 msgid "behind "

4862 msgstr ""

4863

4602 -#: wt-status.c:1849 wt-status.c:1852

4864 +#: wt-status.c:1857 wt-status.c:1860

4865 msgid "ahead "

4866 msgstr ""

4867

4868 #. TRANSLATORS: the action is e.g. "pull with rebase"

4607 -#: wt-status.c:2358

4869 +#: wt-status.c:2366

4870 #, c-format

4871 msgid "cannot %s: You have unstaged changes."

4872 msgstr ""

4873

4612 -#: wt-status.c:2364

4874 +#: wt-status.c:2372

4875 msgid "additionally, your index contains uncommitted changes."

4876 msgstr ""

4877

4616 -#: wt-status.c:2366

4878 +#: wt-status.c:2374

4879 #, c-format

4880 msgid "cannot %s: Your index contains uncommitted changes."

4881 msgstr ""

4882

4621 -#: compat/precompose_utf8.c:58 builtin/clone.c:440

4883 +#: compat/precompose_utf8.c:58 builtin/clone.c:442

4884 #, c-format

4885 msgid "failed to unlink '%s'"

4886 msgstr ""

@@ -4632,7 +4894,7 @@ msgstr ""

4894 msgid "unexpected diff status %c"

4895 msgstr ""

4896

4635 -#: builtin/add.c:88 builtin/commit.c:257

4897 +#: builtin/add.c:88 builtin/commit.c:266

4898 msgid "updating files failed"

4899 msgstr ""

4900

@@ -4676,77 +4938,77 @@ msgstr ""

4938 msgid "Could not apply '%s'"

4939 msgstr ""

4940

4679 -#: builtin/add.c:271

4941 +#: builtin/add.c:269

4942 msgid "The following paths are ignored by one of your .gitignore files:\n"

4943 msgstr ""

4944

4683 -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124

4684 -#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

4685 -#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4945 +#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123

4946 +#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557

4947 +#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165

4948 msgid "dry run"

4949 msgstr ""

4950

4689 -#: builtin/add.c:294

4951 +#: builtin/add.c:292

4952 msgid "interactive picking"

4953 msgstr ""

4954

4693 -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

4955 +#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302

4956 msgid "select hunks interactively"

4957 msgstr ""

4958

4697 -#: builtin/add.c:296

4959 +#: builtin/add.c:294

4960 msgid "edit current diff and apply"

4961 msgstr ""

4962

4701 -#: builtin/add.c:297

4963 +#: builtin/add.c:295

4964 msgid "allow adding otherwise ignored files"

4965 msgstr ""

4966

4705 -#: builtin/add.c:298

4967 +#: builtin/add.c:296

4968 msgid "update tracked files"

4969 msgstr ""

4970

4709 -#: builtin/add.c:299

4971 +#: builtin/add.c:297

4972 msgid "renormalize EOL of tracked files (implies -u)"

4973 msgstr ""

4974

4713 -#: builtin/add.c:300

4975 +#: builtin/add.c:298

4976 msgid "record only the fact that the path will be added later"

4977 msgstr ""

4978

4717 -#: builtin/add.c:301

4979 +#: builtin/add.c:299

4980 msgid "add changes from all tracked and untracked files"

4981 msgstr ""

4982

4721 -#: builtin/add.c:304

4983 +#: builtin/add.c:302

4984 msgid "ignore paths removed in the working tree (same as --no-all)"

4985 msgstr ""

4986

4725 -#: builtin/add.c:306

4987 +#: builtin/add.c:304

4988 msgid "don't add, only refresh the index"

4989 msgstr ""

4990

4729 -#: builtin/add.c:307

4991 +#: builtin/add.c:305

4992 msgid "just skip files which cannot be added because of errors"

4993 msgstr ""

4994

4733 -#: builtin/add.c:308

4995 +#: builtin/add.c:306

4996 msgid "check if - even missing - files are ignored in dry run"

4997 msgstr ""

4998

4737 -#: builtin/add.c:309 builtin/update-index.c:964

4999 +#: builtin/add.c:307 builtin/update-index.c:974

5000 msgid "(+/-)x"

5001 msgstr ""

5002

4741 -#: builtin/add.c:309 builtin/update-index.c:965

5003 +#: builtin/add.c:307 builtin/update-index.c:975

5004 msgid "override the executable bit of the listed files"

5005 msgstr ""

5006

4745 -#: builtin/add.c:311

5007 +#: builtin/add.c:309

5008 msgid "warn when adding an embedded repository"

5009 msgstr ""

5010

4749 -#: builtin/add.c:326

5011 +#: builtin/add.c:324

5012 #, c-format

5013 msgid ""

5014 "You've added another git repository inside your current repository.\n"

@@ -4764,47 +5026,47 @@ msgid ""

5026 "See \"git help submodule\" for more information."

5027 msgstr ""

5028

4767 -#: builtin/add.c:354

5029 +#: builtin/add.c:352

5030 #, c-format

5031 msgid "adding embedded git repository: %s"

5032 msgstr ""

5033

4772 -#: builtin/add.c:372

5034 +#: builtin/add.c:370

5035 #, c-format

5036 msgid "Use -f if you really want to add them.\n"

5037 msgstr ""

5038

4777 -#: builtin/add.c:380

5039 +#: builtin/add.c:378

5040 msgid "adding files failed"

5041 msgstr ""

5042

4781 -#: builtin/add.c:417

5043 +#: builtin/add.c:416

5044 msgid "-A and -u are mutually incompatible"

5045 msgstr ""

5046

4785 -#: builtin/add.c:424

5047 +#: builtin/add.c:423

5048 msgid "Option --ignore-missing can only be used together with --dry-run"

5049 msgstr ""

5050

4789 -#: builtin/add.c:428

5051 +#: builtin/add.c:427

5052 #, c-format

5053 msgid "--chmod param '%s' must be either -x or +x"

5054 msgstr ""

5055

4794 -#: builtin/add.c:443

5056 +#: builtin/add.c:442

5057 #, c-format

5058 msgid "Nothing specified, nothing added.\n"

5059 msgstr ""

5060

4799 -#: builtin/add.c:444

5061 +#: builtin/add.c:443

5062 #, c-format

5063 msgid "Maybe you wanted to say 'git add .'?\n"

5064 msgstr ""

5065

4804 -#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280

4805 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316

5066 +#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280

5067 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325

5068 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

4807 -#: builtin/rm.c:271 builtin/submodule--helper.c:326

5069 +#: builtin/rm.c:270 builtin/submodule--helper.c:328

5070 msgid "index file corrupt"

5071 msgstr ""

5072

@@ -4856,7 +5118,7 @@ msgstr ""

5118 msgid "Patch format detection failed."

5119 msgstr ""

5120

4859 -#: builtin/am.c:1013 builtin/clone.c:405

5121 +#: builtin/am.c:1013 builtin/clone.c:407

5122 #, c-format

5123 msgid "failed to create directory '%s'"

5124 msgstr ""

@@ -4865,7 +5127,7 @@ msgstr ""

5127 msgid "Failed to split patches."

5128 msgstr ""

5129

4868 -#: builtin/am.c:1148 builtin/commit.c:342

5130 +#: builtin/am.c:1148 builtin/commit.c:351

5131 msgid "unable to write index file"

5132 msgstr ""

5133

@@ -5025,7 +5287,7 @@ msgid "allow fall back on 3way merging if needed"

5287 msgstr ""

5288

5289 #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5028 -#: builtin/repack.c:182

5290 +#: builtin/repack.c:192

5291 msgid "be quiet"

5292 msgstr ""

5293

@@ -5067,16 +5329,17 @@ msgstr ""

5329 msgid "pass it through git-apply"

5330 msgstr ""

5331

5070 -#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5071 -#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203

5072 -#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197

5073 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382

5074 -#: parse-options.h:144 parse-options.h:146 parse-options.h:257

5332 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665

5333 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207

5334 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201

5335 +#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631

5336 +#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144

5337 +#: parse-options.h:146 parse-options.h:258

5338 msgid "n"

5339 msgstr ""

5340

5078 -#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38

5079 -#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39

5341 +#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38

5342 +#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39

5343 msgid "format"

5344 msgstr ""

5345

@@ -5120,8 +5383,8 @@ msgstr ""

5383 msgid "use current timestamp for author date"

5384 msgstr ""

5385

5123 -#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237

5124 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398

5386 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238

5387 +#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399

5388 msgid "key-id"

5389 msgstr ""

5390

@@ -5256,115 +5519,141 @@ msgstr ""

5519 msgid "--bisect-clean-state requires no arguments"

5520 msgstr ""

5521

5259 -#: builtin/blame.c:27

5522 +#: builtin/blame.c:29

5523 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

5524 msgstr ""

5525

5263 -#: builtin/blame.c:32

5526 +#: builtin/blame.c:34

5527 msgid "<rev-opts> are documented in git-rev-list(1)"

5528 msgstr ""

5529

5267 -#: builtin/blame.c:677

5530 +#: builtin/blame.c:404

5531 +#, c-format

5532 +msgid "expecting a color: %s"

5533 +msgstr ""

5534 +

5535 +#: builtin/blame.c:411

5536 +msgid "must end with a color"

5537 +msgstr ""

5538 +

5539 +#: builtin/blame.c:697

5540 +#, c-format

5541 +msgid "invalid color '%s' in color.blame.repeatedLines"

5542 +msgstr ""

5543 +

5544 +#: builtin/blame.c:715

5545 +msgid "invalid value for blame.coloring"

5546 +msgstr ""

5547 +

5548 +#: builtin/blame.c:786

5549 msgid "Show blame entries as we find them, incrementally"

5550 msgstr ""

5551

5271 -#: builtin/blame.c:678

5552 +#: builtin/blame.c:787

5553 msgid "Show blank SHA-1 for boundary commits (Default: off)"

5554 msgstr ""

5555

5275 -#: builtin/blame.c:679

5556 +#: builtin/blame.c:788

5557 msgid "Do not treat root commits as boundaries (Default: off)"

5558 msgstr ""

5559

5279 -#: builtin/blame.c:680

5560 +#: builtin/blame.c:789

5561 msgid "Show work cost statistics"

5562 msgstr ""

5563

5283 -#: builtin/blame.c:681

5564 +#: builtin/blame.c:790

5565 msgid "Force progress reporting"

5566 msgstr ""

5567

5287 -#: builtin/blame.c:682

5568 +#: builtin/blame.c:791

5569 msgid "Show output score for blame entries"

5570 msgstr ""

5571

5291 -#: builtin/blame.c:683

5572 +#: builtin/blame.c:792

5573 msgid "Show original filename (Default: auto)"

5574 msgstr ""

5575

5295 -#: builtin/blame.c:684

5576 +#: builtin/blame.c:793

5577 msgid "Show original linenumber (Default: off)"

5578 msgstr ""

5579

5299 -#: builtin/blame.c:685

5580 +#: builtin/blame.c:794

5581 msgid "Show in a format designed for machine consumption"

5582 msgstr ""

5583

5303 -#: builtin/blame.c:686

5584 +#: builtin/blame.c:795

5585 msgid "Show porcelain format with per-line commit information"

5586 msgstr ""

5587

5307 -#: builtin/blame.c:687

5588 +#: builtin/blame.c:796

5589 msgid "Use the same output mode as git-annotate (Default: off)"

5590 msgstr ""

5591

5311 -#: builtin/blame.c:688

5592 +#: builtin/blame.c:797

5593 msgid "Show raw timestamp (Default: off)"

5594 msgstr ""

5595

5315 -#: builtin/blame.c:689

5596 +#: builtin/blame.c:798

5597 msgid "Show long commit SHA1 (Default: off)"

5598 msgstr ""

5599

5319 -#: builtin/blame.c:690

5600 +#: builtin/blame.c:799

5601 msgid "Suppress author name and timestamp (Default: off)"

5602 msgstr ""

5603

5323 -#: builtin/blame.c:691

5604 +#: builtin/blame.c:800

5605 msgid "Show author email instead of name (Default: off)"

5606 msgstr ""

5607

5327 -#: builtin/blame.c:692

5608 +#: builtin/blame.c:801

5609 msgid "Ignore whitespace differences"

5610 msgstr ""

5611

5331 -#: builtin/blame.c:699

5612 +#: builtin/blame.c:802

5613 +msgid "color redundant metadata from previous line differently"

5614 +msgstr ""

5615 +

5616 +#: builtin/blame.c:803

5617 +msgid "color lines by age"

5618 +msgstr ""

5619 +

5620 +#: builtin/blame.c:810

5621 msgid "Use an experimental heuristic to improve diffs"

5622 msgstr ""

5623

5335 -#: builtin/blame.c:701

5624 +#: builtin/blame.c:812

5625 msgid "Spend extra cycles to find better match"

5626 msgstr ""

5627

5339 -#: builtin/blame.c:702

5628 +#: builtin/blame.c:813

5629 msgid "Use revisions from <file> instead of calling git-rev-list"

5630 msgstr ""

5631

5343 -#: builtin/blame.c:703

5632 +#: builtin/blame.c:814

5633 msgid "Use <file>'s contents as the final image"

5634 msgstr ""

5635

5347 -#: builtin/blame.c:704 builtin/blame.c:705

5636 +#: builtin/blame.c:815 builtin/blame.c:816

5637 msgid "score"

5638 msgstr ""

5639

5351 -#: builtin/blame.c:704

5640 +#: builtin/blame.c:815

5641 msgid "Find line copies within and across files"

5642 msgstr ""

5643

5355 -#: builtin/blame.c:705

5644 +#: builtin/blame.c:816

5645 msgid "Find line movements within and across files"

5646 msgstr ""

5647

5359 -#: builtin/blame.c:706

5648 +#: builtin/blame.c:817

5649 msgid "n,m"

5650 msgstr ""

5651

5363 -#: builtin/blame.c:706

5652 +#: builtin/blame.c:817

5653 msgid "Process only line range n,m, counting from 1"

5654 msgstr ""

5655

5367 -#: builtin/blame.c:753

5656 +#: builtin/blame.c:866

5657 msgid "--progress can't be used with --incremental or porcelain formats"

5658 msgstr ""

5659

@@ -5376,18 +5665,18 @@ msgstr ""

5665 #. your language may need more or fewer display

5666 #. columns.

5667 #.

5379 -#: builtin/blame.c:804

5668 +#: builtin/blame.c:917

5669 msgid "4 years, 11 months ago"

5670 msgstr ""

5671

5383 -#: builtin/blame.c:890

5672 +#: builtin/blame.c:1003

5673 #, c-format

5674 msgid "file %s has only %lu line"

5675 msgid_plural "file %s has only %lu lines"

5676 msgstr[0] ""

5677 msgstr[1] ""

5678

5390 -#: builtin/blame.c:936

5679 +#: builtin/blame.c:1049

5680 msgid "Blaming lines"

5681 msgstr ""

5682

@@ -5492,65 +5781,65 @@ msgstr ""

5781 msgid "Deleted branch %s (was %s).\n"

5782 msgstr ""

5783

5495 -#: builtin/branch.c:417 builtin/tag.c:58

5784 +#: builtin/branch.c:416 builtin/tag.c:58

5785 msgid "unable to parse format string"

5786 msgstr ""

5787

5499 -#: builtin/branch.c:450

5788 +#: builtin/branch.c:453

5789 #, c-format

5790 msgid "Branch %s is being rebased at %s"

5791 msgstr ""

5792

5504 -#: builtin/branch.c:454

5793 +#: builtin/branch.c:457

5794 #, c-format

5795 msgid "Branch %s is being bisected at %s"

5796 msgstr ""

5797

5509 -#: builtin/branch.c:471

5798 +#: builtin/branch.c:474

5799 msgid "cannot copy the current branch while not on any."

5800 msgstr ""

5801

5513 -#: builtin/branch.c:473

5802 +#: builtin/branch.c:476

5803 msgid "cannot rename the current branch while not on any."

5804 msgstr ""

5805

5517 -#: builtin/branch.c:484

5806 +#: builtin/branch.c:487

5807 #, c-format

5808 msgid "Invalid branch name: '%s'"

5809 msgstr ""

5810

5522 -#: builtin/branch.c:511

5811 +#: builtin/branch.c:514

5812 msgid "Branch rename failed"

5813 msgstr ""

5814

5526 -#: builtin/branch.c:513

5815 +#: builtin/branch.c:516

5816 msgid "Branch copy failed"

5817 msgstr ""

5818

5530 -#: builtin/branch.c:517

5819 +#: builtin/branch.c:520

5820 #, c-format

5821 msgid "Created a copy of a misnamed branch '%s'"

5822 msgstr ""

5823

5535 -#: builtin/branch.c:520

5824 +#: builtin/branch.c:523

5825 #, c-format

5826 msgid "Renamed a misnamed branch '%s' away"

5827 msgstr ""

5828

5540 -#: builtin/branch.c:526

5829 +#: builtin/branch.c:529

5830 #, c-format

5831 msgid "Branch renamed to %s, but HEAD is not updated!"

5832 msgstr ""

5833

5545 -#: builtin/branch.c:535

5834 +#: builtin/branch.c:538

5835 msgid "Branch is renamed, but update of config-file failed"

5836 msgstr ""

5837

5549 -#: builtin/branch.c:537

5838 +#: builtin/branch.c:540

5839 msgid "Branch is copied, but update of config-file failed"

5840 msgstr ""

5841

5553 -#: builtin/branch.c:553

5842 +#: builtin/branch.c:556

5843 #, c-format

5844 msgid ""

5845 "Please edit the description for the branch\n"

@@ -5558,217 +5847,219 @@ msgid ""

5847 "Lines starting with '%c' will be stripped.\n"

5848 msgstr ""

5849

5561 -#: builtin/branch.c:586

5850 +#: builtin/branch.c:589

5851 msgid "Generic options"

5852 msgstr ""

5853

5565 -#: builtin/branch.c:588

5854 +#: builtin/branch.c:591

5855 msgid "show hash and subject, give twice for upstream branch"

5856 msgstr ""

5857

5569 -#: builtin/branch.c:589

5858 +#: builtin/branch.c:592

5859 msgid "suppress informational messages"

5860 msgstr ""

5861

5573 -#: builtin/branch.c:590

5862 +#: builtin/branch.c:593

5863 msgid "set up tracking mode (see git-pull(1))"

5864 msgstr ""

5865

5577 -#: builtin/branch.c:592

5866 +#: builtin/branch.c:595

5867 msgid "do not use"

5868 msgstr ""

5869

5581 -#: builtin/branch.c:594

5870 +#: builtin/branch.c:597

5871 msgid "upstream"

5872 msgstr ""

5873

5585 -#: builtin/branch.c:594

5874 +#: builtin/branch.c:597

5875 msgid "change the upstream info"

5876 msgstr ""

5877

5589 -#: builtin/branch.c:595

5878 +#: builtin/branch.c:598

5879 msgid "Unset the upstream info"

5880 msgstr ""

5881

5593 -#: builtin/branch.c:596

5882 +#: builtin/branch.c:599

5883 msgid "use colored output"

5884 msgstr ""

5885

5597 -#: builtin/branch.c:597

5886 +#: builtin/branch.c:600

5887 msgid "act on remote-tracking branches"

5888 msgstr ""

5889

5601 -#: builtin/branch.c:599 builtin/branch.c:601

5890 +#: builtin/branch.c:602 builtin/branch.c:604

5891 msgid "print only branches that contain the commit"

5892 msgstr ""

5893

5605 -#: builtin/branch.c:600 builtin/branch.c:602

5894 +#: builtin/branch.c:603 builtin/branch.c:605

5895 msgid "print only branches that don't contain the commit"

5896 msgstr ""

5897

5609 -#: builtin/branch.c:605

5898 +#: builtin/branch.c:608

5899 msgid "Specific git-branch actions:"

5900 msgstr ""

5901

5613 -#: builtin/branch.c:606

5902 +#: builtin/branch.c:609

5903 msgid "list both remote-tracking and local branches"

5904 msgstr ""

5905

5617 -#: builtin/branch.c:608

5906 +#: builtin/branch.c:611

5907 msgid "delete fully merged branch"

5908 msgstr ""

5909

5621 -#: builtin/branch.c:609

5910 +#: builtin/branch.c:612

5911 msgid "delete branch (even if not merged)"

5912 msgstr ""

5913

5625 -#: builtin/branch.c:610

5914 +#: builtin/branch.c:613

5915 msgid "move/rename a branch and its reflog"

5916 msgstr ""

5917

5629 -#: builtin/branch.c:611

5918 +#: builtin/branch.c:614

5919 msgid "move/rename a branch, even if target exists"

5920 msgstr ""

5921

5633 -#: builtin/branch.c:612

5922 +#: builtin/branch.c:615

5923 msgid "copy a branch and its reflog"

5924 msgstr ""

5925

5637 -#: builtin/branch.c:613

5926 +#: builtin/branch.c:616

5927 msgid "copy a branch, even if target exists"

5928 msgstr ""

5929

5641 -#: builtin/branch.c:614

5930 +#: builtin/branch.c:617

5931 msgid "list branch names"

5932 msgstr ""

5933

5645 -#: builtin/branch.c:615

5934 +#: builtin/branch.c:618

5935 msgid "create the branch's reflog"

5936 msgstr ""

5937

5649 -#: builtin/branch.c:617

5938 +#: builtin/branch.c:620

5939 msgid "edit the description for the branch"

5940 msgstr ""

5941

5653 -#: builtin/branch.c:618

5942 +#: builtin/branch.c:621

5943 msgid "force creation, move/rename, deletion"

5944 msgstr ""

5945

5657 -#: builtin/branch.c:619

5946 +#: builtin/branch.c:622

5947 msgid "print only branches that are merged"

5948 msgstr ""

5949

5661 -#: builtin/branch.c:620

5950 +#: builtin/branch.c:623

5951 msgid "print only branches that are not merged"

5952 msgstr ""

5953

5665 -#: builtin/branch.c:621

5954 +#: builtin/branch.c:624

5955 msgid "list branches in columns"

5956 msgstr ""

5957

5669 -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411

5958 +#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70

5959 +#: builtin/tag.c:412

5960 msgid "key"

5961 msgstr ""

5962

5673 -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412

5963 +#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71

5964 +#: builtin/tag.c:413

5965 msgid "field name to sort on"

5966 msgstr ""

5967

5677 -#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

5968 +#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408

5969 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5679 -#: builtin/tag.c:414

5970 +#: builtin/tag.c:415

5971 msgid "object"

5972 msgstr ""

5973

5683 -#: builtin/branch.c:626

5974 +#: builtin/branch.c:629

5975 msgid "print only branches of the object"

5976 msgstr ""

5977

5687 -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421

5978 +#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422

5979 msgid "sorting and filtering are case insensitive"

5980 msgstr ""

5981

5691 -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419

5982 +#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420

5983 #: builtin/verify-tag.c:39

5984 msgid "format to use for the output"

5985 msgstr ""

5986

5696 -#: builtin/branch.c:652 builtin/clone.c:735

5987 +#: builtin/branch.c:655 builtin/clone.c:737

5988 msgid "HEAD not found below refs/heads!"

5989 msgstr ""

5990

5700 -#: builtin/branch.c:675

5991 +#: builtin/branch.c:678

5992 msgid "--column and --verbose are incompatible"

5993 msgstr ""

5994

5704 -#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751

5995 +#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754

5996 msgid "branch name required"

5997 msgstr ""

5998

5708 -#: builtin/branch.c:718

5999 +#: builtin/branch.c:721

6000 msgid "Cannot give description to detached HEAD"

6001 msgstr ""

6002

5712 -#: builtin/branch.c:723

6003 +#: builtin/branch.c:726

6004 msgid "cannot edit description of more than one branch"

6005 msgstr ""

6006

5716 -#: builtin/branch.c:730

6007 +#: builtin/branch.c:733

6008 #, c-format

6009 msgid "No commit on branch '%s' yet."

6010 msgstr ""

6011

5721 -#: builtin/branch.c:733

6012 +#: builtin/branch.c:736

6013 #, c-format

6014 msgid "No branch named '%s'."

6015 msgstr ""

6016

5726 -#: builtin/branch.c:748

6017 +#: builtin/branch.c:751

6018 msgid "too many branches for a copy operation"

6019 msgstr ""

6020

5730 -#: builtin/branch.c:757

6021 +#: builtin/branch.c:760

6022 msgid "too many arguments for a rename operation"

6023 msgstr ""

6024

5734 -#: builtin/branch.c:762

6025 +#: builtin/branch.c:765

6026 msgid "too many arguments to set new upstream"

6027 msgstr ""

6028

5738 -#: builtin/branch.c:766

6029 +#: builtin/branch.c:769

6030 #, c-format

6031 msgid ""

6032 "could not set upstream of HEAD to %s when it does not point to any branch."

6033 msgstr ""

6034

5744 -#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807

6035 +#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810

6036 #, c-format

6037 msgid "no such branch '%s'"

l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed)