l10n: git.pot: v2.36.0 round 2 (4 new, 3 removed)

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

Jiang Xin committed Apr 13, 2022 at 14:55 UTC 2731109c91d53edbd393b49eaabfbf78fcea545c
1 file changed +52 -40
po/git.pot
+52 -40
@@ -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: 2022-04-06 14:40+0800\n"
11 +"POT-Creation-Date: 2022-04-13 14:52+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"
@@ -1010,7 +1010,7 @@ msgid "cannot checkout %s"
1010 msgstr ""
1011
1012 #: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
1013 -#: setup.c:309
1013 +#: setup.c:310
1014 #, c-format
1015 msgid "failed to read %s"
1016 msgstr ""
@@ -3116,7 +3116,7 @@ msgid "Marked %d islands, done.\n"
3116 msgstr ""
3117
3118 #: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
3119 -#: parallel-checkout.c:42 sequencer.c:2805 setup.c:562 builtin/am.c:203
3119 +#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
3120 #: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
3121 #: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
3122 #: builtin/pull.c:47 builtin/pull.c:321
@@ -4227,7 +4227,7 @@ msgstr ""
4227 msgid "'%s': unable to read %s"
4228 msgstr ""
4229
4230 -#: grep.c:1876 setup.c:177 builtin/clone.c:308 builtin/diff.c:90
4230 +#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
4231 #: builtin/rm.c:136
4232 #, c-format
4233 msgid "failed to stat '%s'"
@@ -8129,19 +8129,19 @@ msgstr ""
8129 msgid "the script was already rearranged."
8130 msgstr ""
8131
8132 -#: setup.c:134
8132 +#: setup.c:135
8133 #, c-format
8134 msgid "'%s' is outside repository at '%s'"
8135 msgstr ""
8136
8137 -#: setup.c:186
8137 +#: setup.c:187
8138 #, c-format
8139 msgid ""
8140 "%s: no such path in the working tree.\n"
8141 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
8142 msgstr ""
8143
8144 -#: setup.c:199
8144 +#: setup.c:200
8145 #, c-format
8146 msgid ""
8147 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8149,12 +8149,12 @@ msgid ""
8149 "'git <command> [<revision>...] -- [<file>...]'"
8150 msgstr ""
8151
8152 -#: setup.c:265
8152 +#: setup.c:266
8153 #, c-format
8154 msgid "option '%s' must come before non-option arguments"
8155 msgstr ""
8156
8157 -#: setup.c:284
8157 +#: setup.c:285
8158 #, c-format
8159 msgid ""
8160 "ambiguous argument '%s': both revision and filename\n"
@@ -8162,118 +8162,127 @@ msgid ""
8162 "'git <command> [<revision>...] -- [<file>...]'"
8163 msgstr ""
8164
8165 -#: setup.c:420
8165 +#: setup.c:421
8166 msgid "unable to set up work tree using invalid config"
8167 msgstr ""
8168
8169 -#: setup.c:424 builtin/rev-parse.c:895
8169 +#: setup.c:425 builtin/rev-parse.c:895
8170 msgid "this operation must be run in a work tree"
8171 msgstr ""
8172
8173 -#: setup.c:723
8173 +#: setup.c:724
8174 #, c-format
8175 msgid "Expected git repo version <= %d, found %d"
8176 msgstr ""
8177
8178 -#: setup.c:731
8178 +#: setup.c:732
8179 msgid "unknown repository extension found:"
8180 msgid_plural "unknown repository extensions found:"
8181 msgstr[0] ""
8182 msgstr[1] ""
8183
8184 -#: setup.c:745
8184 +#: setup.c:746
8185 msgid "repo version is 0, but v1-only extension found:"
8186 msgid_plural "repo version is 0, but v1-only extensions found:"
8187 msgstr[0] ""
8188 msgstr[1] ""
8189
8190 -#: setup.c:766
8190 +#: setup.c:767
8191 #, c-format
8192 msgid "error opening '%s'"
8193 msgstr ""
8194
8195 -#: setup.c:768
8195 +#: setup.c:769
8196 #, c-format
8197 msgid "too large to be a .git file: '%s'"
8198 msgstr ""
8199
8200 -#: setup.c:770
8200 +#: setup.c:771
8201 #, c-format
8202 msgid "error reading %s"
8203 msgstr ""
8204
8205 -#: setup.c:772
8205 +#: setup.c:773
8206 #, c-format
8207 msgid "invalid gitfile format: %s"
8208 msgstr ""
8209
8210 -#: setup.c:774
8210 +#: setup.c:775
8211 #, c-format
8212 msgid "no path in gitfile: %s"
8213 msgstr ""
8214
8215 -#: setup.c:776
8215 +#: setup.c:777
8216 #, c-format
8217 msgid "not a git repository: %s"
8218 msgstr ""
8219
8220 -#: setup.c:878
8220 +#: setup.c:879
8221 #, c-format
8222 msgid "'$%s' too big"
8223 msgstr ""
8224
8225 -#: setup.c:892
8225 +#: setup.c:893
8226 #, c-format
8227 msgid "not a git repository: '%s'"
8228 msgstr ""
8229
8230 -#: setup.c:921 setup.c:923 setup.c:954
8230 +#: setup.c:922 setup.c:924 setup.c:955
8231 #, c-format
8232 msgid "cannot chdir to '%s'"
8233 msgstr ""
8234
8235 -#: setup.c:926 setup.c:982 setup.c:992 setup.c:1031 setup.c:1039
8235 +#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
8236 msgid "cannot come back to cwd"
8237 msgstr ""
8238
8239 -#: setup.c:1053
8239 +#: setup.c:1054
8240 #, c-format
8241 msgid "failed to stat '%*s%s%s'"
8242 msgstr ""
8243
8244 -#: setup.c:1296
8244 +#: setup.c:1338
8245 msgid "Unable to read current working directory"
8246 msgstr ""
8247
8248 -#: setup.c:1305 setup.c:1311
8248 +#: setup.c:1347 setup.c:1353
8249 #, c-format
8250 msgid "cannot change to '%s'"
8251 msgstr ""
8252
8253 -#: setup.c:1316
8253 +#: setup.c:1358
8254 #, c-format
8255 msgid "not a git repository (or any of the parent directories): %s"
8256 msgstr ""
8257
8258 -#: setup.c:1322
8258 +#: setup.c:1364
8259 #, c-format
8260 msgid ""
8261 "not a git repository (or any parent up to mount point %s)\n"
8262 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
8263 msgstr ""
8264
8265 -#: setup.c:1447
8265 +#: setup.c:1374
8266 +#, c-format
8267 +msgid ""
8268 +"unsafe repository ('%s' is owned by someone else)\n"
8269 +"To add an exception for this directory, call:\n"
8270 +"\n"
8271 +"\tgit config --global --add safe.directory %s"
8272 +msgstr ""
8273 +
8274 +#: setup.c:1502
8275 #, c-format
8276 msgid ""
8277 "problem with core.sharedRepository filemode value (0%.3o).\n"
8278 "The owner of files must always have read and write permissions."
8279 msgstr ""
8280
8272 -#: setup.c:1509
8281 +#: setup.c:1564
8282 msgid "fork failed"
8283 msgstr ""
8284
8276 -#: setup.c:1514
8285 +#: setup.c:1569
8286 msgid "setsid failed"
8287 msgstr ""
8288
@@ -21956,7 +21965,7 @@ msgstr ""
21965 msgid ""
21966 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
21967 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
21959 -"<filter-spec>]--url <url> --path <path>"
21968 +"<filter-spec>] --url <url> --path <path>"
21969 msgstr ""
21970
21971 #: builtin/submodule--helper.c:1943
@@ -22215,7 +22224,7 @@ msgstr ""
22224 #: builtin/submodule--helper.c:3085
22225 msgid ""
22226 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
22218 -"quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"
22227 +"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
22228 msgstr ""
22229
22230 #: builtin/submodule--helper.c:3097
@@ -25110,30 +25119,33 @@ msgstr ""
25119 msgid "invalid transfer encoding"
25120 msgstr ""
25121
25113 -#: git-send-email.perl:2099
25122 +#: git-send-email.perl:2100
25123 #, perl-format
25115 -msgid "fatal: %s: rejected by %s hook\n"
25124 +msgid ""
25125 +"fatal: %s: rejected by %s hook\n"
25126 +"%s\n"
25127 +"warning: no patches were sent\n"
25128 msgstr ""
25129
25118 -#: git-send-email.perl:2111 git-send-email.perl:2164 git-send-email.perl:2174
25130 +#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
25131 #, perl-format
25132 msgid "unable to open %s: %s\n"
25133 msgstr ""
25134
25123 -#: git-send-email.perl:2114
25135 +#: git-send-email.perl:2113
25136 #, perl-format
25137 msgid ""
25138 "fatal: %s:%d is longer than 998 characters\n"
25139 "warning: no patches were sent\n"
25140 msgstr ""
25141
25130 -#: git-send-email.perl:2132
25142 +#: git-send-email.perl:2131
25143 #, perl-format
25144 msgid "Skipping %s with backup suffix '%s'.\n"
25145 msgstr ""
25146
25147 #. TRANSLATORS: please keep "[y|N]" as is.
25136 -#: git-send-email.perl:2136
25148 +#: git-send-email.perl:2135
25149 #, perl-format
25150 msgid "Do you really want to send %s? [y|N]: "
25151 msgstr ""