Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: git.pot: v2.12.0 round 2 (2 new)
author
Jiang Xin
<worldhello.net@gmail.com>
Fri, 17 Feb 2017 17:00:54 +0000
(
01:00
+0800)
committer
Jiang Xin
<worldhello.net@gmail.com>
Fri, 17 Feb 2017 17:00:54 +0000
(
01:00
+0800)
Generate po/git.pot from v2.12.0-rc1 for git v2.12.0 l10n round 2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
po/git.pot
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
53f7473
)
diff --git
a/po/git.pot
b/po/git.pot
index 9e836b10b67e83c0e85f4d121abe121f20e19ca6..cc0b9c3150d5ad538101dffbbbd47df515c7ac94 100644
(file)
--- a/
po/git.pot
+++ b/
po/git.pot
@@
-8,7
+8,7
@@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-
04 13:02
+0800\n"
+"POT-Creation-Date: 2017-02-
18 01:00
+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-220,349
+220,349
@@
msgstr ""
msgid "patch with only garbage at line %d"
msgstr ""
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:22
74
+#: apply.c:22
65
#, c-format
msgid "unable to read symlink %s"
msgstr ""
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:22
78
+#: apply.c:22
69
#, c-format
msgid "unable to open or read %s"
msgstr ""
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:29
31
+#: apply.c:29
22
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:30
50
+#: apply.c:30
41
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:30
62
+#: apply.c:30
53
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:30
68
+#: apply.c:30
59
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:30
90
+#: apply.c:30
81
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:30
98
+#: apply.c:30
89
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:31
44
+#: apply.c:31
35
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:31
54
+#: apply.c:31
45
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:31
62
+#: apply.c:31
53
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:31
80
+#: apply.c:31
71
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:31
93
+#: apply.c:31
84
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:319
9
+#: apply.c:319
0
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:32
20
+#: apply.c:32
11
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:33
42
+#: apply.c:33
33
#, c-format
msgid "cannot checkout %s"
msgstr ""
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:33
90 apply.c:3401 apply.c:3447
setup.c:248
+#: apply.c:33
81 apply.c:3392 apply.c:3438
setup.c:248
#, c-format
msgid "failed to read %s"
msgstr ""
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:33
98
+#: apply.c:33
89
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:34
27 apply.c:3667
+#: apply.c:34
18 apply.c:3658
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:35
10 apply.c:3681
+#: apply.c:35
01 apply.c:3672
#, c-format
msgid "%s: does not exist in index"
msgstr ""
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:351
9 apply.c:3689
+#: apply.c:351
0 apply.c:3680
#, c-format
msgid "%s: does not match index"
msgstr ""
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:35
54
+#: apply.c:35
45
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:35
57
+#: apply.c:35
48
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:35
73 apply.c:3577
+#: apply.c:35
64 apply.c:3568
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:358
9
+#: apply.c:358
0
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3
603
+#: apply.c:3
594
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3
608
+#: apply.c:3
599
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:36
34
+#: apply.c:36
25
msgid "removal patch leaves file contents"
msgstr ""
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3
706
+#: apply.c:3
697
#, c-format
msgid "%s: wrong type"
msgstr ""
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3
708
+#: apply.c:3
699
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:385
9 apply.c:3861
+#: apply.c:385
0 apply.c:3852
#, c-format
msgid "invalid path '%s'"
msgstr ""
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:39
17
+#: apply.c:39
08
#, c-format
msgid "%s: already exists in index"
msgstr ""
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:39
20
+#: apply.c:39
11
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:39
40
+#: apply.c:39
31
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:39
45
+#: apply.c:39
36
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:39
65
+#: apply.c:39
56
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:396
9
+#: apply.c:396
0
#, c-format
msgid "%s: patch does not apply"
msgstr ""
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:39
84
+#: apply.c:39
75
#, c-format
msgid "Checking patch %s..."
msgstr ""
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:40
75
+#: apply.c:40
66
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:40
82
+#: apply.c:40
73
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:40
85
+#: apply.c:40
76
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:40
90
builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:40
81
builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:40
94
+#: apply.c:40
85
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4
104
+#: apply.c:4
095
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:42
42
+#: apply.c:42
33
#, c-format
msgid "unable to remove %s from index"
msgstr ""
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:42
77
+#: apply.c:42
68
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:42
83
+#: apply.c:42
74
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:42
91
+#: apply.c:42
82
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:42
97 apply.c:4441
+#: apply.c:42
88 apply.c:4432
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:43
38
+#: apply.c:43
29
#, c-format
msgid "failed to write to '%s'"
msgstr ""
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:43
42
+#: apply.c:43
33
#, c-format
msgid "closing file '%s'"
msgstr ""
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:44
12
+#: apply.c:44
03
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:45
10
+#: apply.c:45
01
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:45
18
+#: apply.c:45
09
msgid "internal error"
msgstr ""
msgid "internal error"
msgstr ""
-#: apply.c:45
21
+#: apply.c:45
12
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:45
32
+#: apply.c:45
23
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:45
40
builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:45
31
builtin/fetch.c:737 builtin/fetch.c:986
#, c-format
msgid "cannot open %s"
msgstr ""
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:45
54
+#: apply.c:45
45
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:45
58
+#: apply.c:45
49
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:46
68
+#: apply.c:46
59
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:46
76
+#: apply.c:46
67
msgid "unrecognized input"
msgstr ""
msgid "unrecognized input"
msgstr ""
-#: apply.c:46
95
+#: apply.c:46
86
msgid "unable to read index file"
msgstr ""
msgid "unable to read index file"
msgstr ""
-#: apply.c:48
33
+#: apply.c:48
24
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:48
58
+#: apply.c:48
49
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:48
64 apply.c:4879
+#: apply.c:48
55 apply.c:4870
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:48
72
+#: apply.c:48
63
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:48
88
builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:48
79
builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr ""
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:491
9 apply.c:4922
builtin/am.c:2277 builtin/am.c:2280
+#: apply.c:491
0 apply.c:4913
builtin/am.c:2277 builtin/am.c:2280
#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
@@
-571,121
+571,121
@@
msgstr ""
msgid "path"
msgstr ""
msgid "path"
msgstr ""
-#: apply.c:49
20
+#: apply.c:49
11
msgid "don't apply changes matching the given path"
msgstr ""
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:49
23
+#: apply.c:49
14
msgid "apply changes matching the given path"
msgstr ""
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:49
25
builtin/am.c:2286
+#: apply.c:49
16
builtin/am.c:2286
msgid "num"
msgstr ""
msgid "num"
msgstr ""
-#: apply.c:49
26
+#: apply.c:49
17
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:492
9
+#: apply.c:492
0
msgid "ignore additions made by the patch"
msgstr ""
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:49
31
+#: apply.c:49
22
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:49
35
+#: apply.c:49
26
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:49
37
+#: apply.c:49
28
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:493
9
+#: apply.c:493
0
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:49
41
+#: apply.c:49
32
msgid "make sure the patch is applicable to the current index"
msgstr ""
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:49
43
+#: apply.c:49
34
msgid "apply a patch without touching the working tree"
msgstr ""
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:49
45
+#: apply.c:49
36
msgid "accept a patch that touches outside the working area"
msgstr ""
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:49
47
+#: apply.c:49
38
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:494
9
+#: apply.c:494
0
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:49
51
+#: apply.c:49
42
msgid "build a temporary index based on embedded index information"
msgstr ""
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:49
54 builtin/checkout-index.c:169 builtin/ls-files.c:505
+#: apply.c:49
45 builtin/checkout-index.c:169 builtin/ls-files.c:507
msgid "paths are separated with NUL character"
msgstr ""
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:49
56
+#: apply.c:49
47
msgid "ensure at least <n> lines of context match"
msgstr ""
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:49
57
builtin/am.c:2265
+#: apply.c:49
48
builtin/am.c:2265
msgid "action"
msgstr ""
msgid "action"
msgstr ""
-#: apply.c:49
58
+#: apply.c:49
49
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:49
61 apply.c:4964
+#: apply.c:49
52 apply.c:4955
msgid "ignore changes in whitespace when finding context"
msgstr ""
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:49
67
+#: apply.c:49
58
msgid "apply the patch in reverse"
msgstr ""
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:496
9
+#: apply.c:496
0
msgid "don't expect at least one line of context"
msgstr ""
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:49
71
+#: apply.c:49
62
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:49
73
+#: apply.c:49
64
msgid "allow overlapping hunks"
msgstr ""
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:49
74
builtin/add.c:267 builtin/check-ignore.c:19
+#: apply.c:49
65
builtin/add.c:267 builtin/check-ignore.c:19
#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114
msgid "be verbose"
msgstr ""
#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114
msgid "be verbose"
msgstr ""
-#: apply.c:49
76
+#: apply.c:49
67
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:497
9
+#: apply.c:497
0
msgid "do not trust the line counts in the hunk headers"
msgstr ""
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:49
81
builtin/am.c:2274
+#: apply.c:49
72
builtin/am.c:2274
msgid "root"
msgstr ""
msgid "root"
msgstr ""
-#: apply.c:49
82
+#: apply.c:49
73
msgid "prepend <root> to all filenames"
msgstr ""
msgid "prepend <root> to all filenames"
msgstr ""
@@
-729,7
+729,7
@@
msgstr ""
#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:5
39 builtin/ls-files.c:542
+#: builtin/hash-object.c:101 builtin/ls-files.c:5
41 builtin/ls-files.c:544
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
#: parse-options.h:153
msgid "file"
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
#: parse-options.h:153
msgid "file"
@@
-1459,29
+1459,29
@@
msgstr ""
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:469
5
+#: diff.c:469
6
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:469
8
+#: diff.c:469
9
msgid "only found copies from modified paths due to too many files."
msgstr ""
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:470
1
+#: diff.c:470
2
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:186
3
+#: dir.c:186
2
msgid "failed to get kernel name and information"
msgstr ""
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:198
2
+#: dir.c:198
1
msgid "Untracked cache is disabled on this system or location."
msgstr ""
msgid "Untracked cache is disabled on this system or location."
msgstr ""
-#: dir.c:27
60
+#: dir.c:27
59
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
@@
-1676,7
+1676,7
@@
msgstr ""
msgid "'%s': unable to read %s"
msgstr ""
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:8
4
builtin/rm.c:133
+#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:8
1
builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr ""
#, c-format
msgid "failed to stat '%s'"
msgstr ""
@@
-1897,119
+1897,119
@@
msgstr ""
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:153
8
+#: merge-recursive.c:153
5
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:155
3
+#: merge-recursive.c:155
0
#, c-format
msgid "Adding merged %s"
msgstr ""
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:15
60 merge-recursive.c:1774
+#: merge-recursive.c:15
57 merge-recursive.c:1771
#, c-format
msgid "Adding as %s instead"
msgstr ""
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:161
7
+#: merge-recursive.c:161
4
#, c-format
msgid "cannot read object %s"
msgstr ""
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:16
20
+#: merge-recursive.c:16
17
#, c-format
msgid "object %s is not a blob"
msgstr ""
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:167
3
+#: merge-recursive.c:167
0
msgid "modify"
msgstr ""
msgid "modify"
msgstr ""
-#: merge-recursive.c:167
3
+#: merge-recursive.c:167
0
msgid "modified"
msgstr ""
msgid "modified"
msgstr ""
-#: merge-recursive.c:168
3
+#: merge-recursive.c:168
0
msgid "content"
msgstr ""
msgid "content"
msgstr ""
-#: merge-recursive.c:16
90
+#: merge-recursive.c:16
87
msgid "add/add"
msgstr ""
msgid "add/add"
msgstr ""
-#: merge-recursive.c:172
6
+#: merge-recursive.c:172
3
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:17
40
+#: merge-recursive.c:17
37
#, c-format
msgid "Auto-merging %s"
msgstr ""
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:174
4
git-submodule.sh:930
+#: merge-recursive.c:174
1
git-submodule.sh:930
msgid "submodule"
msgstr ""
msgid "submodule"
msgstr ""
-#: merge-recursive.c:174
5
+#: merge-recursive.c:174
2
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:183
9
+#: merge-recursive.c:183
6
#, c-format
msgid "Removing %s"
msgstr ""
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:186
5
+#: merge-recursive.c:186
2
msgid "file/directory"
msgstr ""
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:18
71
+#: merge-recursive.c:18
68
msgid "directory/file"
msgstr ""
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:187
7
+#: merge-recursive.c:187
4
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:188
6
+#: merge-recursive.c:188
3
#, c-format
msgid "Adding %s"
msgstr ""
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:192
3
+#: merge-recursive.c:192
0
msgid "Already up-to-date!"
msgstr ""
msgid "Already up-to-date!"
msgstr ""
-#: merge-recursive.c:19
32
+#: merge-recursive.c:19
29
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:201
5
+#: merge-recursive.c:201
2
msgid "Merging:"
msgstr ""
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:202
8
+#: merge-recursive.c:202
5
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:206
7
+#: merge-recursive.c:206
4
msgid "merge returned no commit"
msgstr ""
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:21
30
+#: merge-recursive.c:21
27
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:214
4
builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:214
1
builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr ""
msgid "Unable to write index."
msgstr ""
@@
-2047,7
+2047,7
@@
msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:24
2
+#: object.c:24
0
#, c-format
msgid "unable to parse object: %s"
msgstr ""
#, c-format
msgid "unable to parse object: %s"
msgstr ""
@@
-3249,7
+3249,7
@@
msgstr ""
msgid "Aborting."
msgstr ""
msgid "Aborting."
msgstr ""
-#: transport-helper.c:10
75
+#: transport-helper.c:10
82
#, c-format
msgid "Could not read ref %s"
msgstr ""
#, c-format
msgid "Could not read ref %s"
msgstr ""
@@
-5750,7
+5750,7
@@
msgid "remove whole directories"
msgstr ""
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
msgstr ""
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:53
6
builtin/name-rev.c:313 builtin/show-ref.c:176
+#: builtin/ls-files.c:53
8
builtin/name-rev.c:313 builtin/show-ref.c:176
msgid "pattern"
msgstr ""
msgid "pattern"
msgstr ""
@@
-6961,31
+6961,31
@@
msgstr ""
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/diff.c:8
6
+#: builtin/diff.c:8
3
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr ""
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/diff.c:23
7
+#: builtin/diff.c:23
4
#, c-format
msgid "invalid option: %s"
msgstr ""
#, c-format
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:3
61
+#: builtin/diff.c:3
58
msgid "Not a git repository"
msgstr ""
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:40
4
+#: builtin/diff.c:40
1
#, c-format
msgid "invalid object '%s' given."
msgstr ""
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:41
3
+#: builtin/diff.c:41
0
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:4
20
+#: builtin/diff.c:4
17
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
@@
-8768,103
+8768,103
@@
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:4
58
+#: builtin/ls-files.c:4
60
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:50
7
+#: builtin/ls-files.c:50
9
msgid "identify the file status with tags"
msgstr ""
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:5
09
+#: builtin/ls-files.c:5
11
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:51
1
+#: builtin/ls-files.c:51
3
msgid "show cached files in the output (default)"
msgstr ""
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:51
3
+#: builtin/ls-files.c:51
5
msgid "show deleted files in the output"
msgstr ""
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:51
5
+#: builtin/ls-files.c:51
7
msgid "show modified files in the output"
msgstr ""
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:51
7
+#: builtin/ls-files.c:51
9
msgid "show other files in the output"
msgstr ""
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:5
19
+#: builtin/ls-files.c:5
21
msgid "show ignored files in the output"
msgstr ""
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:52
2
+#: builtin/ls-files.c:52
4
msgid "show staged contents' object name in the output"
msgstr ""
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:52
4
+#: builtin/ls-files.c:52
6
msgid "show files on the filesystem that need to be removed"
msgstr ""
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:52
6
+#: builtin/ls-files.c:52
8
msgid "show 'other' directories' names only"
msgstr ""
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:5
28
+#: builtin/ls-files.c:5
30
msgid "show line endings of files"
msgstr ""
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:53
0
+#: builtin/ls-files.c:53
2
msgid "don't show empty directories"
msgstr ""
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:53
3
+#: builtin/ls-files.c:53
5
msgid "show unmerged files in the output"
msgstr ""
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:53
5
+#: builtin/ls-files.c:53
7
msgid "show resolve-undo information"
msgstr ""
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:53
7
+#: builtin/ls-files.c:53
9
msgid "skip files matching pattern"
msgstr ""
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:54
0
+#: builtin/ls-files.c:54
2
msgid "exclude patterns are read from <file>"
msgstr ""
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:54
3
+#: builtin/ls-files.c:54
5
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:54
5
+#: builtin/ls-files.c:54
7
msgid "add the standard git exclusions"
msgstr ""
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:5
48
+#: builtin/ls-files.c:5
50
msgid "make the output relative to the project top directory"
msgstr ""
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:55
1
+#: builtin/ls-files.c:55
3
msgid "recurse through submodules"
msgstr ""
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:55
3
+#: builtin/ls-files.c:55
5
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:55
4
+#: builtin/ls-files.c:55
6
msgid "tree-ish"
msgstr ""
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:55
5
+#: builtin/ls-files.c:55
7
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:55
7
+#: builtin/ls-files.c:55
9
msgid "show debugging data"
msgstr ""
msgid "show debugging data"
msgstr ""
@@
-10180,11
+10180,11
@@
msgstr ""
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr ""
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:106
builtin/worktree.c:128
+#: builtin/prune.c:106
msgid "report pruned objects"
msgstr ""
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:109
builtin/worktree.c:130
+#: builtin/prune.c:109
msgid "expire objects older than <time>"
msgstr ""
msgid "expire objects older than <time>"
msgstr ""
@@
-12685,6
+12685,14
@@
msgstr ""
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
+#: builtin/worktree.c:128
+msgid "report pruned working trees"
+msgstr ""
+
+#: builtin/worktree.c:130
+msgid "expire working trees older than <time>"
+msgstr ""
+
#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"