l10n: git.pot: v2.29.0 round 2 (1 new, 1 removed)
Generate po/git.pot from v2.29.0-rc1 for git v2.29.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Oct 10, 2020 at 09:33 UTC
1fd0dd72241925ca4f065adf68c7cc858c663b9b
1 file changed
+116
-116
po/git.pot
+116
-116
@@ -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: 2020-10-06 09:14+0800\n"
11
+"POT-Creation-Date: 2020-10-10 09: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"
@@ -3973,72 +3973,72 @@ msgstr ""
3973
msgid "Low-level Commands / Internal Helpers"
3974
msgstr ""
3975
3976
-#: help.c:298
3976
+#: help.c:300
3977
#, c-format
3978
msgid "available git commands in '%s'"
3979
msgstr ""
3980
3981
-#: help.c:305
3981
+#: help.c:307
3982
msgid "git commands available from elsewhere on your $PATH"
3983
msgstr ""
3984
3985
-#: help.c:314
3985
+#: help.c:316
3986
msgid "These are common Git commands used in various situations:"
3987
msgstr ""
3988
3989
-#: help.c:363 git.c:99
3989
+#: help.c:365 git.c:99
3990
#, c-format
3991
msgid "unsupported command listing type '%s'"
3992
msgstr ""
3993
3994
-#: help.c:403
3994
+#: help.c:405
3995
msgid "The Git concept guides are:"
3996
msgstr ""
3997
3998
-#: help.c:427
3998
+#: help.c:429
3999
msgid "See 'git help <command>' to read about a specific subcommand"
4000
msgstr ""
4001
4002
-#: help.c:432
4002
+#: help.c:434
4003
msgid "External commands"
4004
msgstr ""
4005
4006
-#: help.c:447
4006
+#: help.c:449
4007
msgid "Command aliases"
4008
msgstr ""
4009
4010
-#: help.c:511
4010
+#: help.c:513
4011
#, c-format
4012
msgid ""
4013
"'%s' appears to be a git command, but we were not\n"
4014
"able to execute it. Maybe git-%s is broken?"
4015
msgstr ""
4016
4017
-#: help.c:570
4017
+#: help.c:572
4018
msgid "Uh oh. Your system reports no Git commands at all."
4019
msgstr ""
4020
4021
-#: help.c:592
4021
+#: help.c:594
4022
#, c-format
4023
msgid "WARNING: You called a Git command named '%s', which does not exist."
4024
msgstr ""
4025
4026
-#: help.c:597
4026
+#: help.c:599
4027
#, c-format
4028
msgid "Continuing under the assumption that you meant '%s'."
4029
msgstr ""
4030
4031
-#: help.c:602
4031
+#: help.c:604
4032
#, c-format
4033
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4034
msgstr ""
4035
4036
-#: help.c:610
4036
+#: help.c:612
4037
#, c-format
4038
msgid "git: '%s' is not a git command. See 'git --help'."
4039
msgstr ""
4040
4041
-#: help.c:614
4041
+#: help.c:616
4042
msgid ""
4043
"\n"
4044
"The most similar command is"
@@ -4048,16 +4048,16 @@ msgid_plural ""
4048
msgstr[0] ""
4049
msgstr[1] ""
4050
4051
-#: help.c:654
4051
+#: help.c:656
4052
msgid "git version [<options>]"
4053
msgstr ""
4054
4055
-#: help.c:709
4055
+#: help.c:711
4056
#, c-format
4057
msgid "%s: %s - %s"
4058
msgstr ""
4059
4060
-#: help.c:713
4060
+#: help.c:715
4061
msgid ""
4062
"\n"
4063
"Did you mean this?"
@@ -7450,7 +7450,7 @@ msgstr ""
7450
msgid "%s is not a valid '%s' object"
7451
msgstr ""
7452
7453
-#: sha1-file.c:2288 builtin/index-pack.c:197
7453
+#: sha1-file.c:2288 builtin/index-pack.c:192
7454
#, c-format
7455
msgid "unable to open %s"
7456
msgstr ""
@@ -11815,27 +11815,6 @@ msgstr ""
11815
msgid "You appear to have cloned an empty repository."
11816
msgstr ""
11817
11818
-#: builtin/credential-cache.c:154
11819
-msgid "credential-cache unavailable; no unix socket support"
11820
-msgstr ""
11821
-
11822
-#: builtin/credential-cache--daemon.c:226
11823
-#, c-format
11824
-msgid ""
11825
-"The permissions on your socket directory are too loose; other\n"
11826
-"users may be able to read your cached credentials. Consider running:\n"
11827
-"\n"
11828
-"\tchmod 0700 %s"
11829
-msgstr ""
11830
-
11831
-#: builtin/credential-cache--daemon.c:275
11832
-msgid "print debugging messages to stderr"
11833
-msgstr ""
11834
-
11835
-#: builtin/credential-cache--daemon.c:315
11836
-msgid "credential-cache--daemon unavailable; no unix socket support"
11837
-msgstr ""
11838
-
11818
#: builtin/column.c:10
11819
msgid "git column [<options>]"
11820
msgstr ""
@@ -12845,6 +12824,27 @@ msgstr ""
12824
msgid "print sizes in human readable format"
12825
msgstr ""
12826
12827
+#: builtin/credential-cache--daemon.c:226
12828
+#, c-format
12829
+msgid ""
12830
+"The permissions on your socket directory are too loose; other\n"
12831
+"users may be able to read your cached credentials. Consider running:\n"
12832
+"\n"
12833
+"\tchmod 0700 %s"
12834
+msgstr ""
12835
+
12836
+#: builtin/credential-cache--daemon.c:275
12837
+msgid "print debugging messages to stderr"
12838
+msgstr ""
12839
+
12840
+#: builtin/credential-cache--daemon.c:315
12841
+msgid "credential-cache--daemon unavailable; no unix socket support"
12842
+msgstr ""
12843
+
12844
+#: builtin/credential-cache.c:154
12845
+msgid "credential-cache unavailable; no unix socket support"
12846
+msgstr ""
12847
+
12848
#: builtin/describe.c:26
12849
msgid "git describe [<options>] [<commit-ish>...]"
12850
msgstr ""
@@ -13896,7 +13896,7 @@ msgstr ""
13896
msgid "Checking %s link"
13897
msgstr ""
13898
13899
-#: builtin/fsck.c:696 builtin/index-pack.c:871
13899
+#: builtin/fsck.c:696 builtin/index-pack.c:865
13900
#, c-format
13901
msgid "invalid %s"
13902
msgstr ""
@@ -13981,7 +13981,7 @@ msgstr ""
13981
msgid "show verbose names for reachable objects"
13982
msgstr ""
13983
13984
-#: builtin/fsck.c:847 builtin/index-pack.c:267
13984
+#: builtin/fsck.c:847 builtin/index-pack.c:261
13985
msgid "Checking objects"
13986
msgstr ""
13987
@@ -14156,7 +14156,7 @@ msgstr ""
14156
#. variable for tweaking threads, currently
14157
#. grep.threads
14158
#.
14159
-#: builtin/grep.c:287 builtin/index-pack.c:1581 builtin/index-pack.c:1771
14159
+#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
14160
#: builtin/pack-objects.c:2936
14161
#, c-format
14162
msgid "no threads support, ignoring %s"
@@ -14390,7 +14390,7 @@ msgstr ""
14390
msgid "no threads support, ignoring --threads"
14391
msgstr ""
14392
14393
-#: builtin/grep.c:1088 builtin/index-pack.c:1578 builtin/pack-objects.c:2933
14393
+#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
14394
#, c-format
14395
msgid "invalid number of threads specified (%d)"
14396
msgstr ""
@@ -14551,299 +14551,299 @@ msgstr ""
14551
msgid "'git help config' for more information"
14552
msgstr ""
14553
14554
-#: builtin/index-pack.c:227
14554
+#: builtin/index-pack.c:221
14555
#, c-format
14556
msgid "object type mismatch at %s"
14557
msgstr ""
14558
14559
-#: builtin/index-pack.c:247
14559
+#: builtin/index-pack.c:241
14560
#, c-format
14561
msgid "did not receive expected object %s"
14562
msgstr ""
14563
14564
-#: builtin/index-pack.c:250
14564
+#: builtin/index-pack.c:244
14565
#, c-format
14566
msgid "object %s: expected type %s, found %s"
14567
msgstr ""
14568
14569
-#: builtin/index-pack.c:300
14569
+#: builtin/index-pack.c:294
14570
#, c-format
14571
msgid "cannot fill %d byte"
14572
msgid_plural "cannot fill %d bytes"
14573
msgstr[0] ""
14574
msgstr[1] ""
14575
14576
-#: builtin/index-pack.c:310
14576
+#: builtin/index-pack.c:304
14577
msgid "early EOF"
14578
msgstr ""
14579
14580
-#: builtin/index-pack.c:311
14580
+#: builtin/index-pack.c:305
14581
msgid "read error on input"
14582
msgstr ""
14583
14584
-#: builtin/index-pack.c:323
14584
+#: builtin/index-pack.c:317
14585
msgid "used more bytes than were available"
14586
msgstr ""
14587
14588
-#: builtin/index-pack.c:330 builtin/pack-objects.c:619
14588
+#: builtin/index-pack.c:324 builtin/pack-objects.c:619
14589
msgid "pack too large for current definition of off_t"
14590
msgstr ""
14591
14592
-#: builtin/index-pack.c:333 builtin/unpack-objects.c:95
14592
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
14593
msgid "pack exceeds maximum allowed size"
14594
msgstr ""
14595
14596
-#: builtin/index-pack.c:348 builtin/repack.c:254
14596
+#: builtin/index-pack.c:342 builtin/repack.c:254
14597
#, c-format
14598
msgid "unable to create '%s'"
14599
msgstr ""
14600
14601
-#: builtin/index-pack.c:354
14601
+#: builtin/index-pack.c:348
14602
#, c-format
14603
msgid "cannot open packfile '%s'"
14604
msgstr ""
14605
14606
-#: builtin/index-pack.c:368
14606
+#: builtin/index-pack.c:362
14607
msgid "pack signature mismatch"
14608
msgstr ""
14609
14610
-#: builtin/index-pack.c:370
14610
+#: builtin/index-pack.c:364
14611
#, c-format
14612
msgid "pack version %<PRIu32> unsupported"
14613
msgstr ""
14614
14615
-#: builtin/index-pack.c:388
14615
+#: builtin/index-pack.c:382
14616
#, c-format
14617
msgid "pack has bad object at offset %<PRIuMAX>: %s"
14618
msgstr ""
14619
14620
-#: builtin/index-pack.c:494
14620
+#: builtin/index-pack.c:488
14621
#, c-format
14622
msgid "inflate returned %d"
14623
msgstr ""
14624
14625
-#: builtin/index-pack.c:543
14625
+#: builtin/index-pack.c:537
14626
msgid "offset value overflow for delta base object"
14627
msgstr ""
14628
14629
-#: builtin/index-pack.c:551
14629
+#: builtin/index-pack.c:545
14630
msgid "delta base offset is out of bound"
14631
msgstr ""
14632
14633
-#: builtin/index-pack.c:559
14633
+#: builtin/index-pack.c:553
14634
#, c-format
14635
msgid "unknown object type %d"
14636
msgstr ""
14637
14638
-#: builtin/index-pack.c:590
14638
+#: builtin/index-pack.c:584
14639
msgid "cannot pread pack file"
14640
msgstr ""
14641
14642
-#: builtin/index-pack.c:592
14642
+#: builtin/index-pack.c:586
14643
#, c-format
14644
msgid "premature end of pack file, %<PRIuMAX> byte missing"
14645
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
14646
msgstr[0] ""
14647
msgstr[1] ""
14648
14649
-#: builtin/index-pack.c:618
14649
+#: builtin/index-pack.c:612
14650
msgid "serious inflate inconsistency"
14651
msgstr ""
14652
14653
-#: builtin/index-pack.c:763 builtin/index-pack.c:769 builtin/index-pack.c:793
14654
-#: builtin/index-pack.c:832 builtin/index-pack.c:841
14653
+#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
14654
+#: builtin/index-pack.c:826 builtin/index-pack.c:835
14655
#, c-format
14656
msgid "SHA1 COLLISION FOUND WITH %s !"
14657
msgstr ""
14658
14659
-#: builtin/index-pack.c:766 builtin/pack-objects.c:171
14659
+#: builtin/index-pack.c:760 builtin/pack-objects.c:171
14660
#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
14661
#, c-format
14662
msgid "unable to read %s"
14663
msgstr ""
14664
14665
-#: builtin/index-pack.c:830
14665
+#: builtin/index-pack.c:824
14666
#, c-format
14667
msgid "cannot read existing object info %s"
14668
msgstr ""
14669
14670
-#: builtin/index-pack.c:838
14670
+#: builtin/index-pack.c:832
14671
#, c-format
14672
msgid "cannot read existing object %s"
14673
msgstr ""
14674
14675
-#: builtin/index-pack.c:852
14675
+#: builtin/index-pack.c:846
14676
#, c-format
14677
msgid "invalid blob object %s"
14678
msgstr ""
14679
14680
-#: builtin/index-pack.c:855 builtin/index-pack.c:874
14680
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
14681
msgid "fsck error in packed object"
14682
msgstr ""
14683
14684
-#: builtin/index-pack.c:876
14684
+#: builtin/index-pack.c:870
14685
#, c-format
14686
msgid "Not all child objects of %s are reachable"
14687
msgstr ""
14688
14689
-#: builtin/index-pack.c:940 builtin/index-pack.c:987
14689
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
14690
msgid "failed to apply delta"
14691
msgstr ""
14692
14693
-#: builtin/index-pack.c:1166
14693
+#: builtin/index-pack.c:1161
14694
msgid "Receiving objects"
14695
msgstr ""
14696
14697
-#: builtin/index-pack.c:1166
14697
+#: builtin/index-pack.c:1161
14698
msgid "Indexing objects"
14699
msgstr ""
14700
14701
-#: builtin/index-pack.c:1200
14701
+#: builtin/index-pack.c:1195
14702
msgid "pack is corrupted (SHA1 mismatch)"
14703
msgstr ""
14704
14705
-#: builtin/index-pack.c:1205
14705
+#: builtin/index-pack.c:1200
14706
msgid "cannot fstat packfile"
14707
msgstr ""
14708
14709
-#: builtin/index-pack.c:1208
14709
+#: builtin/index-pack.c:1203
14710
msgid "pack has junk at the end"
14711
msgstr ""
14712
14713
-#: builtin/index-pack.c:1220
14713
+#: builtin/index-pack.c:1215
14714
msgid "confusion beyond insanity in parse_pack_objects()"
14715
msgstr ""
14716
14717
-#: builtin/index-pack.c:1243
14717
+#: builtin/index-pack.c:1238
14718
msgid "Resolving deltas"
14719
msgstr ""
14720
14721
-#: builtin/index-pack.c:1254 builtin/pack-objects.c:2697
14721
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
14722
#, c-format
14723
msgid "unable to create thread: %s"
14724
msgstr ""
14725
14726
-#: builtin/index-pack.c:1287
14726
+#: builtin/index-pack.c:1282
14727
msgid "confusion beyond insanity"
14728
msgstr ""
14729
14730
-#: builtin/index-pack.c:1293
14730
+#: builtin/index-pack.c:1288
14731
#, c-format
14732
msgid "completed with %d local object"
14733
msgid_plural "completed with %d local objects"
14734
msgstr[0] ""
14735
msgstr[1] ""
14736
14737
-#: builtin/index-pack.c:1305
14737
+#: builtin/index-pack.c:1300
14738
#, c-format
14739
msgid "Unexpected tail checksum for %s (disk corruption?)"
14740
msgstr ""
14741
14742
-#: builtin/index-pack.c:1309
14742
+#: builtin/index-pack.c:1304
14743
#, c-format
14744
msgid "pack has %d unresolved delta"
14745
msgid_plural "pack has %d unresolved deltas"
14746
msgstr[0] ""
14747
msgstr[1] ""
14748
14749
-#: builtin/index-pack.c:1333
14749
+#: builtin/index-pack.c:1328
14750
#, c-format
14751
msgid "unable to deflate appended object (%d)"
14752
msgstr ""
14753
14754
-#: builtin/index-pack.c:1429
14754
+#: builtin/index-pack.c:1424
14755
#, c-format
14756
msgid "local object %s is corrupt"
14757
msgstr ""
14758
14759
-#: builtin/index-pack.c:1449
14759
+#: builtin/index-pack.c:1444
14760
#, c-format
14761
msgid "packfile name '%s' does not end with '.pack'"
14762
msgstr ""
14763
14764
-#: builtin/index-pack.c:1474
14764
+#: builtin/index-pack.c:1469
14765
#, c-format
14766
msgid "cannot write %s file '%s'"
14767
msgstr ""
14768
14769
-#: builtin/index-pack.c:1482
14769
+#: builtin/index-pack.c:1477
14770
#, c-format
14771
msgid "cannot close written %s file '%s'"
14772
msgstr ""
14773
14774
-#: builtin/index-pack.c:1506
14774
+#: builtin/index-pack.c:1501
14775
msgid "error while closing pack file"
14776
msgstr ""
14777
14778
-#: builtin/index-pack.c:1520
14778
+#: builtin/index-pack.c:1515
14779
msgid "cannot store pack file"
14780
msgstr ""
14781
14782
-#: builtin/index-pack.c:1528
14782
+#: builtin/index-pack.c:1523
14783
msgid "cannot store index file"
14784
msgstr ""
14785
14786
-#: builtin/index-pack.c:1572 builtin/pack-objects.c:2944
14786
+#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
14787
#, c-format
14788
msgid "bad pack.indexversion=%<PRIu32>"
14789
msgstr ""
14790
14791
-#: builtin/index-pack.c:1636
14791
+#: builtin/index-pack.c:1631
14792
#, c-format
14793
msgid "Cannot open existing pack file '%s'"
14794
msgstr ""
14795
14796
-#: builtin/index-pack.c:1638
14796
+#: builtin/index-pack.c:1633
14797
#, c-format
14798
msgid "Cannot open existing pack idx file for '%s'"
14799
msgstr ""
14800
14801
-#: builtin/index-pack.c:1686
14801
+#: builtin/index-pack.c:1681
14802
#, c-format
14803
msgid "non delta: %d object"
14804
msgid_plural "non delta: %d objects"
14805
msgstr[0] ""
14806
msgstr[1] ""
14807
14808
-#: builtin/index-pack.c:1693
14808
+#: builtin/index-pack.c:1688
14809
#, c-format
14810
msgid "chain length = %d: %lu object"
14811
msgid_plural "chain length = %d: %lu objects"
14812
msgstr[0] ""
14813
msgstr[1] ""
14814
14815
-#: builtin/index-pack.c:1733
14815
+#: builtin/index-pack.c:1728
14816
msgid "Cannot come back to cwd"
14817
msgstr ""
14818
14819
-#: builtin/index-pack.c:1782 builtin/index-pack.c:1785
14820
-#: builtin/index-pack.c:1801 builtin/index-pack.c:1805
14819
+#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
14820
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
14821
#, c-format
14822
msgid "bad %s"
14823
msgstr ""
14824
14825
-#: builtin/index-pack.c:1811 builtin/init-db.c:391 builtin/init-db.c:623
14825
+#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623
14826
#, c-format
14827
msgid "unknown hash algorithm '%s'"
14828
msgstr ""
14829
14830
-#: builtin/index-pack.c:1826
14830
+#: builtin/index-pack.c:1821
14831
msgid "--fix-thin cannot be used without --stdin"
14832
msgstr ""
14833
14834
-#: builtin/index-pack.c:1828
14834
+#: builtin/index-pack.c:1823
14835
msgid "--stdin requires a git repository"
14836
msgstr ""
14837
14838
-#: builtin/index-pack.c:1830
14838
+#: builtin/index-pack.c:1825
14839
msgid "--object-format cannot be used with --stdin"
14840
msgstr ""
14841
14842
-#: builtin/index-pack.c:1836
14842
+#: builtin/index-pack.c:1831
14843
msgid "--verify with no packfile name given"
14844
msgstr ""
14845
14846
-#: builtin/index-pack.c:1897 builtin/unpack-objects.c:582
14846
+#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
14847
msgid "fsck error in pack objects"
14848
msgstr ""
14849
@@ -20306,7 +20306,7 @@ msgid "limit the summary size"
20306
msgstr ""
20307
20308
#: builtin/submodule--helper.c:1311
20309
-msgid "git submodule--helper summary [<options>] [commit] [--] [<path>]"
20309
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
20310
msgstr ""
20311
20312
#: builtin/submodule--helper.c:1335
@@ -20623,7 +20623,7 @@ msgstr ""
20623
msgid "--branch and --default are mutually exclusive"
20624
msgstr ""
20625
20626
-#: builtin/submodule--helper.c:2792 git.c:438 git.c:691
20626
+#: builtin/submodule--helper.c:2792 git.c:438 git.c:710
20627
#, c-format
20628
msgid "%s doesn't support --super-prefix"
20629
msgstr ""
@@ -21603,29 +21603,29 @@ msgstr ""
21603
msgid "close failed on standard output"
21604
msgstr ""
21605
21606
-#: git.c:800
21606
+#: git.c:819
21607
#, c-format
21608
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
21609
msgstr ""
21610
21611
-#: git.c:850
21611
+#: git.c:869
21612
#, c-format
21613
msgid "cannot handle %s as a builtin"
21614
msgstr ""
21615
21616
-#: git.c:863
21616
+#: git.c:882
21617
#, c-format
21618
msgid ""
21619
"usage: %s\n"
21620
"\n"
21621
msgstr ""
21622
21623
-#: git.c:883
21623
+#: git.c:902
21624
#, c-format
21625
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
21626
msgstr ""
21627
21628
-#: git.c:895
21628
+#: git.c:914
21629
#, c-format
21630
msgid "failed to run command '%s': %s\n"
21631
msgstr ""