@matheusbsbs / matheus-bagliano / commits / 98ac781508

l10n: git.pot: v2.19.0 round 2 (3 new, 5 removed)

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

Jiang Xin committed Sep 4, 2018 at 08:51 UTC 98ac7815086fc472e5a657af79c070b213279d7a
1 file changed +247 -255
po/git.pot
+247 -255
@@ -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-08-21 08:28+0800\n"
11 +"POT-Creation-Date: 2018-09-04 08:50+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -655,7 +655,7 @@ msgstr ""
655
656 #: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95
657 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
658 -#: builtin/pack-objects.c:3205
658 +#: builtin/pack-objects.c:3202
659 msgid "action"
660 msgstr ""
661
@@ -984,42 +984,42 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
984 msgstr[0] ""
985 msgstr[1] ""
986
987 -#: blame.c:1786
987 +#: blame.c:1784
988 msgid "--contents and --reverse do not blend well."
989 msgstr ""
990
991 -#: blame.c:1800
991 +#: blame.c:1798
992 msgid "cannot use --contents with final commit object name"
993 msgstr ""
994
995 -#: blame.c:1821
995 +#: blame.c:1819
996 msgid "--reverse and --first-parent together require specified latest commit"
997 msgstr ""
998
999 -#: blame.c:1830 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
999 +#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
1000 #: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926
1001 #: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404
1002 -#: builtin/pack-objects.c:3032 builtin/pack-objects.c:3047
1002 +#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044
1003 #: builtin/shortlog.c:192
1004 msgid "revision walk setup failed"
1005 msgstr ""
1006
1007 -#: blame.c:1848
1007 +#: blame.c:1846
1008 msgid ""
1009 "--reverse --first-parent together require range along first-parent chain"
1010 msgstr ""
1011
1012 -#: blame.c:1859
1012 +#: blame.c:1857
1013 #, c-format
1014 msgid "no such path %s in %s"
1015 msgstr ""
1016
1017 -#: blame.c:1870
1017 +#: blame.c:1868
1018 #, c-format
1019 msgid "cannot read blob %s for path %s"
1020 msgstr ""
1021
1022 -#: branch.c:54
1022 +#: branch.c:52
1023 #, c-format
1024 msgid ""
1025 "\n"
@@ -1028,85 +1028,85 @@ msgid ""
1028 "\"git branch --set-upstream-to=%s%s%s\"."
1029 msgstr ""
1030
1031 -#: branch.c:68
1031 +#: branch.c:66
1032 #, c-format
1033 msgid "Not setting branch %s as its own upstream."
1034 msgstr ""
1035
1036 -#: branch.c:94
1036 +#: branch.c:92
1037 #, c-format
1038 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1039 msgstr ""
1040
1041 -#: branch.c:95
1041 +#: branch.c:93
1042 #, c-format
1043 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1044 msgstr ""
1045
1046 -#: branch.c:99
1046 +#: branch.c:97
1047 #, c-format
1048 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1049 msgstr ""
1050
1051 -#: branch.c:100
1051 +#: branch.c:98
1052 #, c-format
1053 msgid "Branch '%s' set up to track local branch '%s'."
1054 msgstr ""
1055
1056 -#: branch.c:105
1056 +#: branch.c:103
1057 #, c-format
1058 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1059 msgstr ""
1060
1061 -#: branch.c:106
1061 +#: branch.c:104
1062 #, c-format
1063 msgid "Branch '%s' set up to track remote ref '%s'."
1064 msgstr ""
1065
1066 -#: branch.c:110
1066 +#: branch.c:108
1067 #, c-format
1068 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1069 msgstr ""
1070
1071 -#: branch.c:111
1071 +#: branch.c:109
1072 #, c-format
1073 msgid "Branch '%s' set up to track local ref '%s'."
1074 msgstr ""
1075
1076 -#: branch.c:120
1076 +#: branch.c:118
1077 msgid "Unable to write upstream branch configuration"
1078 msgstr ""
1079
1080 -#: branch.c:157
1080 +#: branch.c:155
1081 #, c-format
1082 msgid "Not tracking: ambiguous information for ref %s"
1083 msgstr ""
1084
1085 -#: branch.c:190
1085 +#: branch.c:188
1086 #, c-format
1087 msgid "'%s' is not a valid branch name."
1088 msgstr ""
1089
1090 -#: branch.c:209
1090 +#: branch.c:207
1091 #, c-format
1092 msgid "A branch named '%s' already exists."
1093 msgstr ""
1094
1095 -#: branch.c:214
1095 +#: branch.c:212
1096 msgid "Cannot force update the current branch."
1097 msgstr ""
1098
1099 -#: branch.c:234
1099 +#: branch.c:232
1100 #, c-format
1101 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1102 msgstr ""
1103
1104 -#: branch.c:236
1104 +#: branch.c:234
1105 #, c-format
1106 msgid "the requested upstream branch '%s' does not exist"
1107 msgstr ""
1108
1109 -#: branch.c:238
1109 +#: branch.c:236
1110 msgid ""
1111 "\n"
1112 "If you are planning on basing your work on an upstream\n"
@@ -1118,27 +1118,27 @@ msgid ""
1118 "\"git push -u\" to set the upstream config as you push."
1119 msgstr ""
1120
1121 -#: branch.c:281
1121 +#: branch.c:279
1122 #, c-format
1123 msgid "Not a valid object name: '%s'."
1124 msgstr ""
1125
1126 -#: branch.c:301
1126 +#: branch.c:299
1127 #, c-format
1128 msgid "Ambiguous object name: '%s'."
1129 msgstr ""
1130
1131 -#: branch.c:306
1131 +#: branch.c:304
1132 #, c-format
1133 msgid "Not a valid branch point: '%s'."
1134 msgstr ""
1135
1136 -#: branch.c:360
1136 +#: branch.c:358
1137 #, c-format
1138 msgid "'%s' is already checked out at '%s'"
1139 msgstr ""
1140
1141 -#: branch.c:383
1141 +#: branch.c:381
1142 #, c-format
1143 msgid "HEAD of working tree %s is not updated"
1144 msgstr ""
@@ -1286,7 +1286,7 @@ msgstr ""
1286 msgid "could not find commit %s"
1287 msgstr ""
1288
1289 -#: commit-graph.c:565 builtin/pack-objects.c:2571
1289 +#: commit-graph.c:565 builtin/pack-objects.c:2568
1290 #, c-format
1291 msgid "unable to get type of object %s"
1292 msgstr ""
@@ -1330,7 +1330,7 @@ msgid ""
1330 "\t%s\n"
1331 "from\n"
1332 "\t%s\n"
1333 -"Do you have circular includes?"
1333 +"This might be due to circular includes."
1334 msgstr ""
1335
1336 #: config.c:139
@@ -1492,7 +1492,7 @@ msgstr ""
1492 msgid "must be one of nothing, matching, simple, upstream or current"
1493 msgstr ""
1494
1495 -#: config.c:1489 builtin/pack-objects.c:3282
1495 +#: config.c:1489 builtin/pack-objects.c:3279
1496 #, c-format
1497 msgid "bad pack compression level %d"
1498 msgstr ""
@@ -3929,9 +3929,9 @@ msgstr ""
3929 msgid "could not resolve HEAD commit"
3930 msgstr ""
3931
3932 -#: sequencer.c:723
3932 +#: sequencer.c:723 sequencer.c:740
3933 #, c-format
3934 -msgid "could not parse '%s' (looking for '%s'"
3934 +msgid "could not parse '%s' (looking for '%s')"
3935 msgstr ""
3936
3937 #: sequencer.c:731
@@ -3939,11 +3939,6 @@ msgstr ""
3939 msgid "bad quoting on %s value in '%s'"
3940 msgstr ""
3941
3942 -#: sequencer.c:740
3943 -#, c-format
3944 -msgid "could not parse '%s' (looking for '%s')"
3945 -msgstr ""
3946 -
3942 #: sequencer.c:747
3943 #, c-format
3944 msgid "invalid date format '%s' in '%s'"
@@ -5028,7 +5023,7 @@ msgstr ""
5023 msgid "submodule entry '%s' (%s) is a %s, not a commit"
5024 msgstr ""
5025
5031 -#: submodule.c:1071 builtin/branch.c:662 builtin/submodule--helper.c:1888
5026 +#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888
5027 msgid "Failed to resolve HEAD as a valid ref."
5028 msgstr ""
5029
@@ -6602,7 +6597,7 @@ msgstr ""
6597 msgid "n"
6598 msgstr ""
6599
6605 -#: builtin/am.c:2266 builtin/branch.c:643 builtin/for-each-ref.c:38
6600 +#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38
6601 #: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39
6602 msgid "format"
6603 msgstr ""
@@ -6972,138 +6967,138 @@ msgstr ""
6967 msgid "git branch [<options>] [-r | -a] [--format]"
6968 msgstr ""
6969
6975 -#: builtin/branch.c:143
6970 +#: builtin/branch.c:151
6971 #, c-format
6972 msgid ""
6973 "deleting branch '%s' that has been merged to\n"
6974 " '%s', but not yet merged to HEAD."
6975 msgstr ""
6976
6982 -#: builtin/branch.c:147
6977 +#: builtin/branch.c:155
6978 #, c-format
6979 msgid ""
6980 "not deleting branch '%s' that is not yet merged to\n"
6981 " '%s', even though it is merged to HEAD."
6982 msgstr ""
6983
6989 -#: builtin/branch.c:161
6984 +#: builtin/branch.c:169
6985 #, c-format
6986 msgid "Couldn't look up commit object for '%s'"
6987 msgstr ""
6988
6994 -#: builtin/branch.c:165
6989 +#: builtin/branch.c:173
6990 #, c-format
6991 msgid ""
6992 "The branch '%s' is not fully merged.\n"
6993 "If you are sure you want to delete it, run 'git branch -D %s'."
6994 msgstr ""
6995
7001 -#: builtin/branch.c:178
6996 +#: builtin/branch.c:186
6997 msgid "Update of config-file failed"
6998 msgstr ""
6999
7005 -#: builtin/branch.c:209
7000 +#: builtin/branch.c:217
7001 msgid "cannot use -a with -d"
7002 msgstr ""
7003
7009 -#: builtin/branch.c:215
7004 +#: builtin/branch.c:223
7005 msgid "Couldn't look up commit object for HEAD"
7006 msgstr ""
7007
7013 -#: builtin/branch.c:229
7008 +#: builtin/branch.c:237
7009 #, c-format
7010 msgid "Cannot delete branch '%s' checked out at '%s'"
7011 msgstr ""
7012
7018 -#: builtin/branch.c:244
7013 +#: builtin/branch.c:252
7014 #, c-format
7015 msgid "remote-tracking branch '%s' not found."
7016 msgstr ""
7017
7023 -#: builtin/branch.c:245
7018 +#: builtin/branch.c:253
7019 #, c-format
7020 msgid "branch '%s' not found."
7021 msgstr ""
7022
7028 -#: builtin/branch.c:260
7023 +#: builtin/branch.c:268
7024 #, c-format
7025 msgid "Error deleting remote-tracking branch '%s'"
7026 msgstr ""
7027
7033 -#: builtin/branch.c:261
7028 +#: builtin/branch.c:269
7029 #, c-format
7030 msgid "Error deleting branch '%s'"
7031 msgstr ""
7032
7038 -#: builtin/branch.c:268
7033 +#: builtin/branch.c:276
7034 #, c-format
7035 msgid "Deleted remote-tracking branch %s (was %s).\n"
7036 msgstr ""
7037
7043 -#: builtin/branch.c:269
7038 +#: builtin/branch.c:277
7039 #, c-format
7040 msgid "Deleted branch %s (was %s).\n"
7041 msgstr ""
7042
7048 -#: builtin/branch.c:413 builtin/tag.c:59
7043 +#: builtin/branch.c:421 builtin/tag.c:59
7044 msgid "unable to parse format string"
7045 msgstr ""
7046
7052 -#: builtin/branch.c:450
7047 +#: builtin/branch.c:458
7048 #, c-format
7049 msgid "Branch %s is being rebased at %s"
7050 msgstr ""
7051
7057 -#: builtin/branch.c:454
7052 +#: builtin/branch.c:462
7053 #, c-format
7054 msgid "Branch %s is being bisected at %s"
7055 msgstr ""
7056
7062 -#: builtin/branch.c:471
7057 +#: builtin/branch.c:479
7058 msgid "cannot copy the current branch while not on any."
7059 msgstr ""
7060
7066 -#: builtin/branch.c:473
7061 +#: builtin/branch.c:481
7062 msgid "cannot rename the current branch while not on any."
7063 msgstr ""
7064
7070 -#: builtin/branch.c:484
7065 +#: builtin/branch.c:492
7066 #, c-format
7067 msgid "Invalid branch name: '%s'"
7068 msgstr ""
7069
7075 -#: builtin/branch.c:511
7070 +#: builtin/branch.c:519
7071 msgid "Branch rename failed"
7072 msgstr ""
7073
7079 -#: builtin/branch.c:513
7074 +#: builtin/branch.c:521
7075 msgid "Branch copy failed"
7076 msgstr ""
7077
7083 -#: builtin/branch.c:517
7078 +#: builtin/branch.c:525
7079 #, c-format
7080 msgid "Created a copy of a misnamed branch '%s'"
7081 msgstr ""
7082
7088 -#: builtin/branch.c:520
7083 +#: builtin/branch.c:528
7084 #, c-format
7085 msgid "Renamed a misnamed branch '%s' away"
7086 msgstr ""
7087
7093 -#: builtin/branch.c:526
7088 +#: builtin/branch.c:534
7089 #, c-format
7090 msgid "Branch renamed to %s, but HEAD is not updated!"
7091 msgstr ""
7092
7098 -#: builtin/branch.c:535
7093 +#: builtin/branch.c:543
7094 msgid "Branch is renamed, but update of config-file failed"
7095 msgstr ""
7096
7102 -#: builtin/branch.c:537
7097 +#: builtin/branch.c:545
7098 msgid "Branch is copied, but update of config-file failed"
7099 msgstr ""
7100
7106 -#: builtin/branch.c:553
7101 +#: builtin/branch.c:561
7102 #, c-format
7103 msgid ""
7104 "Please edit the description for the branch\n"
@@ -7111,223 +7106,223 @@ msgid ""
7106 "Lines starting with '%c' will be stripped.\n"
7107 msgstr ""
7108
7114 -#: builtin/branch.c:594
7109 +#: builtin/branch.c:602
7110 msgid "Generic options"
7111 msgstr ""
7112
7118 -#: builtin/branch.c:596
7113 +#: builtin/branch.c:604
7114 msgid "show hash and subject, give twice for upstream branch"
7115 msgstr ""
7116
7122 -#: builtin/branch.c:597
7117 +#: builtin/branch.c:605
7118 msgid "suppress informational messages"
7119 msgstr ""
7120
7126 -#: builtin/branch.c:598
7121 +#: builtin/branch.c:606
7122 msgid "set up tracking mode (see git-pull(1))"
7123 msgstr ""
7124
7130 -#: builtin/branch.c:600
7125 +#: builtin/branch.c:608
7126 msgid "do not use"
7127 msgstr ""
7128
7134 -#: builtin/branch.c:602
7129 +#: builtin/branch.c:610
7130 msgid "upstream"
7131 msgstr ""
7132
7138 -#: builtin/branch.c:602
7133 +#: builtin/branch.c:610
7134 msgid "change the upstream info"
7135 msgstr ""
7136
7142 -#: builtin/branch.c:603
7137 +#: builtin/branch.c:611
7138 msgid "Unset the upstream info"
7139 msgstr ""
7140
7146 -#: builtin/branch.c:604
7141 +#: builtin/branch.c:612
7142 msgid "use colored output"
7143 msgstr ""
7144
7150 -#: builtin/branch.c:605
7145 +#: builtin/branch.c:613
7146 msgid "act on remote-tracking branches"
7147 msgstr ""
7148
7154 -#: builtin/branch.c:607 builtin/branch.c:609
7149 +#: builtin/branch.c:615 builtin/branch.c:617
7150 msgid "print only branches that contain the commit"
7151 msgstr ""
7152
7158 -#: builtin/branch.c:608 builtin/branch.c:610
7153 +#: builtin/branch.c:616 builtin/branch.c:618
7154 msgid "print only branches that don't contain the commit"
7155 msgstr ""
7156
7162 -#: builtin/branch.c:613
7157 +#: builtin/branch.c:621
7158 msgid "Specific git-branch actions:"
7159 msgstr ""
7160
7166 -#: builtin/branch.c:614
7161 +#: builtin/branch.c:622
7162 msgid "list both remote-tracking and local branches"
7163 msgstr ""
7164
7170 -#: builtin/branch.c:616
7165 +#: builtin/branch.c:624
7166 msgid "delete fully merged branch"
7167 msgstr ""
7168
7174 -#: builtin/branch.c:617
7169 +#: builtin/branch.c:625
7170 msgid "delete branch (even if not merged)"
7171 msgstr ""
7172
7178 -#: builtin/branch.c:618
7173 +#: builtin/branch.c:626
7174 msgid "move/rename a branch and its reflog"
7175 msgstr ""
7176
7182 -#: builtin/branch.c:619
7177 +#: builtin/branch.c:627
7178 msgid "move/rename a branch, even if target exists"
7179 msgstr ""
7180
7186 -#: builtin/branch.c:620
7181 +#: builtin/branch.c:628
7182 msgid "copy a branch and its reflog"
7183 msgstr ""
7184
7190 -#: builtin/branch.c:621
7185 +#: builtin/branch.c:629
7186 msgid "copy a branch, even if target exists"
7187 msgstr ""
7188
7194 -#: builtin/branch.c:622
7189 +#: builtin/branch.c:630
7190 msgid "list branch names"
7191 msgstr ""
7192
7198 -#: builtin/branch.c:623
7193 +#: builtin/branch.c:631
7194 msgid "create the branch's reflog"
7195 msgstr ""
7196
7202 -#: builtin/branch.c:626
7197 +#: builtin/branch.c:634
7198 msgid "deprecated synonym for --create-reflog"
7199 msgstr ""
7200
7206 -#: builtin/branch.c:631
7201 +#: builtin/branch.c:639
7202 msgid "edit the description for the branch"
7203 msgstr ""
7204
7210 -#: builtin/branch.c:632
7205 +#: builtin/branch.c:640
7206 msgid "force creation, move/rename, deletion"
7207 msgstr ""
7208
7214 -#: builtin/branch.c:633
7209 +#: builtin/branch.c:641
7210 msgid "print only branches that are merged"
7211 msgstr ""
7212
7218 -#: builtin/branch.c:634
7213 +#: builtin/branch.c:642
7214 msgid "print only branches that are not merged"
7215 msgstr ""
7216
7222 -#: builtin/branch.c:635
7217 +#: builtin/branch.c:643
7218 msgid "list branches in columns"
7219 msgstr ""
7220
7226 -#: builtin/branch.c:636 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
7221 +#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
7222 #: builtin/tag.c:413
7223 msgid "key"
7224 msgstr ""
7225
7231 -#: builtin/branch.c:637 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
7226 +#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
7227 #: builtin/tag.c:414
7228 msgid "field name to sort on"
7229 msgstr ""
7230
7236 -#: builtin/branch.c:639 builtin/for-each-ref.c:43 builtin/notes.c:410
7231 +#: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410
7232 #: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576
7233 #: builtin/tag.c:416
7234 msgid "object"
7235 msgstr ""
7236
7242 -#: builtin/branch.c:640
7237 +#: builtin/branch.c:648
7238 msgid "print only branches of the object"
7239 msgstr ""
7240
7246 -#: builtin/branch.c:642 builtin/for-each-ref.c:49 builtin/tag.c:423
7241 +#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423
7242 msgid "sorting and filtering are case insensitive"
7243 msgstr ""
7244
7250 -#: builtin/branch.c:643 builtin/for-each-ref.c:38 builtin/tag.c:421
7245 +#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421
7246 #: builtin/verify-tag.c:39
7247 msgid "format to use for the output"
7248 msgstr ""
7249
7255 -#: builtin/branch.c:666 builtin/clone.c:739
7250 +#: builtin/branch.c:674 builtin/clone.c:739
7251 msgid "HEAD not found below refs/heads!"
7252 msgstr ""
7253
7259 -#: builtin/branch.c:689
7254 +#: builtin/branch.c:697
7255 msgid "--column and --verbose are incompatible"
7256 msgstr ""
7257
7263 -#: builtin/branch.c:709 builtin/branch.c:761 builtin/branch.c:770
7258 +#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778
7259 msgid "branch name required"
7260 msgstr ""
7261
7267 -#: builtin/branch.c:737
7262 +#: builtin/branch.c:745
7263 msgid "Cannot give description to detached HEAD"
7264 msgstr ""
7265
7271 -#: builtin/branch.c:742
7266 +#: builtin/branch.c:750
7267 msgid "cannot edit description of more than one branch"
7268 msgstr ""
7269
7275 -#: builtin/branch.c:749
7270 +#: builtin/branch.c:757
7271 #, c-format
7272 msgid "No commit on branch '%s' yet."
7273 msgstr ""
7274
7280 -#: builtin/branch.c:752
7275 +#: builtin/branch.c:760
7276 #, c-format
7277 msgid "No branch named '%s'."
7278 msgstr ""
7279
7285 -#: builtin/branch.c:767
7280 +#: builtin/branch.c:775
7281 msgid "too many branches for a copy operation"
7282 msgstr ""
7283
7289 -#: builtin/branch.c:776
7284 +#: builtin/branch.c:784
7285 msgid "too many arguments for a rename operation"
7286 msgstr ""
7287
7293 -#: builtin/branch.c:781
7288 +#: builtin/branch.c:789
7289 msgid "too many arguments to set new upstream"
7290 msgstr ""
7291
7297 -#: builtin/branch.c:785
7292 +#: builtin/branch.c:793
7293 #, c-format
7294 msgid ""
7295 "could not set upstream of HEAD to %s when it does not point to any branch."
7296 msgstr ""
7297
7303 -#: builtin/branch.c:788 builtin/branch.c:810 builtin/branch.c:826
7298 +#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834
7299 #, c-format
7300 msgid "no such branch '%s'"
7301 msgstr ""
7302
7308 -#: builtin/branch.c:792
7303 +#: builtin/branch.c:800
7304 #, c-format
7305 msgid "branch '%s' does not exist"
7306 msgstr ""
7307
7313 -#: builtin/branch.c:804
7308 +#: builtin/branch.c:812
7309 msgid "too many arguments to unset upstream"
7310 msgstr ""
7311
7317 -#: builtin/branch.c:808
7312 +#: builtin/branch.c:816
7313 msgid "could not unset upstream of HEAD when it does not point to any branch."
7314 msgstr ""
7315
7321 -#: builtin/branch.c:814
7316 +#: builtin/branch.c:822
7317 #, c-format
7318 msgid "Branch '%s' has no upstream information"
7319 msgstr ""
7320
7326 -#: builtin/branch.c:829
7321 +#: builtin/branch.c:837
7322 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
7323 msgstr ""
7324
7330 -#: builtin/branch.c:832
7325 +#: builtin/branch.c:840
7326 msgid ""
7327 "the '--set-upstream' option is no longer supported. Please use '--track' or "
7328 "'--set-upstream-to' instead."
@@ -7447,6 +7442,7 @@ msgid "terminate input and output records by a NUL character"
7442 msgstr ""
7443
7444 #: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503
7445 +#: builtin/worktree.c:447
7446 msgid "suppress progress reporting"
7447 msgstr ""
7448
@@ -7538,7 +7534,7 @@ msgstr ""
7534 #: builtin/checkout-index.c:173 builtin/column.c:31
7535 #: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364
7536 #: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736
7541 -#: builtin/worktree.c:610
7537 +#: builtin/worktree.c:620
7538 msgid "string"
7539 msgstr ""
7540
@@ -7705,7 +7701,7 @@ msgstr ""
7701 msgid "only one reference expected, %d given."
7702 msgstr ""
7703
7708 -#: builtin/checkout.c:993 builtin/worktree.c:240 builtin/worktree.c:389
7704 +#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396
7705 #, c-format
7706 msgid "invalid reference: %s"
7707 msgstr ""
@@ -7736,8 +7732,8 @@ msgid "Cannot switch branch to a non-commit '%s'"
7732 msgstr ""
7733
7734 #: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
7739 -#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:433
7740 -#: builtin/worktree.c:435
7735 +#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440
7736 +#: builtin/worktree.c:442
7737 msgid "branch"
7738 msgstr ""
7739
@@ -7753,7 +7749,7 @@ msgstr ""
7749 msgid "create reflog for new branch"
7750 msgstr ""
7751
7756 -#: builtin/checkout.c:1126 builtin/worktree.c:437
7752 +#: builtin/checkout.c:1126 builtin/worktree.c:444
7753 msgid "detach HEAD at named commit"
7754 msgstr ""
7755
@@ -8086,7 +8082,7 @@ msgid "use --reference only while cloning"
8082 msgstr ""
8083
8084 #: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
8089 -#: builtin/pack-objects.c:3194 builtin/repack.c:320
8085 +#: builtin/pack-objects.c:3191 builtin/repack.c:320
8086 msgid "name"
8087 msgstr ""
8088
@@ -8111,7 +8107,7 @@ msgstr ""
8107 msgid "create a shallow clone of that depth"
8108 msgstr ""
8109
8114 -#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3185
8110 +#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182
8111 #: parse-options.h:154
8112 msgid "time"
8113 msgstr ""
@@ -8282,7 +8278,7 @@ msgid "working tree '%s' already exists."
8278 msgstr ""
8279
8280 #: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
8285 -#: builtin/worktree.c:246 builtin/worktree.c:276
8281 +#: builtin/worktree.c:247 builtin/worktree.c:277
8282 #, c-format
8283 msgid "could not create leading directories of '%s'"
8284 msgstr ""
@@ -8654,7 +8650,7 @@ msgid "version"
8650 msgstr ""
8651
8652 #: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
8657 -#: builtin/worktree.c:581
8653 +#: builtin/worktree.c:591
8654 msgid "machine-readable output"
8655 msgstr ""
8656
@@ -10089,7 +10085,7 @@ msgstr ""
10085 #. grep.threads
10086 #.
10087 #: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728
10092 -#: builtin/pack-objects.c:2639
10088 +#: builtin/pack-objects.c:2636
10089 #, c-format
10090 msgid "no threads support, ignoring %s"
10091 msgstr ""
@@ -10306,12 +10302,12 @@ msgstr ""
10302 msgid "unable to resolve revision: %s"
10303 msgstr ""
10304
10309 -#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2635
10305 +#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632
10306 #, c-format
10307 msgid "invalid number of threads specified (%d)"
10308 msgstr ""
10309
10314 -#: builtin/grep.c:1049 builtin/pack-objects.c:3289
10310 +#: builtin/grep.c:1049 builtin/pack-objects.c:3286
10311 msgid "no threads support, ignoring --threads"
10312 msgstr ""
10313
@@ -10646,7 +10642,7 @@ msgstr ""
10642 msgid "Resolving deltas"
10643 msgstr ""
10644
10649 -#: builtin/index-pack.c:1224 builtin/pack-objects.c:2410
10645 +#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407
10646 #, c-format
10647 msgid "unable to create thread: %s"
10648 msgstr ""
@@ -10711,7 +10707,7 @@ msgstr ""
10707 msgid "cannot store index file"
10708 msgstr ""
10709
10714 -#: builtin/index-pack.c:1526 builtin/pack-objects.c:2648
10710 +#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645
10711 #, c-format
10712 msgid "bad pack.indexversion=%<PRIu32>"
10713 msgstr ""
@@ -12475,7 +12471,7 @@ msgstr ""
12471 msgid "read object names from the standard input"
12472 msgstr ""
12473
12478 -#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:151
12474 +#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152
12475 msgid "do not remove, show only"
12476 msgstr ""
12477
@@ -12605,262 +12601,262 @@ msgstr ""
12601 msgid "suboptimal pack - out of memory"
12602 msgstr ""
12603
12608 -#: builtin/pack-objects.c:2369
12604 +#: builtin/pack-objects.c:2366
12605 #, c-format
12606 msgid "Delta compression using up to %d threads"
12607 msgstr ""
12608
12613 -#: builtin/pack-objects.c:2505
12609 +#: builtin/pack-objects.c:2502
12610 #, c-format
12611 msgid "unable to pack objects reachable from tag %s"
12612 msgstr ""
12613
12618 -#: builtin/pack-objects.c:2589
12614 +#: builtin/pack-objects.c:2586
12615 msgid "Compressing objects"
12616 msgstr ""
12617
12622 -#: builtin/pack-objects.c:2595
12618 +#: builtin/pack-objects.c:2592
12619 msgid "inconsistency with delta count"
12620 msgstr ""
12621
12626 -#: builtin/pack-objects.c:2674
12622 +#: builtin/pack-objects.c:2671
12623 #, c-format
12624 msgid ""
12625 "expected edge object ID, got garbage:\n"
12626 " %s"
12627 msgstr ""
12628
12633 -#: builtin/pack-objects.c:2680
12629 +#: builtin/pack-objects.c:2677
12630 #, c-format
12631 msgid ""
12632 "expected object ID, got garbage:\n"
12633 " %s"
12634 msgstr ""
12635
12640 -#: builtin/pack-objects.c:2760
12636 +#: builtin/pack-objects.c:2757
12637 msgid "invalid value for --missing"
12638 msgstr ""
12639
12644 -#: builtin/pack-objects.c:2819 builtin/pack-objects.c:2927
12640 +#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924
12641 msgid "cannot open pack index"
12642 msgstr ""
12643
12648 -#: builtin/pack-objects.c:2850
12644 +#: builtin/pack-objects.c:2847
12645 #, c-format
12646 msgid "loose object at %s could not be examined"
12647 msgstr ""
12648
12653 -#: builtin/pack-objects.c:2935
12649 +#: builtin/pack-objects.c:2932
12650 msgid "unable to force loose object"
12651 msgstr ""
12652
12657 -#: builtin/pack-objects.c:3022
12653 +#: builtin/pack-objects.c:3019
12654 #, c-format
12655 msgid "not a rev '%s'"
12656 msgstr ""
12657
12662 -#: builtin/pack-objects.c:3025
12658 +#: builtin/pack-objects.c:3022
12659 #, c-format
12660 msgid "bad revision '%s'"
12661 msgstr ""
12662
12667 -#: builtin/pack-objects.c:3045
12663 +#: builtin/pack-objects.c:3042
12664 msgid "unable to add recent objects"
12665 msgstr ""
12666
12671 -#: builtin/pack-objects.c:3095
12667 +#: builtin/pack-objects.c:3092
12668 #, c-format
12669 msgid "unsupported index version %s"
12670 msgstr ""
12671
12676 -#: builtin/pack-objects.c:3099
12672 +#: builtin/pack-objects.c:3096
12673 #, c-format
12674 msgid "bad index version '%s'"
12675 msgstr ""
12676
12681 -#: builtin/pack-objects.c:3130
12677 +#: builtin/pack-objects.c:3127
12678 msgid "do not show progress meter"
12679 msgstr ""
12680
12685 -#: builtin/pack-objects.c:3132
12681 +#: builtin/pack-objects.c:3129
12682 msgid "show progress meter"
12683 msgstr ""
12684
12689 -#: builtin/pack-objects.c:3134
12685 +#: builtin/pack-objects.c:3131
12686 msgid "show progress meter during object writing phase"
12687 msgstr ""
12688
12693 -#: builtin/pack-objects.c:3137
12689 +#: builtin/pack-objects.c:3134
12690 msgid "similar to --all-progress when progress meter is shown"
12691 msgstr ""
12692
12697 -#: builtin/pack-objects.c:3138
12693 +#: builtin/pack-objects.c:3135
12694 msgid "<version>[,<offset>]"
12695 msgstr ""
12696
12701 -#: builtin/pack-objects.c:3139
12697 +#: builtin/pack-objects.c:3136
12698 msgid "write the pack index file in the specified idx format version"
12699 msgstr ""
12700
12705 -#: builtin/pack-objects.c:3142
12701 +#: builtin/pack-objects.c:3139
12702 msgid "maximum size of each output pack file"
12703 msgstr ""
12704
12709 -#: builtin/pack-objects.c:3144
12705 +#: builtin/pack-objects.c:3141
12706 msgid "ignore borrowed objects from alternate object store"
12707 msgstr ""
12708
12713 -#: builtin/pack-objects.c:3146
12709 +#: builtin/pack-objects.c:3143
12710 msgid "ignore packed objects"
12711 msgstr ""
12712
12717 -#: builtin/pack-objects.c:3148
12713 +#: builtin/pack-objects.c:3145
12714 msgid "limit pack window by objects"
12715 msgstr ""
12716
12721 -#: builtin/pack-objects.c:3150
12717 +#: builtin/pack-objects.c:3147
12718 msgid "limit pack window by memory in addition to object limit"
12719 msgstr ""
12720
12725 -#: builtin/pack-objects.c:3152
12721 +#: builtin/pack-objects.c:3149
12722 msgid "maximum length of delta chain allowed in the resulting pack"
12723 msgstr ""
12724
12729 -#: builtin/pack-objects.c:3154
12725 +#: builtin/pack-objects.c:3151
12726 msgid "reuse existing deltas"
12727 msgstr ""
12728
12733 -#: builtin/pack-objects.c:3156
12729 +#: builtin/pack-objects.c:3153
12730 msgid "reuse existing objects"
12731 msgstr ""
12732
12737 -#: builtin/pack-objects.c:3158
12733 +#: builtin/pack-objects.c:3155
12734 msgid "use OFS_DELTA objects"
12735 msgstr ""
12736
12741 -#: builtin/pack-objects.c:3160
12737 +#: builtin/pack-objects.c:3157
12738 msgid "use threads when searching for best delta matches"
12739 msgstr ""
12740
12745 -#: builtin/pack-objects.c:3162
12741 +#: builtin/pack-objects.c:3159
12742 msgid "do not create an empty pack output"
12743 msgstr ""
12744
12749 -#: builtin/pack-objects.c:3164
12745 +#: builtin/pack-objects.c:3161
12746 msgid "read revision arguments from standard input"
12747 msgstr ""
12748
12753 -#: builtin/pack-objects.c:3166
12749 +#: builtin/pack-objects.c:3163
12750 msgid "limit the objects to those that are not yet packed"
12751 msgstr ""
12752
12757 -#: builtin/pack-objects.c:3169
12753 +#: builtin/pack-objects.c:3166
12754 msgid "include objects reachable from any reference"
12755 msgstr ""
12756
12761 -#: builtin/pack-objects.c:3172
12757 +#: builtin/pack-objects.c:3169
12758 msgid "include objects referred by reflog entries"
12759 msgstr ""
12760
12765 -#: builtin/pack-objects.c:3175
12761 +#: builtin/pack-objects.c:3172
12762 msgid "include objects referred to by the index"
12763 msgstr ""
12764
12769 -#: builtin/pack-objects.c:3178
12765 +#: builtin/pack-objects.c:3175
12766 msgid "output pack to stdout"
12767 msgstr ""
12768
12773 -#: builtin/pack-objects.c:3180
12769 +#: builtin/pack-objects.c:3177
12770 msgid "include tag objects that refer to objects to be packed"
12771 msgstr ""
12772
12777 -#: builtin/pack-objects.c:3182
12773 +#: builtin/pack-objects.c:3179
12774 msgid "keep unreachable objects"
12775 msgstr ""
12776
12781 -#: builtin/pack-objects.c:3184
12777 +#: builtin/pack-objects.c:3181
12778 msgid "pack loose unreachable objects"
12779 msgstr ""
12780
12785 -#: builtin/pack-objects.c:3186
12781 +#: builtin/pack-objects.c:3183
12782 msgid "unpack unreachable objects newer than <time>"
12783 msgstr ""
12784
12789 -#: builtin/pack-objects.c:3189
12785 +#: builtin/pack-objects.c:3186
12786 msgid "create thin packs"
12787 msgstr ""
12788
12793 -#: builtin/pack-objects.c:3191
12789 +#: builtin/pack-objects.c:3188
12790 msgid "create packs suitable for shallow fetches"
12791 msgstr ""
12792
12797 -#: builtin/pack-objects.c:3193
12793 +#: builtin/pack-objects.c:3190
12794 msgid "ignore packs that have companion .keep file"
12795 msgstr ""
12796
12801 -#: builtin/pack-objects.c:3195
12797 +#: builtin/pack-objects.c:3192
12798 msgid "ignore this pack"
12799 msgstr ""
12800
12805 -#: builtin/pack-objects.c:3197
12801 +#: builtin/pack-objects.c:3194
12802 msgid "pack compression level"
12803 msgstr ""
12804
12809 -#: builtin/pack-objects.c:3199
12805 +#: builtin/pack-objects.c:3196
12806 msgid "do not hide commits by grafts"
12807 msgstr ""
12808
12813 -#: builtin/pack-objects.c:3201
12809 +#: builtin/pack-objects.c:3198
12810 msgid "use a bitmap index if available to speed up counting objects"
12811 msgstr ""
12812
12817 -#: builtin/pack-objects.c:3203
12813 +#: builtin/pack-objects.c:3200
12814 msgid "write a bitmap index together with the pack index"
12815 msgstr ""
12816
12821 -#: builtin/pack-objects.c:3206
12817 +#: builtin/pack-objects.c:3203
12818 msgid "handling for missing objects"
12819 msgstr ""
12820
12825 -#: builtin/pack-objects.c:3209
12821 +#: builtin/pack-objects.c:3206
12822 msgid "do not pack objects in promisor packfiles"
12823 msgstr ""
12824
12829 -#: builtin/pack-objects.c:3233
12825 +#: builtin/pack-objects.c:3230
12826 #, c-format
12827 msgid "delta chain depth %d is too deep, forcing %d"
12828 msgstr ""
12829
12834 -#: builtin/pack-objects.c:3238
12830 +#: builtin/pack-objects.c:3235
12831 #, c-format
12832 msgid "pack.deltaCacheLimit is too high, forcing %d"
12833 msgstr ""
12834
12839 -#: builtin/pack-objects.c:3294
12835 +#: builtin/pack-objects.c:3291
12836 msgid "--max-pack-size cannot be used to build a pack for transfer"
12837 msgstr ""
12838
12843 -#: builtin/pack-objects.c:3296
12839 +#: builtin/pack-objects.c:3293
12840 msgid "minimum pack size limit is 1 MiB"
12841 msgstr ""
12842
12847 -#: builtin/pack-objects.c:3301
12843 +#: builtin/pack-objects.c:3298
12844 msgid "--thin cannot be used to build an indexable pack"
12845 msgstr ""
12846
12851 -#: builtin/pack-objects.c:3304
12847 +#: builtin/pack-objects.c:3301
12848 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
12849 msgstr ""
12850
12855 -#: builtin/pack-objects.c:3310
12851 +#: builtin/pack-objects.c:3307
12852 msgid "cannot use --filter without --stdout"
12853 msgstr ""
12854
12859 -#: builtin/pack-objects.c:3366
12855 +#: builtin/pack-objects.c:3363
12856 msgid "Enumerating objects"
12857 msgstr ""
12858
12863 -#: builtin/pack-objects.c:3385
12859 +#: builtin/pack-objects.c:3382
12860 #, c-format
12861 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
12862 msgstr ""
@@ -13317,7 +13313,7 @@ msgid "Percentage by which creation is weighted"
13313 msgstr ""
13314
13315 #: builtin/range-diff.c:28
13320 -msgid "color both diff and diff-between-diffs"
13316 +msgid "use simple diff colors"
13317 msgstr ""
13318
13319 #: builtin/range-diff.c:75 builtin/range-diff.c:79
@@ -13625,10 +13621,6 @@ msgstr ""
13621 msgid "master branch"
13622 msgstr ""
13623
13628 -#: builtin/remote.c:171
13629 -msgid "push|fetch"
13630 -msgstr ""
13631 -
13624 #: builtin/remote.c:172
13625 msgid "set up remote as a mirror to push to or fetch from"
13626 msgstr ""
@@ -14102,7 +14094,7 @@ msgstr ""
14094 msgid "--keep-unreachable and -A are incompatible"
14095 msgstr ""
14096
14105 -#: builtin/repack.c:510 builtin/worktree.c:139
14097 +#: builtin/repack.c:510 builtin/worktree.c:140
14098 #, c-format
14099 msgid "failed to remove '%s'"
14100 msgstr ""
@@ -14991,8 +14983,8 @@ msgstr ""
14983 #: builtin/submodule--helper.c:545
14984 #, c-format
14985 msgid ""
14994 -"run_command returned non-zero status whilerecursing in the nested submodules "
14995 -"of %s\n"
14986 +"run_command returned non-zero status while recursing in the nested "
14987 +"submodules of %s\n"
14988 "."
14989 msgstr ""
14990
@@ -15877,213 +15869,213 @@ msgstr ""
15869 msgid "git worktree unlock <path>"
15870 msgstr ""
15871
15880 -#: builtin/worktree.c:58
15872 +#: builtin/worktree.c:59
15873 #, c-format
15874 msgid "Removing worktrees/%s: not a valid directory"
15875 msgstr ""
15876
15885 -#: builtin/worktree.c:64
15877 +#: builtin/worktree.c:65
15878 #, c-format
15879 msgid "Removing worktrees/%s: gitdir file does not exist"
15880 msgstr ""
15881
15890 -#: builtin/worktree.c:69 builtin/worktree.c:78
15882 +#: builtin/worktree.c:70 builtin/worktree.c:79
15883 #, c-format
15884 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
15885 msgstr ""
15886
15895 -#: builtin/worktree.c:88
15887 +#: builtin/worktree.c:89
15888 #, c-format
15889 msgid ""
15890 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
15891 "%<PRIuMAX>)"
15892 msgstr ""
15893
15902 -#: builtin/worktree.c:96
15894 +#: builtin/worktree.c:97
15895 #, c-format
15896 msgid "Removing worktrees/%s: invalid gitdir file"
15897 msgstr ""
15898
15907 -#: builtin/worktree.c:105
15899 +#: builtin/worktree.c:106
15900 #, c-format
15901 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
15902 msgstr ""
15903
15912 -#: builtin/worktree.c:152
15904 +#: builtin/worktree.c:153
15905 msgid "report pruned working trees"
15906 msgstr ""
15907
15916 -#: builtin/worktree.c:154
15908 +#: builtin/worktree.c:155
15909 msgid "expire working trees older than <time>"
15910 msgstr ""
15911
15920 -#: builtin/worktree.c:229
15912 +#: builtin/worktree.c:230
15913 #, c-format
15914 msgid "'%s' already exists"
15915 msgstr ""
15916
15925 -#: builtin/worktree.c:260
15917 +#: builtin/worktree.c:261
15918 #, c-format
15919 msgid "could not create directory of '%s'"
15920 msgstr ""
15921
15930 -#: builtin/worktree.c:373 builtin/worktree.c:379
15922 +#: builtin/worktree.c:380 builtin/worktree.c:386
15923 #, c-format
15924 msgid "Preparing worktree (new branch '%s')"
15925 msgstr ""
15926
15935 -#: builtin/worktree.c:375
15927 +#: builtin/worktree.c:382
15928 #, c-format
15929 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
15930 msgstr ""
15931
15940 -#: builtin/worktree.c:384
15932 +#: builtin/worktree.c:391
15933 #, c-format
15934 msgid "Preparing worktree (checking out '%s')"
15935 msgstr ""
15936
15945 -#: builtin/worktree.c:390
15937 +#: builtin/worktree.c:397
15938 #, c-format
15939 msgid "Preparing worktree (detached HEAD %s)"
15940 msgstr ""
15941
15950 -#: builtin/worktree.c:431
15942 +#: builtin/worktree.c:438
15943 msgid "checkout <branch> even if already checked out in other worktree"
15944 msgstr ""
15945
15954 -#: builtin/worktree.c:434
15946 +#: builtin/worktree.c:441
15947 msgid "create a new branch"
15948 msgstr ""
15949
15958 -#: builtin/worktree.c:436
15950 +#: builtin/worktree.c:443
15951 msgid "create or reset a branch"
15952 msgstr ""
15953
15962 -#: builtin/worktree.c:438
15954 +#: builtin/worktree.c:445
15955 msgid "populate the new working tree"
15956 msgstr ""
15957
15966 -#: builtin/worktree.c:439
15958 +#: builtin/worktree.c:446
15959 msgid "keep the new working tree locked"
15960 msgstr ""
15961
15970 -#: builtin/worktree.c:441
15962 +#: builtin/worktree.c:449
15963 msgid "set up tracking mode (see git-branch(1))"
15964 msgstr ""
15965
15974 -#: builtin/worktree.c:444
15966 +#: builtin/worktree.c:452
15967 msgid "try to match the new branch name with a remote-tracking branch"
15968 msgstr ""
15969
15978 -#: builtin/worktree.c:452
15970 +#: builtin/worktree.c:460
15971 msgid "-b, -B, and --detach are mutually exclusive"
15972 msgstr ""
15973
15982 -#: builtin/worktree.c:511
15974 +#: builtin/worktree.c:521
15975 msgid "--[no-]track can only be used if a new branch is created"
15976 msgstr ""
15977
15986 -#: builtin/worktree.c:611
15978 +#: builtin/worktree.c:621
15979 msgid "reason for locking"
15980 msgstr ""
15981
15990 -#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
15991 -#: builtin/worktree.c:850
15982 +#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720
15983 +#: builtin/worktree.c:860
15984 #, c-format
15985 msgid "'%s' is not a working tree"
15986 msgstr ""
15987
15996 -#: builtin/worktree.c:625 builtin/worktree.c:658
15988 +#: builtin/worktree.c:635 builtin/worktree.c:668
15989 msgid "The main working tree cannot be locked or unlocked"
15990 msgstr ""
15991
16000 -#: builtin/worktree.c:630
15992 +#: builtin/worktree.c:640
15993 #, c-format
15994 msgid "'%s' is already locked, reason: %s"
15995 msgstr ""
15996
16005 -#: builtin/worktree.c:632
15997 +#: builtin/worktree.c:642
15998 #, c-format
15999 msgid "'%s' is already locked"
16000 msgstr ""
16001
16010 -#: builtin/worktree.c:660
16002 +#: builtin/worktree.c:670
16003 #, c-format
16004 msgid "'%s' is not locked"
16005 msgstr ""
16006
16015 -#: builtin/worktree.c:685
16007 +#: builtin/worktree.c:695
16008 msgid "working trees containing submodules cannot be moved or removed"
16009 msgstr ""
16010
16019 -#: builtin/worktree.c:712 builtin/worktree.c:852
16011 +#: builtin/worktree.c:722 builtin/worktree.c:862
16012 #, c-format
16013 msgid "'%s' is a main working tree"
16014 msgstr ""
16015
16024 -#: builtin/worktree.c:717
16016 +#: builtin/worktree.c:727
16017 #, c-format
16018 msgid "could not figure out destination name from '%s'"
16019 msgstr ""
16020
16029 -#: builtin/worktree.c:723
16021 +#: builtin/worktree.c:733
16022 #, c-format
16023 msgid "target '%s' already exists"
16024 msgstr ""
16025
16034 -#: builtin/worktree.c:730
16026 +#: builtin/worktree.c:740
16027 #, c-format
16028 msgid "cannot move a locked working tree, lock reason: %s"
16029 msgstr ""
16030
16039 -#: builtin/worktree.c:732
16031 +#: builtin/worktree.c:742
16032 msgid "cannot move a locked working tree"
16033 msgstr ""
16034
16043 -#: builtin/worktree.c:735
16035 +#: builtin/worktree.c:745
16036 #, c-format
16037 msgid "validation failed, cannot move working tree: %s"
16038 msgstr ""
16039
16048 -#: builtin/worktree.c:740
16040 +#: builtin/worktree.c:750
16041 #, c-format
16042 msgid "failed to move '%s' to '%s'"
16043 msgstr ""
16044
16053 -#: builtin/worktree.c:788
16045 +#: builtin/worktree.c:798
16046 #, c-format
16047 msgid "failed to run 'git status' on '%s'"
16048 msgstr ""
16049
16058 -#: builtin/worktree.c:792
16050 +#: builtin/worktree.c:802
16051 #, c-format
16052 msgid "'%s' is dirty, use --force to delete it"
16053 msgstr ""
16054
16063 -#: builtin/worktree.c:797
16055 +#: builtin/worktree.c:807
16056 #, c-format
16057 msgid "failed to run 'git status' on '%s', code %d"
16058 msgstr ""
16059
16068 -#: builtin/worktree.c:808 builtin/worktree.c:822
16060 +#: builtin/worktree.c:818 builtin/worktree.c:832
16061 #, c-format
16062 msgid "failed to delete '%s'"
16063 msgstr ""
16064
16073 -#: builtin/worktree.c:834
16065 +#: builtin/worktree.c:844
16066 msgid "force removing even if the worktree is dirty"
16067 msgstr ""
16068
16077 -#: builtin/worktree.c:856
16069 +#: builtin/worktree.c:866
16070 #, c-format
16071 msgid "cannot remove a locked working tree, lock reason: %s"
16072 msgstr ""
16073
16082 -#: builtin/worktree.c:858
16074 +#: builtin/worktree.c:868
16075 msgid "cannot remove a locked working tree"
16076 msgstr ""
16077
16086 -#: builtin/worktree.c:861
16078 +#: builtin/worktree.c:871
16079 #, c-format
16080 msgid "validation failed, cannot remove working tree: %s"
16081 msgstr ""