@matheusbsbs / matheus-bagliano / commits / 5589271206

l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed)

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

Jiang Xin committed Jun 8, 2018 at 09:17 UTC 55892712062ad4329608d3f0740504a60686a80f
1 file changed +962 -409
po/git.pot
+962 -409
@@ -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-05-31 23:32+0800\n"
11 +"POT-Creation-Date: 2018-06-08 09:03+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"
@@ -58,7 +58,7 @@ msgstr ""
58 msgid "Exiting because of an unresolved conflict."
59 msgstr ""
60
61 -#: advice.c:168 builtin/merge.c:1249
61 +#: advice.c:168 builtin/merge.c:1250
62 msgid "You have not concluded your merge (MERGE_HEAD exists)."
63 msgstr ""
64
@@ -723,23 +723,23 @@ msgstr ""
723 msgid "pathspec '%s' did not match any files"
724 msgstr ""
725
726 -#: archive.c:436
726 +#: archive.c:434
727 msgid "fmt"
728 msgstr ""
729
730 -#: archive.c:436
730 +#: archive.c:434
731 msgid "archive format"
732 msgstr ""
733
734 -#: archive.c:437 builtin/log.c:1462
734 +#: archive.c:435 builtin/log.c:1462
735 msgid "prefix"
736 msgstr ""
737
738 -#: archive.c:438
738 +#: archive.c:436
739 msgid "prepend prefix to each pathname in the archive"
740 msgstr ""
741
742 -#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
742 +#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
743 #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
744 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
745 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
@@ -747,69 +747,69 @@ msgstr ""
747 msgid "file"
748 msgstr ""
749
750 -#: archive.c:440 builtin/archive.c:89
750 +#: archive.c:438 builtin/archive.c:89
751 msgid "write the archive to this file"
752 msgstr ""
753
754 -#: archive.c:442
754 +#: archive.c:440
755 msgid "read .gitattributes in working directory"
756 msgstr ""
757
758 -#: archive.c:443
758 +#: archive.c:441
759 msgid "report archived files on stderr"
760 msgstr ""
761
762 -#: archive.c:444
762 +#: archive.c:442
763 msgid "store only"
764 msgstr ""
765
766 -#: archive.c:445
766 +#: archive.c:443
767 msgid "compress faster"
768 msgstr ""
769
770 -#: archive.c:453
770 +#: archive.c:451
771 msgid "compress better"
772 msgstr ""
773
774 -#: archive.c:456
774 +#: archive.c:454
775 msgid "list supported archive formats"
776 msgstr ""
777
778 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
778 +#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
779 #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
780 msgid "repo"
781 msgstr ""
782
783 -#: archive.c:459 builtin/archive.c:91
783 +#: archive.c:457 builtin/archive.c:91
784 msgid "retrieve the archive from remote repository <repo>"
785 msgstr ""
786
787 -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
787 +#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489
788 msgid "command"
789 msgstr ""
790
791 -#: archive.c:461 builtin/archive.c:93
791 +#: archive.c:459 builtin/archive.c:93
792 msgid "path to the remote git-upload-archive command"
793 msgstr ""
794
795 -#: archive.c:468
795 +#: archive.c:466
796 msgid "Unexpected option --remote"
797 msgstr ""
798
799 -#: archive.c:470
799 +#: archive.c:468
800 msgid "Option --exec can only be used together with --remote"
801 msgstr ""
802
803 -#: archive.c:472
803 +#: archive.c:470
804 msgid "Unexpected option --output"
805 msgstr ""
806
807 -#: archive.c:494
807 +#: archive.c:492
808 #, c-format
809 msgid "Unknown archive format '%s'"
810 msgstr ""
811
812 -#: archive.c:501
812 +#: archive.c:499
813 #, c-format
814 msgid "Argument not supported for format '%s': -%d"
815 msgstr ""
@@ -942,9 +942,9 @@ msgstr ""
942 msgid "--reverse and --first-parent together require specified latest commit"
943 msgstr ""
944
945 -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860
946 -#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
947 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371
945 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
946 +#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
947 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372
948 #: builtin/shortlog.c:192
949 msgid "revision walk setup failed"
950 msgstr ""
@@ -1098,7 +1098,7 @@ msgstr ""
1098 msgid "unrecognized header: %s%s (%d)"
1099 msgstr ""
1100
1101 -#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755
1101 +#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755
1102 #, c-format
1103 msgid "could not open '%s'"
1104 msgstr ""
@@ -1165,7 +1165,7 @@ msgstr ""
1165 msgid "invalid color value: %.*s"
1166 msgstr ""
1167
1168 -#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465
1168 +#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465
1169 #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
1170 #: builtin/replace.c:448
1171 #, c-format
@@ -1369,11 +1369,11 @@ msgstr ""
1369 msgid "could not unset '%s'"
1370 msgstr ""
1371
1372 -#: connect.c:60
1372 +#: connect.c:61
1373 msgid "The remote end hung up upon initial contact"
1374 msgstr ""
1375
1376 -#: connect.c:62
1376 +#: connect.c:63
1377 msgid ""
1378 "Could not read from remote repository.\n"
1379 "\n"
@@ -1877,51 +1877,112 @@ msgstr ""
1877 msgid "'%s': short read"
1878 msgstr ""
1879
1880 -#: help.c:179
1880 +#: help.c:23
1881 +msgid "start a working area (see also: git help tutorial)"
1882 +msgstr ""
1883 +
1884 +#: help.c:24
1885 +msgid "work on the current change (see also: git help everyday)"
1886 +msgstr ""
1887 +
1888 +#: help.c:25
1889 +msgid "examine the history and state (see also: git help revisions)"
1890 +msgstr ""
1891 +
1892 +#: help.c:26
1893 +msgid "grow, mark and tweak your common history"
1894 +msgstr ""
1895 +
1896 +#: help.c:27
1897 +msgid "collaborate (see also: git help workflows)"
1898 +msgstr ""
1899 +
1900 +#: help.c:31
1901 +msgid "Main Porcelain Commands"
1902 +msgstr ""
1903 +
1904 +#: help.c:32
1905 +msgid "Ancillary Commands / Manipulators"
1906 +msgstr ""
1907 +
1908 +#: help.c:33
1909 +msgid "Ancillary Commands / Interrogators"
1910 +msgstr ""
1911 +
1912 +#: help.c:34
1913 +msgid "Interacting with Others"
1914 +msgstr ""
1915 +
1916 +#: help.c:35
1917 +msgid "Low-level Commands / Manipulators"
1918 +msgstr ""
1919 +
1920 +#: help.c:36
1921 +msgid "Low-level Commands / Interrogators"
1922 +msgstr ""
1923 +
1924 +#: help.c:37
1925 +msgid "Low-level Commands / Synching Repositories"
1926 +msgstr ""
1927 +
1928 +#: help.c:38
1929 +msgid "Low-level Commands / Internal Helpers"
1930 +msgstr ""
1931 +
1932 +#: help.c:293
1933 #, c-format
1934 msgid "available git commands in '%s'"
1935 msgstr ""
1936
1885 -#: help.c:186
1937 +#: help.c:300
1938 msgid "git commands available from elsewhere on your $PATH"
1939 msgstr ""
1940
1889 -#: help.c:217
1941 +#: help.c:309
1942 msgid "These are common Git commands used in various situations:"
1943 msgstr ""
1944
1893 -#: help.c:281
1945 +#: help.c:358 git.c:90
1946 +#, c-format
1947 +msgid "unsupported command listing type '%s'"
1948 +msgstr ""
1949 +
1950 +#: help.c:405
1951 +msgid "The common Git guides are:"
1952 +msgstr ""
1953 +
1954 +#: help.c:467
1955 #, c-format
1956 msgid ""
1957 "'%s' appears to be a git command, but we were not\n"
1958 "able to execute it. Maybe git-%s is broken?"
1959 msgstr ""
1960
1900 -#: help.c:336
1961 +#: help.c:526
1962 msgid "Uh oh. Your system reports no Git commands at all."
1963 msgstr ""
1964
1904 -#: help.c:358
1965 +#: help.c:548
1966 #, c-format
1967 msgid "WARNING: You called a Git command named '%s', which does not exist."
1968 msgstr ""
1969
1909 -#: help.c:363
1970 +#: help.c:553
1971 #, c-format
1972 msgid "Continuing under the assumption that you meant '%s'."
1973 msgstr ""
1974
1914 -#: help.c:368
1975 +#: help.c:558
1976 #, c-format
1977 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
1978 msgstr ""
1979
1919 -#: help.c:376
1980 +#: help.c:566
1981 #, c-format
1982 msgid "git: '%s' is not a git command. See 'git --help'."
1983 msgstr ""
1984
1924 -#: help.c:380
1985 +#: help.c:570
1986 msgid ""
1987 "\n"
1988 "The most similar command is"
@@ -1931,16 +1992,16 @@ msgid_plural ""
1992 msgstr[0] ""
1993 msgstr[1] ""
1994
1934 -#: help.c:395
1995 +#: help.c:585
1996 msgid "git version [<options>]"
1997 msgstr ""
1998
1938 -#: help.c:462
1999 +#: help.c:652
2000 #, c-format
2001 msgid "%s: %s - %s"
2002 msgstr ""
2003
1943 -#: help.c:466
2004 +#: help.c:656
2005 msgid ""
2006 "\n"
2007 "Did you mean this?"
@@ -2394,7 +2455,7 @@ msgstr ""
2455 msgid "Could not parse object '%s'"
2456 msgstr ""
2457
2397 -#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815
2458 +#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816
2459 msgid "Unable to write index."
2460 msgstr ""
2461
@@ -2583,12 +2644,12 @@ msgid ""
2644 "Using version %i"
2645 msgstr ""
2646
2586 -#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047
2647 +#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048
2648 #, c-format
2649 msgid "could not close '%s'"
2650 msgstr ""
2651
2591 -#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233
2652 +#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234
2653 #, c-format
2654 msgid "could not stat '%s'"
2655 msgstr ""
@@ -2603,7 +2664,7 @@ msgstr ""
2664 msgid "unable to unlink: %s"
2665 msgstr ""
2666
2606 -#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395
2667 +#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395
2668 #: builtin/am.c:779
2669 #, c-format
2670 msgid "could not open '%s' for writing"
@@ -3046,85 +3107,85 @@ msgstr ""
3107 msgid "the receiving end does not support push options"
3108 msgstr ""
3109
3049 -#: sequencer.c:174
3110 +#: sequencer.c:175
3111 #, c-format
3112 msgid "invalid commit message cleanup mode '%s'"
3113 msgstr ""
3114
3054 -#: sequencer.c:274
3115 +#: sequencer.c:275
3116 #, c-format
3117 msgid "could not delete '%s'"
3118 msgstr ""
3119
3059 -#: sequencer.c:300
3120 +#: sequencer.c:301
3121 msgid "revert"
3122 msgstr ""
3123
3063 -#: sequencer.c:302
3124 +#: sequencer.c:303
3125 msgid "cherry-pick"
3126 msgstr ""
3127
3067 -#: sequencer.c:304
3128 +#: sequencer.c:305
3129 msgid "rebase -i"
3130 msgstr ""
3131
3071 -#: sequencer.c:306
3132 +#: sequencer.c:307
3133 #, c-format
3134 msgid "Unknown action: %d"
3135 msgstr ""
3136
3076 -#: sequencer.c:363
3137 +#: sequencer.c:364
3138 msgid ""
3139 "after resolving the conflicts, mark the corrected paths\n"
3140 "with 'git add <paths>' or 'git rm <paths>'"
3141 msgstr ""
3142
3082 -#: sequencer.c:366
3143 +#: sequencer.c:367
3144 msgid ""
3145 "after resolving the conflicts, mark the corrected paths\n"
3146 "with 'git add <paths>' or 'git rm <paths>'\n"
3147 "and commit the result with 'git commit'"
3148 msgstr ""
3149
3089 -#: sequencer.c:379 sequencer.c:2467
3150 +#: sequencer.c:380 sequencer.c:2468
3151 #, c-format
3152 msgid "could not lock '%s'"
3153 msgstr ""
3154
3094 -#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485
3095 -#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656
3155 +#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
3156 +#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656
3157 #, c-format
3158 msgid "could not write to '%s'"
3159 msgstr ""
3160
3100 -#: sequencer.c:386
3161 +#: sequencer.c:387
3162 #, c-format
3163 msgid "could not write eol to '%s'"
3164 msgstr ""
3165
3105 -#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487
3106 -#: sequencer.c:2701
3166 +#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
3167 +#: sequencer.c:2702
3168 #, c-format
3169 msgid "failed to finalize '%s'"
3170 msgstr ""
3171
3111 -#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370
3112 -#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727
3113 -#: builtin/merge.c:1045
3172 +#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
3173 +#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
3174 +#: builtin/merge.c:1046
3175 #, c-format
3176 msgid "could not read '%s'"
3177 msgstr ""
3178
3118 -#: sequencer.c:440
3179 +#: sequencer.c:441
3180 #, c-format
3181 msgid "your local changes would be overwritten by %s."
3182 msgstr ""
3183
3123 -#: sequencer.c:444
3184 +#: sequencer.c:445
3185 msgid "commit your changes or stash them to proceed."
3186 msgstr ""
3187
3127 -#: sequencer.c:473
3188 +#: sequencer.c:474
3189 #, c-format
3190 msgid "%s: fast-forward"
3191 msgstr ""
@@ -3132,20 +3193,20 @@ msgstr ""
3193 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
3194 #. "rebase -i".
3195 #.
3135 -#: sequencer.c:562
3196 +#: sequencer.c:563
3197 #, c-format
3198 msgid "%s: Unable to write new index file"
3199 msgstr ""
3200
3140 -#: sequencer.c:578
3201 +#: sequencer.c:579
3202 msgid "unable to update cache tree"
3203 msgstr ""
3204
3144 -#: sequencer.c:591
3205 +#: sequencer.c:592
3206 msgid "could not resolve HEAD commit"
3207 msgstr ""
3208
3148 -#: sequencer.c:748
3209 +#: sequencer.c:749
3210 #, c-format
3211 msgid ""
3212 "you have staged changes in your working tree\n"
@@ -3162,15 +3223,15 @@ msgid ""
3223 " git rebase --continue\n"
3224 msgstr ""
3225
3165 -#: sequencer.c:817
3226 +#: sequencer.c:818
3227 msgid "writing root commit"
3228 msgstr ""
3229
3169 -#: sequencer.c:1042
3230 +#: sequencer.c:1043
3231 msgid "'prepare-commit-msg' hook failed"
3232 msgstr ""
3233
3173 -#: sequencer.c:1049
3234 +#: sequencer.c:1050
3235 msgid ""
3236 "Your name and email address were configured automatically based\n"
3237 "on your username and hostname. Please check that they are accurate.\n"
@@ -3185,7 +3246,7 @@ msgid ""
3246 " git commit --amend --reset-author\n"
3247 msgstr ""
3248
3188 -#: sequencer.c:1062
3249 +#: sequencer.c:1063
3250 msgid ""
3251 "Your name and email address were configured automatically based\n"
3252 "on your username and hostname. Please check that they are accurate.\n"
@@ -3199,313 +3260,313 @@ msgid ""
3260 " git commit --amend --reset-author\n"
3261 msgstr ""
3262
3202 -#: sequencer.c:1102
3263 +#: sequencer.c:1103
3264 msgid "couldn't look up newly created commit"
3265 msgstr ""
3266
3206 -#: sequencer.c:1104
3267 +#: sequencer.c:1105
3268 msgid "could not parse newly created commit"
3269 msgstr ""
3270
3210 -#: sequencer.c:1150
3271 +#: sequencer.c:1151
3272 msgid "unable to resolve HEAD after creating commit"
3273 msgstr ""
3274
3214 -#: sequencer.c:1152
3275 +#: sequencer.c:1153
3276 msgid "detached HEAD"
3277 msgstr ""
3278
3218 -#: sequencer.c:1156
3279 +#: sequencer.c:1157
3280 msgid " (root-commit)"
3281 msgstr ""
3282
3222 -#: sequencer.c:1177
3283 +#: sequencer.c:1178
3284 msgid "could not parse HEAD"
3285 msgstr ""
3286
3226 -#: sequencer.c:1179
3287 +#: sequencer.c:1180
3288 #, c-format
3289 msgid "HEAD %s is not a commit!"
3290 msgstr ""
3291
3231 -#: sequencer.c:1183 builtin/commit.c:1528
3292 +#: sequencer.c:1184 builtin/commit.c:1528
3293 msgid "could not parse HEAD commit"
3294 msgstr ""
3295
3235 -#: sequencer.c:1234 sequencer.c:1831
3296 +#: sequencer.c:1235 sequencer.c:1832
3297 msgid "unable to parse commit author"
3298 msgstr ""
3299
3239 -#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644
3300 +#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645
3301 msgid "git write-tree failed to write a tree"
3302 msgstr ""
3303
3243 -#: sequencer.c:1261 sequencer.c:1316
3304 +#: sequencer.c:1262 sequencer.c:1317
3305 #, c-format
3306 msgid "unable to read commit message from '%s'"
3307 msgstr ""
3308
3248 -#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824
3249 -#: builtin/merge.c:849
3309 +#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
3310 +#: builtin/merge.c:850
3311 msgid "failed to write commit object"
3312 msgstr ""
3313
3253 -#: sequencer.c:1343
3314 +#: sequencer.c:1344
3315 #, c-format
3316 msgid "could not parse commit %s"
3317 msgstr ""
3318
3258 -#: sequencer.c:1348
3319 +#: sequencer.c:1349
3320 #, c-format
3321 msgid "could not parse parent commit %s"
3322 msgstr ""
3323
3263 -#: sequencer.c:1499 sequencer.c:1524
3324 +#: sequencer.c:1500 sequencer.c:1525
3325 #, c-format
3326 msgid "This is a combination of %d commits."
3327 msgstr ""
3328
3268 -#: sequencer.c:1509 sequencer.c:4354
3329 +#: sequencer.c:1510 sequencer.c:4355
3330 msgid "need a HEAD to fixup"
3331 msgstr ""
3332
3272 -#: sequencer.c:1511 sequencer.c:2728
3333 +#: sequencer.c:1512 sequencer.c:2729
3334 msgid "could not read HEAD"
3335 msgstr ""
3336
3276 -#: sequencer.c:1513
3337 +#: sequencer.c:1514
3338 msgid "could not read HEAD's commit message"
3339 msgstr ""
3340
3280 -#: sequencer.c:1519
3341 +#: sequencer.c:1520
3342 #, c-format
3343 msgid "cannot write '%s'"
3344 msgstr ""
3345
3285 -#: sequencer.c:1526 git-rebase--interactive.sh:457
3346 +#: sequencer.c:1527 git-rebase--interactive.sh:457
3347 msgid "This is the 1st commit message:"
3348 msgstr ""
3349
3289 -#: sequencer.c:1534
3350 +#: sequencer.c:1535
3351 #, c-format
3352 msgid "could not read commit message of %s"
3353 msgstr ""
3354
3294 -#: sequencer.c:1541
3355 +#: sequencer.c:1542
3356 #, c-format
3357 msgid "This is the commit message #%d:"
3358 msgstr ""
3359
3299 -#: sequencer.c:1547
3360 +#: sequencer.c:1548
3361 #, c-format
3362 msgid "The commit message #%d will be skipped:"
3363 msgstr ""
3364
3304 -#: sequencer.c:1552
3365 +#: sequencer.c:1553
3366 #, c-format
3367 msgid "unknown command: %d"
3368 msgstr ""
3369
3309 -#: sequencer.c:1630
3370 +#: sequencer.c:1631
3371 msgid "your index file is unmerged."
3372 msgstr ""
3373
3313 -#: sequencer.c:1637
3374 +#: sequencer.c:1638
3375 msgid "cannot fixup root commit"
3376 msgstr ""
3377
3317 -#: sequencer.c:1656
3378 +#: sequencer.c:1657
3379 #, c-format
3380 msgid "commit %s is a merge but no -m option was given."
3381 msgstr ""
3382
3322 -#: sequencer.c:1664
3383 +#: sequencer.c:1665
3384 #, c-format
3385 msgid "commit %s does not have parent %d"
3386 msgstr ""
3387
3327 -#: sequencer.c:1668
3388 +#: sequencer.c:1669
3389 #, c-format
3390 msgid "mainline was specified but commit %s is not a merge."
3391 msgstr ""
3392
3332 -#: sequencer.c:1674
3393 +#: sequencer.c:1675
3394 #, c-format
3395 msgid "cannot get commit message for %s"
3396 msgstr ""
3397
3398 #. TRANSLATORS: The first %s will be a "todo" command like
3399 #. "revert" or "pick", the second %s a SHA1.
3339 -#: sequencer.c:1693
3400 +#: sequencer.c:1694
3401 #, c-format
3402 msgid "%s: cannot parse parent commit %s"
3403 msgstr ""
3404
3344 -#: sequencer.c:1758
3405 +#: sequencer.c:1759
3406 #, c-format
3407 msgid "could not rename '%s' to '%s'"
3408 msgstr ""
3409
3349 -#: sequencer.c:1812
3410 +#: sequencer.c:1813
3411 #, c-format
3412 msgid "could not revert %s... %s"
3413 msgstr ""
3414
3354 -#: sequencer.c:1813
3415 +#: sequencer.c:1814
3416 #, c-format
3417 msgid "could not apply %s... %s"
3418 msgstr ""
3419
3359 -#: sequencer.c:1863
3420 +#: sequencer.c:1864
3421 msgid "empty commit set passed"
3422 msgstr ""
3423
3363 -#: sequencer.c:1873
3424 +#: sequencer.c:1874
3425 #, c-format
3426 msgid "git %s: failed to read the index"
3427 msgstr ""
3428
3368 -#: sequencer.c:1880
3429 +#: sequencer.c:1881
3430 #, c-format
3431 msgid "git %s: failed to refresh the index"
3432 msgstr ""
3433
3373 -#: sequencer.c:1960
3434 +#: sequencer.c:1961
3435 #, c-format
3436 msgid "%s does not accept arguments: '%s'"
3437 msgstr ""
3438
3378 -#: sequencer.c:1969
3439 +#: sequencer.c:1970
3440 #, c-format
3441 msgid "missing arguments for %s"
3442 msgstr ""
3443
3383 -#: sequencer.c:2028
3444 +#: sequencer.c:2029
3445 #, c-format
3446 msgid "invalid line %d: %.*s"
3447 msgstr ""
3448
3388 -#: sequencer.c:2036
3449 +#: sequencer.c:2037
3450 #, c-format
3451 msgid "cannot '%s' without a previous commit"
3452 msgstr ""
3453
3393 -#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172
3454 +#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173
3455 #, c-format
3456 msgid "could not read '%s'."
3457 msgstr ""
3458
3398 -#: sequencer.c:2107
3459 +#: sequencer.c:2108
3460 msgid "please fix this using 'git rebase --edit-todo'."
3461 msgstr ""
3462
3402 -#: sequencer.c:2109
3463 +#: sequencer.c:2110
3464 #, c-format
3465 msgid "unusable instruction sheet: '%s'"
3466 msgstr ""
3467
3407 -#: sequencer.c:2114
3468 +#: sequencer.c:2115
3469 msgid "no commits parsed."
3470 msgstr ""
3471
3411 -#: sequencer.c:2125
3472 +#: sequencer.c:2126
3473 msgid "cannot cherry-pick during a revert."
3474 msgstr ""
3475
3415 -#: sequencer.c:2127
3476 +#: sequencer.c:2128
3477 msgid "cannot revert during a cherry-pick."
3478 msgstr ""
3479
3419 -#: sequencer.c:2194
3480 +#: sequencer.c:2195
3481 #, c-format
3482 msgid "invalid key: %s"
3483 msgstr ""
3484
3424 -#: sequencer.c:2197
3485 +#: sequencer.c:2198
3486 #, c-format
3487 msgid "invalid value for %s: %s"
3488 msgstr ""
3489
3429 -#: sequencer.c:2268
3490 +#: sequencer.c:2269
3491 msgid "unusable squash-onto"
3492 msgstr ""
3493
3433 -#: sequencer.c:2284
3494 +#: sequencer.c:2285
3495 #, c-format
3496 msgid "malformed options sheet: '%s'"
3497 msgstr ""
3498
3438 -#: sequencer.c:2322
3499 +#: sequencer.c:2323
3500 msgid "a cherry-pick or revert is already in progress"
3501 msgstr ""
3502
3442 -#: sequencer.c:2323
3503 +#: sequencer.c:2324
3504 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3505 msgstr ""
3506
3446 -#: sequencer.c:2326
3507 +#: sequencer.c:2327
3508 #, c-format
3509 msgid "could not create sequencer directory '%s'"
3510 msgstr ""
3511
3451 -#: sequencer.c:2340
3512 +#: sequencer.c:2341
3513 msgid "could not lock HEAD"
3514 msgstr ""
3515
3455 -#: sequencer.c:2395 sequencer.c:3402
3516 +#: sequencer.c:2396 sequencer.c:3403
3517 msgid "no cherry-pick or revert in progress"
3518 msgstr ""
3519
3459 -#: sequencer.c:2397
3520 +#: sequencer.c:2398
3521 msgid "cannot resolve HEAD"
3522 msgstr ""
3523
3463 -#: sequencer.c:2399 sequencer.c:2434
3524 +#: sequencer.c:2400 sequencer.c:2435
3525 msgid "cannot abort from a branch yet to be born"
3526 msgstr ""
3527
3467 -#: sequencer.c:2420 builtin/grep.c:720
3528 +#: sequencer.c:2421 builtin/grep.c:720
3529 #, c-format
3530 msgid "cannot open '%s'"
3531 msgstr ""
3532
3472 -#: sequencer.c:2422
3533 +#: sequencer.c:2423
3534 #, c-format
3535 msgid "cannot read '%s': %s"
3536 msgstr ""
3537
3477 -#: sequencer.c:2423
3538 +#: sequencer.c:2424
3539 msgid "unexpected end of file"
3540 msgstr ""
3541
3481 -#: sequencer.c:2429
3542 +#: sequencer.c:2430
3543 #, c-format
3544 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3545 msgstr ""
3546
3486 -#: sequencer.c:2440
3547 +#: sequencer.c:2441
3548 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3549 msgstr ""
3550
3490 -#: sequencer.c:2544 sequencer.c:3320
3551 +#: sequencer.c:2545 sequencer.c:3321
3552 #, c-format
3553 msgid "could not update %s"
3554 msgstr ""
3555
3495 -#: sequencer.c:2582 sequencer.c:3300
3556 +#: sequencer.c:2583 sequencer.c:3301
3557 msgid "cannot read HEAD"
3558 msgstr ""
3559
3499 -#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639
3560 +#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639
3561 #, c-format
3562 msgid "could not copy '%s' to '%s'"
3563 msgstr ""
3564
3504 -#: sequencer.c:2640
3565 +#: sequencer.c:2641
3566 msgid "could not read index"
3567 msgstr ""
3568
3508 -#: sequencer.c:2645
3569 +#: sequencer.c:2646
3570 #, c-format
3571 msgid ""
3572 "execution failed: %s\n"
@@ -3515,11 +3576,11 @@ msgid ""
3576 "\n"
3577 msgstr ""
3578
3518 -#: sequencer.c:2651
3579 +#: sequencer.c:2652
3580 msgid "and made changes to the index and/or the working tree\n"
3581 msgstr ""
3582
3522 -#: sequencer.c:2657
3583 +#: sequencer.c:2658
3584 #, c-format
3585 msgid ""
3586 "execution succeeded: %s\n"
@@ -3530,62 +3591,62 @@ msgid ""
3591 "\n"
3592 msgstr ""
3593
3533 -#: sequencer.c:2770
3594 +#: sequencer.c:2771
3595 msgid "writing fake root commit"
3596 msgstr ""
3597
3537 -#: sequencer.c:2775
3598 +#: sequencer.c:2776
3599 msgid "writing squash-onto"
3600 msgstr ""
3601
3541 -#: sequencer.c:2810
3602 +#: sequencer.c:2811
3603 #, c-format
3604 msgid "failed to find tree of %s"
3605 msgstr ""
3606
3546 -#: sequencer.c:2828
3607 +#: sequencer.c:2829
3608 msgid "could not write index"
3609 msgstr ""
3610
3550 -#: sequencer.c:2860
3611 +#: sequencer.c:2861
3612 msgid "cannot merge without a current revision"
3613 msgstr ""
3614
3554 -#: sequencer.c:2883
3615 +#: sequencer.c:2884
3616 #, c-format
3617 msgid "could not resolve '%s'"
3618 msgstr ""
3619
3559 -#: sequencer.c:2905
3620 +#: sequencer.c:2906
3621 #, c-format
3622 msgid "could not get commit message of '%s'"
3623 msgstr ""
3624
3564 -#: sequencer.c:2915 sequencer.c:2940
3625 +#: sequencer.c:2916 sequencer.c:2941
3626 #, c-format
3627 msgid "could not write '%s'"
3628 msgstr ""
3629
3569 -#: sequencer.c:3004
3630 +#: sequencer.c:3005
3631 #, c-format
3632 msgid "could not even attempt to merge '%.*s'"
3633 msgstr ""
3634
3574 -#: sequencer.c:3020
3635 +#: sequencer.c:3021
3636 msgid "merge: Unable to write new index file"
3637 msgstr ""
3638
3578 -#: sequencer.c:3087
3639 +#: sequencer.c:3088
3640 #, c-format
3641 msgid "Applied autostash.\n"
3642 msgstr ""
3643
3583 -#: sequencer.c:3099
3644 +#: sequencer.c:3100
3645 #, c-format
3646 msgid "cannot store %s"
3647 msgstr ""
3648
3588 -#: sequencer.c:3102 git-rebase.sh:188
3649 +#: sequencer.c:3103 git-rebase.sh:188
3650 #, c-format
3651 msgid ""
3652 "Applying autostash resulted in conflicts.\n"
@@ -3593,7 +3654,7 @@ msgid ""
3654 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3655 msgstr ""
3656
3596 -#: sequencer.c:3133
3657 +#: sequencer.c:3134
3658 #, c-format
3659 msgid ""
3660 "Could not execute the todo command\n"
@@ -3606,108 +3667,108 @@ msgid ""
3667 " git rebase --continue\n"
3668 msgstr ""
3669
3609 -#: sequencer.c:3201
3670 +#: sequencer.c:3202
3671 #, c-format
3672 msgid "Stopped at %s... %.*s\n"
3673 msgstr ""
3674
3614 -#: sequencer.c:3263
3675 +#: sequencer.c:3264
3676 #, c-format
3677 msgid "unknown command %d"
3678 msgstr ""
3679
3619 -#: sequencer.c:3308
3680 +#: sequencer.c:3309
3681 msgid "could not read orig-head"
3682 msgstr ""
3683
3623 -#: sequencer.c:3313 sequencer.c:4351
3684 +#: sequencer.c:3314 sequencer.c:4352
3685 msgid "could not read 'onto'"
3686 msgstr ""
3687
3627 -#: sequencer.c:3327
3688 +#: sequencer.c:3328
3689 #, c-format
3690 msgid "could not update HEAD to %s"
3691 msgstr ""
3692
3632 -#: sequencer.c:3413
3693 +#: sequencer.c:3414
3694 msgid "cannot rebase: You have unstaged changes."
3695 msgstr ""
3696
3636 -#: sequencer.c:3422
3697 +#: sequencer.c:3423
3698 msgid "cannot amend non-existing commit"
3699 msgstr ""
3700
3640 -#: sequencer.c:3424
3701 +#: sequencer.c:3425
3702 #, c-format
3703 msgid "invalid file: '%s'"
3704 msgstr ""
3705
3645 -#: sequencer.c:3426
3706 +#: sequencer.c:3427
3707 #, c-format
3708 msgid "invalid contents: '%s'"
3709 msgstr ""
3710
3650 -#: sequencer.c:3429
3711 +#: sequencer.c:3430
3712 msgid ""
3713 "\n"
3714 "You have uncommitted changes in your working tree. Please, commit them\n"
3715 "first and then run 'git rebase --continue' again."
3716 msgstr ""
3717
3657 -#: sequencer.c:3454 sequencer.c:3492
3718 +#: sequencer.c:3455 sequencer.c:3493
3719 #, c-format
3720 msgid "could not write file: '%s'"
3721 msgstr ""
3722
3662 -#: sequencer.c:3507
3723 +#: sequencer.c:3508
3724 msgid "could not remove CHERRY_PICK_HEAD"
3725 msgstr ""
3726
3666 -#: sequencer.c:3514
3727 +#: sequencer.c:3515
3728 msgid "could not commit staged changes."
3729 msgstr ""
3730
3670 -#: sequencer.c:3611
3731 +#: sequencer.c:3612
3732 #, c-format
3733 msgid "%s: can't cherry-pick a %s"
3734 msgstr ""
3735
3675 -#: sequencer.c:3615
3736 +#: sequencer.c:3616
3737 #, c-format
3738 msgid "%s: bad revision"
3739 msgstr ""
3740
3680 -#: sequencer.c:3648
3741 +#: sequencer.c:3649
3742 msgid "can't revert as initial commit"
3743 msgstr ""
3744
3684 -#: sequencer.c:4097
3745 +#: sequencer.c:4098
3746 msgid "make_script: unhandled options"
3747 msgstr ""
3748
3688 -#: sequencer.c:4100
3749 +#: sequencer.c:4101
3750 msgid "make_script: error preparing revisions"
3751 msgstr ""
3752
3692 -#: sequencer.c:4141 sequencer.c:4176
3753 +#: sequencer.c:4142 sequencer.c:4177
3754 #, c-format
3755 msgid "unusable todo list: '%s'"
3756 msgstr ""
3757
3697 -#: sequencer.c:4235
3758 +#: sequencer.c:4236
3759 #, c-format
3760 msgid ""
3761 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
3762 msgstr ""
3763
3703 -#: sequencer.c:4301
3764 +#: sequencer.c:4302
3765 #, c-format
3766 msgid ""
3767 "Warning: some commits may have been dropped accidentally.\n"
3768 "Dropped commits (newer to older):\n"
3769 msgstr ""
3770
3710 -#: sequencer.c:4308
3771 +#: sequencer.c:4309
3772 #, c-format
3773 msgid ""
3774 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3718,7 +3779,7 @@ msgid ""
3779 "\n"
3780 msgstr ""
3781
3721 -#: sequencer.c:4320
3782 +#: sequencer.c:4321
3783 #, c-format
3784 msgid ""
3785 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3726,12 +3787,12 @@ msgid ""
3787 "Or you can abort the rebase with 'git rebase --abort'.\n"
3788 msgstr ""
3789
3729 -#: sequencer.c:4374
3790 +#: sequencer.c:4375
3791 #, c-format
3792 msgid "could not parse commit '%s'"
3793 msgstr ""
3794
3734 -#: sequencer.c:4489
3795 +#: sequencer.c:4490
3796 msgid "the script was already rearranged."
3797 msgstr ""
3798
@@ -3968,44 +4029,44 @@ msgstr ""
4029 msgid "Failed to resolve HEAD as a valid ref."
4030 msgstr ""
4031
3971 -#: submodule.c:1373
4032 +#: submodule.c:1375
4033 #, c-format
4034 msgid "'%s' not recognized as a git repository"
4035 msgstr ""
4036
3976 -#: submodule.c:1511
4037 +#: submodule.c:1513
4038 #, c-format
4039 msgid "could not start 'git status' in submodule '%s'"
4040 msgstr ""
4041
3981 -#: submodule.c:1524
4042 +#: submodule.c:1526
4043 #, c-format
4044 msgid "could not run 'git status' in submodule '%s'"
4045 msgstr ""
4046
3986 -#: submodule.c:1617
4047 +#: submodule.c:1619
4048 #, c-format
4049 msgid "submodule '%s' has dirty index"
4050 msgstr ""
4051
3991 -#: submodule.c:1716
4052 +#: submodule.c:1718
4053 #, c-format
4054 msgid ""
4055 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
4056 msgstr ""
4057
3997 -#: submodule.c:1728 submodule.c:1784
4058 +#: submodule.c:1730 submodule.c:1786
4059 #, c-format
4060 msgid "could not lookup name for submodule '%s'"
4061 msgstr ""
4062
4002 -#: submodule.c:1732 builtin/submodule--helper.c:1261
4063 +#: submodule.c:1734 builtin/submodule--helper.c:1261
4064 #: builtin/submodule--helper.c:1271
4065 #, c-format
4066 msgid "could not create directory '%s'"
4067 msgstr ""
4068
4008 -#: submodule.c:1735
4069 +#: submodule.c:1737
4070 #, c-format
4071 msgid ""
4072 "Migrating git directory of '%s%s' from\n"
@@ -4013,16 +4074,16 @@ msgid ""
4074 "'%s'\n"
4075 msgstr ""
4076
4016 -#: submodule.c:1819
4077 +#: submodule.c:1821
4078 #, c-format
4079 msgid "could not recurse into submodule '%s'"
4080 msgstr ""
4081
4021 -#: submodule.c:1863
4082 +#: submodule.c:1865
4083 msgid "could not start ls-files in .."
4084 msgstr ""
4085
4025 -#: submodule.c:1902
4086 +#: submodule.c:1904
4087 #, c-format
4088 msgid "ls-tree returned unexpected return code %d"
4089 msgstr ""
@@ -4401,7 +4462,7 @@ msgid "could not open '%s' for reading and writing"
4462 msgstr ""
4463
4464 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
4404 -#: builtin/am.c:862 builtin/merge.c:1042
4465 +#: builtin/am.c:862 builtin/merge.c:1043
4466 #, c-format
4467 msgid "could not open '%s' for reading"
4468 msgstr ""
@@ -4907,7 +4968,7 @@ msgstr ""
4968 msgid "Unstaged changes after refreshing the index:"
4969 msgstr ""
4970
4910 -#: builtin/add.c:233 builtin/rev-parse.c:888
4971 +#: builtin/add.c:233 builtin/rev-parse.c:892
4972 msgid "Could not read the index"
4973 msgstr ""
4974
@@ -5330,7 +5391,7 @@ msgid "pass it through git-apply"
5391 msgstr ""
5392
5393 #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
5333 -#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207
5394 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208
5395 #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
5396 #: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
5397 #: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
@@ -5383,7 +5444,7 @@ msgstr ""
5444 msgid "use current timestamp for author date"
5445 msgstr ""
5446
5386 -#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238
5447 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239
5448 #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
5449 msgid "key-id"
5450 msgstr ""
@@ -6513,7 +6574,7 @@ msgstr ""
6574 msgid "perform a 3-way merge with the new branch"
6575 msgstr ""
6576
6516 -#: builtin/checkout.c:1131 builtin/merge.c:240
6577 +#: builtin/checkout.c:1131 builtin/merge.c:241
6578 msgid "update ignored files (default)"
6579 msgstr ""
6580
@@ -6538,7 +6599,7 @@ msgid "do not check if another worktree is holding the given ref"
6599 msgstr ""
6600
6601 #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
6541 -#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572
6602 +#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572
6603 #: builtin/send-pack.c:174
6604 msgid "force progress reporting"
6605 msgstr ""
@@ -7454,7 +7515,7 @@ msgstr ""
7515 msgid "override date for commit"
7516 msgstr ""
7517
7457 -#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402
7518 +#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402
7519 #: builtin/notes.c:565 builtin/tag.c:392
7520 msgid "message"
7521 msgstr ""
@@ -7488,7 +7549,7 @@ msgstr ""
7549 msgid "the commit is authored by me now (used with -C/-c/--amend)"
7550 msgstr ""
7551
7491 -#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241
7552 +#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242
7553 #: builtin/pull.c:154 builtin/revert.c:105
7554 msgid "add Signed-off-by:"
7555 msgstr ""
@@ -7513,7 +7574,7 @@ msgstr ""
7574 msgid "include status in commit message template"
7575 msgstr ""
7576
7516 -#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184
7577 +#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184
7578 #: builtin/revert.c:113
7579 msgid "GPG sign commit"
7580 msgstr ""
@@ -8089,41 +8150,41 @@ msgstr ""
8150 msgid "do not prompt before launching a diff tool"
8151 msgstr ""
8152
8092 -#: builtin/difftool.c:705
8153 +#: builtin/difftool.c:704
8154 msgid "use symlinks in dir-diff mode"
8155 msgstr ""
8156
8096 -#: builtin/difftool.c:706
8157 +#: builtin/difftool.c:705
8158 msgid "<tool>"
8159 msgstr ""
8160
8100 -#: builtin/difftool.c:707
8161 +#: builtin/difftool.c:706
8162 msgid "use the specified diff tool"
8163 msgstr ""
8164
8104 -#: builtin/difftool.c:709
8165 +#: builtin/difftool.c:708
8166 msgid "print a list of diff tools that may be used with `--tool`"
8167 msgstr ""
8168
8108 -#: builtin/difftool.c:712
8169 +#: builtin/difftool.c:711
8170 msgid ""
8171 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
8172 "code"
8173 msgstr ""
8174
8114 -#: builtin/difftool.c:714
8175 +#: builtin/difftool.c:713
8176 msgid "<command>"
8177 msgstr ""
8178
8118 -#: builtin/difftool.c:715
8179 +#: builtin/difftool.c:714
8180 msgid "specify a custom command for viewing diffs"
8181 msgstr ""
8182
8122 -#: builtin/difftool.c:739
8183 +#: builtin/difftool.c:738
8184 msgid "no <tool> given for --tool=<tool>"
8185 msgstr ""
8186
8126 -#: builtin/difftool.c:746
8187 +#: builtin/difftool.c:745
8188 msgid "no <cmd> given for --extcmd=<cmd>"
8189 msgstr ""
8190
@@ -8983,126 +9044,94 @@ msgstr ""
9044 msgid "process file as it were from this path"
9045 msgstr ""
9046
8986 -#: builtin/help.c:43
9047 +#: builtin/help.c:45
9048 msgid "print all available commands"
9049 msgstr ""
9050
8990 -#: builtin/help.c:44
9051 +#: builtin/help.c:46
9052 msgid "exclude guides"
9053 msgstr ""
9054
8994 -#: builtin/help.c:45
9055 +#: builtin/help.c:47
9056 msgid "print list of useful guides"
9057 msgstr ""
9058
8998 -#: builtin/help.c:46
9059 +#: builtin/help.c:48
9060 msgid "show man page"
9061 msgstr ""
9062
9002 -#: builtin/help.c:47
9063 +#: builtin/help.c:49
9064 msgid "show manual in web browser"
9065 msgstr ""
9066
9006 -#: builtin/help.c:49
9067 +#: builtin/help.c:51
9068 msgid "show info page"
9069 msgstr ""
9070
9010 -#: builtin/help.c:55
9071 +#: builtin/help.c:53
9072 +msgid "print command description"
9073 +msgstr ""
9074 +
9075 +#: builtin/help.c:58
9076 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
9077 msgstr ""
9078
9014 -#: builtin/help.c:67
9079 +#: builtin/help.c:70
9080 #, c-format
9081 msgid "unrecognized help format '%s'"
9082 msgstr ""
9083
9019 -#: builtin/help.c:94
9084 +#: builtin/help.c:97
9085 msgid "Failed to start emacsclient."
9086 msgstr ""
9087
9023 -#: builtin/help.c:107
9088 +#: builtin/help.c:110
9089 msgid "Failed to parse emacsclient version."
9090 msgstr ""
9091
9027 -#: builtin/help.c:115
9092 +#: builtin/help.c:118
9093 #, c-format
9094 msgid "emacsclient version '%d' too old (< 22)."
9095 msgstr ""
9096
9032 -#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
9097 +#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176
9098 #, c-format
9099 msgid "failed to exec '%s'"
9100 msgstr ""
9101
9037 -#: builtin/help.c:211
9102 +#: builtin/help.c:214
9103 #, c-format
9104 msgid ""
9105 "'%s': path for unsupported man viewer.\n"
9106 "Please consider using 'man.<tool>.cmd' instead."
9107 msgstr ""
9108
9044 -#: builtin/help.c:223
9109 +#: builtin/help.c:226
9110 #, c-format
9111 msgid ""
9112 "'%s': cmd for supported man viewer.\n"
9113 "Please consider using 'man.<tool>.path' instead."
9114 msgstr ""
9115
9051 -#: builtin/help.c:340
9116 +#: builtin/help.c:343
9117 #, c-format
9118 msgid "'%s': unknown man viewer."
9119 msgstr ""
9120
9056 -#: builtin/help.c:357
9121 +#: builtin/help.c:360
9122 msgid "no man viewer handled the request"
9123 msgstr ""
9124
9060 -#: builtin/help.c:365
9125 +#: builtin/help.c:368
9126 msgid "no info viewer handled the request"
9127 msgstr ""
9128
9064 -#: builtin/help.c:407
9065 -msgid "Defining attributes per path"
9066 -msgstr ""
9067 -
9068 -#: builtin/help.c:408
9069 -msgid "Everyday Git With 20 Commands Or So"
9070 -msgstr ""
9071 -
9072 -#: builtin/help.c:409
9073 -msgid "A Git glossary"
9074 -msgstr ""
9075 -
9076 -#: builtin/help.c:410
9077 -msgid "Specifies intentionally untracked files to ignore"
9078 -msgstr ""
9079 -
9080 -#: builtin/help.c:411
9081 -msgid "Defining submodule properties"
9082 -msgstr ""
9083 -
9084 -#: builtin/help.c:412
9085 -msgid "Specifying revisions and ranges for Git"
9086 -msgstr ""
9087 -
9088 -#: builtin/help.c:413
9089 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
9090 -msgstr ""
9091 -
9092 -#: builtin/help.c:414
9093 -msgid "An overview of recommended workflows with Git"
9094 -msgstr ""
9095 -
9096 -#: builtin/help.c:426
9097 -msgid "The common Git guides are:\n"
9098 -msgstr ""
9099 -
9100 -#: builtin/help.c:444
9129 +#: builtin/help.c:415
9130 #, c-format
9131 msgid "'%s' is aliased to '%s'"
9132 msgstr ""
9133
9105 -#: builtin/help.c:466 builtin/help.c:483
9134 +#: builtin/help.c:442 builtin/help.c:459
9135 #, c-format
9136 msgid "usage: %s%s"
9137 msgstr ""
@@ -9441,7 +9470,7 @@ msgstr ""
9470
9471 #: builtin/init-db.c:120
9472 #, c-format
9444 -msgid "templates not found %s"
9473 +msgid "templates not found in %s"
9474 msgstr ""
9475
9476 #: builtin/init-db.c:135
@@ -10106,180 +10135,180 @@ msgstr ""
10135 msgid "empty mbox: '%s'"
10136 msgstr ""
10137
10109 -#: builtin/merge.c:50
10138 +#: builtin/merge.c:51
10139 msgid "git merge [<options>] [<commit>...]"
10140 msgstr ""
10141
10113 -#: builtin/merge.c:51
10142 +#: builtin/merge.c:52
10143 msgid "git merge --abort"
10144 msgstr ""
10145
10117 -#: builtin/merge.c:52
10146 +#: builtin/merge.c:53
10147 msgid "git merge --continue"
10148 msgstr ""
10149
10121 -#: builtin/merge.c:109
10150 +#: builtin/merge.c:110
10151 msgid "switch `m' requires a value"
10152 msgstr ""
10153
10125 -#: builtin/merge.c:146
10154 +#: builtin/merge.c:147
10155 #, c-format
10156 msgid "Could not find merge strategy '%s'.\n"
10157 msgstr ""
10158
10130 -#: builtin/merge.c:147
10159 +#: builtin/merge.c:148
10160 #, c-format
10161 msgid "Available strategies are:"
10162 msgstr ""
10163
10135 -#: builtin/merge.c:152
10164 +#: builtin/merge.c:153
10165 #, c-format
10166 msgid "Available custom strategies are:"
10167 msgstr ""
10168
10140 -#: builtin/merge.c:202 builtin/pull.c:142
10169 +#: builtin/merge.c:203 builtin/pull.c:142
10170 msgid "do not show a diffstat at the end of the merge"
10171 msgstr ""
10172
10144 -#: builtin/merge.c:205 builtin/pull.c:145
10173 +#: builtin/merge.c:206 builtin/pull.c:145
10174 msgid "show a diffstat at the end of the merge"
10175 msgstr ""
10176
10148 -#: builtin/merge.c:206 builtin/pull.c:148
10177 +#: builtin/merge.c:207 builtin/pull.c:148
10178 msgid "(synonym to --stat)"
10179 msgstr ""
10180
10152 -#: builtin/merge.c:208 builtin/pull.c:151
10181 +#: builtin/merge.c:209 builtin/pull.c:151
10182 msgid "add (at most <n>) entries from shortlog to merge commit message"
10183 msgstr ""
10184
10156 -#: builtin/merge.c:211 builtin/pull.c:157
10185 +#: builtin/merge.c:212 builtin/pull.c:157
10186 msgid "create a single commit instead of doing a merge"
10187 msgstr ""
10188
10160 -#: builtin/merge.c:213 builtin/pull.c:160
10189 +#: builtin/merge.c:214 builtin/pull.c:160
10190 msgid "perform a commit if the merge succeeds (default)"
10191 msgstr ""
10192
10164 -#: builtin/merge.c:215 builtin/pull.c:163
10193 +#: builtin/merge.c:216 builtin/pull.c:163
10194 msgid "edit message before committing"
10195 msgstr ""
10196
10168 -#: builtin/merge.c:216
10197 +#: builtin/merge.c:217
10198 msgid "allow fast-forward (default)"
10199 msgstr ""
10200
10172 -#: builtin/merge.c:218 builtin/pull.c:169
10201 +#: builtin/merge.c:219 builtin/pull.c:169
10202 msgid "abort if fast-forward is not possible"
10203 msgstr ""
10204
10176 -#: builtin/merge.c:222 builtin/pull.c:172
10205 +#: builtin/merge.c:223 builtin/pull.c:172
10206 msgid "verify that the named commit has a valid GPG signature"
10207 msgstr ""
10208
10180 -#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176
10209 +#: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176
10210 #: builtin/revert.c:109
10211 msgid "strategy"
10212 msgstr ""
10213
10185 -#: builtin/merge.c:224 builtin/pull.c:177
10214 +#: builtin/merge.c:225 builtin/pull.c:177
10215 msgid "merge strategy to use"
10216 msgstr ""
10217
10189 -#: builtin/merge.c:225 builtin/pull.c:180
10218 +#: builtin/merge.c:226 builtin/pull.c:180
10219 msgid "option=value"
10220 msgstr ""
10221
10193 -#: builtin/merge.c:226 builtin/pull.c:181
10222 +#: builtin/merge.c:227 builtin/pull.c:181
10223 msgid "option for selected merge strategy"
10224 msgstr ""
10225
10197 -#: builtin/merge.c:228
10226 +#: builtin/merge.c:229
10227 msgid "merge commit message (for a non-fast-forward merge)"
10228 msgstr ""
10229
10201 -#: builtin/merge.c:232
10230 +#: builtin/merge.c:233
10231 msgid "abort the current in-progress merge"
10232 msgstr ""
10233
10205 -#: builtin/merge.c:234
10234 +#: builtin/merge.c:235
10235 msgid "continue the current in-progress merge"
10236 msgstr ""
10237
10209 -#: builtin/merge.c:236 builtin/pull.c:188
10238 +#: builtin/merge.c:237 builtin/pull.c:188
10239 msgid "allow merging unrelated histories"
10240 msgstr ""
10241
10213 -#: builtin/merge.c:242
10242 +#: builtin/merge.c:243
10243 msgid "verify commit-msg hook"
10244 msgstr ""
10245
10217 -#: builtin/merge.c:267
10246 +#: builtin/merge.c:268
10247 msgid "could not run stash."
10248 msgstr ""
10249
10221 -#: builtin/merge.c:272
10250 +#: builtin/merge.c:273
10251 msgid "stash failed"
10252 msgstr ""
10253
10225 -#: builtin/merge.c:277
10254 +#: builtin/merge.c:278
10255 #, c-format
10256 msgid "not a valid object: %s"
10257 msgstr ""
10258
10230 -#: builtin/merge.c:299 builtin/merge.c:316
10259 +#: builtin/merge.c:300 builtin/merge.c:317
10260 msgid "read-tree failed"
10261 msgstr ""
10262
10234 -#: builtin/merge.c:346
10263 +#: builtin/merge.c:347
10264 msgid " (nothing to squash)"
10265 msgstr ""
10266
10238 -#: builtin/merge.c:357
10267 +#: builtin/merge.c:358
10268 #, c-format
10269 msgid "Squash commit -- not updating HEAD\n"
10270 msgstr ""
10271
10243 -#: builtin/merge.c:407
10272 +#: builtin/merge.c:408
10273 #, c-format
10274 msgid "No merge message -- not updating HEAD\n"
10275 msgstr ""
10276
10248 -#: builtin/merge.c:457
10277 +#: builtin/merge.c:458
10278 #, c-format
10279 msgid "'%s' does not point to a commit"
10280 msgstr ""
10281
10253 -#: builtin/merge.c:547
10282 +#: builtin/merge.c:548
10283 #, c-format
10284 msgid "Bad branch.%s.mergeoptions string: %s"
10285 msgstr ""
10286
10258 -#: builtin/merge.c:668
10287 +#: builtin/merge.c:669
10288 msgid "Not handling anything other than two heads merge."
10289 msgstr ""
10290
10262 -#: builtin/merge.c:682
10291 +#: builtin/merge.c:683
10292 #, c-format
10293 msgid "Unknown option for merge-recursive: -X%s"
10294 msgstr ""
10295
10267 -#: builtin/merge.c:697
10296 +#: builtin/merge.c:698
10297 #, c-format
10298 msgid "unable to write %s"
10299 msgstr ""
10300
10272 -#: builtin/merge.c:748
10301 +#: builtin/merge.c:749
10302 #, c-format
10303 msgid "Could not read from '%s'"
10304 msgstr ""
10305
10277 -#: builtin/merge.c:757
10306 +#: builtin/merge.c:758
10307 #, c-format
10308 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
10309 msgstr ""
10310
10282 -#: builtin/merge.c:763
10311 +#: builtin/merge.c:764
10312 #, c-format
10313 msgid ""
10314 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10289,185 +10318,185 @@ msgid ""
10318 "the commit.\n"
10319 msgstr ""
10320
10292 -#: builtin/merge.c:799
10321 +#: builtin/merge.c:800
10322 msgid "Empty commit message."
10323 msgstr ""
10324
10296 -#: builtin/merge.c:818
10325 +#: builtin/merge.c:819
10326 #, c-format
10327 msgid "Wonderful.\n"
10328 msgstr ""
10329
10301 -#: builtin/merge.c:871
10330 +#: builtin/merge.c:872
10331 #, c-format
10332 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
10333 msgstr ""
10334
10306 -#: builtin/merge.c:910
10335 +#: builtin/merge.c:911
10336 msgid "No current branch."
10337 msgstr ""
10338
10310 -#: builtin/merge.c:912
10339 +#: builtin/merge.c:913
10340 msgid "No remote for the current branch."
10341 msgstr ""
10342
10314 -#: builtin/merge.c:914
10343 +#: builtin/merge.c:915
10344 msgid "No default upstream defined for the current branch."
10345 msgstr ""
10346
10318 -#: builtin/merge.c:919
10347 +#: builtin/merge.c:920
10348 #, c-format
10349 msgid "No remote-tracking branch for %s from %s"
10350 msgstr ""
10351
10323 -#: builtin/merge.c:972
10352 +#: builtin/merge.c:973
10353 #, c-format
10354 msgid "Bad value '%s' in environment '%s'"
10355 msgstr ""
10356
10328 -#: builtin/merge.c:1074
10357 +#: builtin/merge.c:1075
10358 #, c-format
10359 msgid "not something we can merge in %s: %s"
10360 msgstr ""
10361
10333 -#: builtin/merge.c:1108
10362 +#: builtin/merge.c:1109
10363 msgid "not something we can merge"
10364 msgstr ""
10365
10337 -#: builtin/merge.c:1210
10366 +#: builtin/merge.c:1211
10367 msgid "--abort expects no arguments"
10368 msgstr ""
10369
10341 -#: builtin/merge.c:1214
10370 +#: builtin/merge.c:1215
10371 msgid "There is no merge to abort (MERGE_HEAD missing)."
10372 msgstr ""
10373
10345 -#: builtin/merge.c:1226
10374 +#: builtin/merge.c:1227
10375 msgid "--continue expects no arguments"
10376 msgstr ""
10377
10349 -#: builtin/merge.c:1230
10378 +#: builtin/merge.c:1231
10379 msgid "There is no merge in progress (MERGE_HEAD missing)."
10380 msgstr ""
10381
10353 -#: builtin/merge.c:1246
10382 +#: builtin/merge.c:1247
10383 msgid ""
10384 "You have not concluded your merge (MERGE_HEAD exists).\n"
10385 "Please, commit your changes before you merge."
10386 msgstr ""
10387
10359 -#: builtin/merge.c:1253
10388 +#: builtin/merge.c:1254
10389 msgid ""
10390 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
10391 "Please, commit your changes before you merge."
10392 msgstr ""
10393
10365 -#: builtin/merge.c:1256
10394 +#: builtin/merge.c:1257
10395 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
10396 msgstr ""
10397
10369 -#: builtin/merge.c:1265
10398 +#: builtin/merge.c:1266
10399 msgid "You cannot combine --squash with --no-ff."
10400 msgstr ""
10401
10373 -#: builtin/merge.c:1273
10402 +#: builtin/merge.c:1274
10403 msgid "No commit specified and merge.defaultToUpstream not set."
10404 msgstr ""
10405
10377 -#: builtin/merge.c:1290
10406 +#: builtin/merge.c:1291
10407 msgid "Squash commit into empty head not supported yet"
10408 msgstr ""
10409
10381 -#: builtin/merge.c:1292
10410 +#: builtin/merge.c:1293
10411 msgid "Non-fast-forward commit does not make sense into an empty head"
10412 msgstr ""
10413
10385 -#: builtin/merge.c:1297
10414 +#: builtin/merge.c:1298
10415 #, c-format
10416 msgid "%s - not something we can merge"
10417 msgstr ""
10418
10390 -#: builtin/merge.c:1299
10419 +#: builtin/merge.c:1300
10420 msgid "Can merge only exactly one commit into empty head"
10421 msgstr ""
10422
10394 -#: builtin/merge.c:1333
10423 +#: builtin/merge.c:1334
10424 #, c-format
10425 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
10426 msgstr ""
10427
10399 -#: builtin/merge.c:1336
10428 +#: builtin/merge.c:1337
10429 #, c-format
10430 msgid "Commit %s has a bad GPG signature allegedly by %s."
10431 msgstr ""
10432
10404 -#: builtin/merge.c:1339
10433 +#: builtin/merge.c:1340
10434 #, c-format
10435 msgid "Commit %s does not have a GPG signature."
10436 msgstr ""
10437
10409 -#: builtin/merge.c:1342
10438 +#: builtin/merge.c:1343
10439 #, c-format
10440 msgid "Commit %s has a good GPG signature by %s\n"
10441 msgstr ""
10442
10414 -#: builtin/merge.c:1401
10443 +#: builtin/merge.c:1402
10444 msgid "refusing to merge unrelated histories"
10445 msgstr ""
10446
10418 -#: builtin/merge.c:1410
10447 +#: builtin/merge.c:1411
10448 msgid "Already up to date."
10449 msgstr ""
10450
10422 -#: builtin/merge.c:1420
10451 +#: builtin/merge.c:1421
10452 #, c-format
10453 msgid "Updating %s..%s\n"
10454 msgstr ""
10455
10427 -#: builtin/merge.c:1461
10456 +#: builtin/merge.c:1462
10457 #, c-format
10458 msgid "Trying really trivial in-index merge...\n"
10459 msgstr ""
10460
10432 -#: builtin/merge.c:1468
10461 +#: builtin/merge.c:1469
10462 #, c-format
10463 msgid "Nope.\n"
10464 msgstr ""
10465
10437 -#: builtin/merge.c:1493
10466 +#: builtin/merge.c:1494
10467 msgid "Already up to date. Yeeah!"
10468 msgstr ""
10469
10441 -#: builtin/merge.c:1499
10470 +#: builtin/merge.c:1500
10471 msgid "Not possible to fast-forward, aborting."
10472 msgstr ""
10473
10445 -#: builtin/merge.c:1522 builtin/merge.c:1601
10474 +#: builtin/merge.c:1523 builtin/merge.c:1602
10475 #, c-format
10476 msgid "Rewinding the tree to pristine...\n"
10477 msgstr ""
10478
10450 -#: builtin/merge.c:1526
10479 +#: builtin/merge.c:1527
10480 #, c-format
10481 msgid "Trying merge strategy %s...\n"
10482 msgstr ""
10483
10455 -#: builtin/merge.c:1592
10484 +#: builtin/merge.c:1593
10485 #, c-format
10486 msgid "No merge strategy handled the merge.\n"
10487 msgstr ""
10488
10460 -#: builtin/merge.c:1594
10489 +#: builtin/merge.c:1595
10490 #, c-format
10491 msgid "Merge with strategy %s failed.\n"
10492 msgstr ""
10493
10465 -#: builtin/merge.c:1603
10494 +#: builtin/merge.c:1604
10495 #, c-format
10496 msgid "Using the %s to prepare resolving by hand.\n"
10497 msgstr ""
10498
10470 -#: builtin/merge.c:1615
10499 +#: builtin/merge.c:1616
10500 #, c-format
10501 msgid "Automatic merge went well; stopped before committing as requested\n"
10502 msgstr ""
@@ -12812,23 +12841,23 @@ msgstr ""
12841 msgid "cannot combine --use-bitmap-index with object filtering"
12842 msgstr ""
12843
12815 -#: builtin/rev-parse.c:402
12844 +#: builtin/rev-parse.c:406
12845 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
12846 msgstr ""
12847
12819 -#: builtin/rev-parse.c:407
12848 +#: builtin/rev-parse.c:411
12849 msgid "keep the `--` passed as an arg"
12850 msgstr ""
12851
12823 -#: builtin/rev-parse.c:409
12852 +#: builtin/rev-parse.c:413
12853 msgid "stop parsing after the first non-option argument"
12854 msgstr ""
12855
12827 -#: builtin/rev-parse.c:412
12856 +#: builtin/rev-parse.c:416
12857 msgid "output in stuck long form"
12858 msgstr ""
12859
12831 -#: builtin/rev-parse.c:545
12860 +#: builtin/rev-parse.c:549
12861 msgid ""
12862 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
12863 " or: git rev-parse --sq-quote [<arg>...]\n"
@@ -14401,7 +14430,7 @@ msgstr ""
14430 msgid "print debugging messages to stderr"
14431 msgstr ""
14432
14404 -#: git.c:26
14433 +#: git.c:27
14434 msgid ""
14435 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
14436 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
@@ -14411,54 +14440,54 @@ msgid ""
14440 " <command> [<args>]"
14441 msgstr ""
14442
14414 -#: git.c:33
14443 +#: git.c:34
14444 msgid ""
14445 "'git help -a' and 'git help -g' list available subcommands and some\n"
14446 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
14447 "to read about a specific subcommand or concept."
14448 msgstr ""
14449
14421 -#: git.c:113
14450 +#: git.c:173
14451 #, c-format
14452 msgid "no directory given for --git-dir\n"
14453 msgstr ""
14454
14426 -#: git.c:127
14455 +#: git.c:187
14456 #, c-format
14457 msgid "no namespace given for --namespace\n"
14458 msgstr ""
14459
14431 -#: git.c:141
14460 +#: git.c:201
14461 #, c-format
14462 msgid "no directory given for --work-tree\n"
14463 msgstr ""
14464
14436 -#: git.c:155
14465 +#: git.c:215
14466 #, c-format
14467 msgid "no prefix given for --super-prefix\n"
14468 msgstr ""
14469
14441 -#: git.c:177
14470 +#: git.c:237
14471 #, c-format
14472 msgid "-c expects a configuration string\n"
14473 msgstr ""
14474
14446 -#: git.c:215
14475 +#: git.c:275
14476 #, c-format
14477 msgid "no directory given for -C\n"
14478 msgstr ""
14479
14451 -#: git.c:233
14480 +#: git.c:300
14481 #, c-format
14482 msgid "unknown option: %s\n"
14483 msgstr ""
14484
14456 -#: git.c:698
14485 +#: git.c:765
14486 #, c-format
14487 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
14488 msgstr ""
14489
14461 -#: git.c:710
14490 +#: git.c:777
14491 #, c-format
14492 msgid "failed to run command '%s': %s\n"
14493 msgstr ""
@@ -14497,128 +14526,652 @@ msgstr ""
14526 msgid "object filtering"
14527 msgstr ""
14528
14500 -#: common-cmds.h:9
14501 -msgid "start a working area (see also: git help tutorial)"
14529 +#: parse-options.h:157
14530 +msgid "expiry-date"
14531 msgstr ""
14532
14504 -#: common-cmds.h:10
14505 -msgid "work on the current change (see also: git help everyday)"
14533 +#: parse-options.h:172
14534 +msgid "no-op (backward compatibility)"
14535 msgstr ""
14536
14508 -#: common-cmds.h:11
14509 -msgid "examine the history and state (see also: git help revisions)"
14537 +#: parse-options.h:251
14538 +msgid "be more verbose"
14539 msgstr ""
14540
14512 -#: common-cmds.h:12
14513 -msgid "grow, mark and tweak your common history"
14541 +#: parse-options.h:253
14542 +msgid "be more quiet"
14543 msgstr ""
14544
14516 -#: common-cmds.h:13
14517 -msgid "collaborate (see also: git help workflows)"
14545 +#: parse-options.h:259
14546 +msgid "use <n> digits to display SHA-1s"
14547 msgstr ""
14548
14520 -#: common-cmds.h:17
14549 +#: command-list.h:50
14550 msgid "Add file contents to the index"
14551 msgstr ""
14552
14524 -#: common-cmds.h:18
14553 +#: command-list.h:51
14554 +msgid "Apply a series of patches from a mailbox"
14555 +msgstr ""
14556 +
14557 +#: command-list.h:52
14558 +msgid "Annotate file lines with commit information"
14559 +msgstr ""
14560 +
14561 +#: command-list.h:53
14562 +msgid "Apply a patch to files and/or to the index"
14563 +msgstr ""
14564 +
14565 +#: command-list.h:54
14566 +msgid "Import an Arch repository into Git"
14567 +msgstr ""
14568 +
14569 +#: command-list.h:55
14570 +msgid "Create an archive of files from a named tree"
14571 +msgstr ""
14572 +
14573 +#: command-list.h:56
14574 msgid "Use binary search to find the commit that introduced a bug"
14575 msgstr ""
14576
14528 -#: common-cmds.h:19
14577 +#: command-list.h:57
14578 +msgid "Show what revision and author last modified each line of a file"
14579 +msgstr ""
14580 +
14581 +#: command-list.h:58
14582 msgid "List, create, or delete branches"
14583 msgstr ""
14584
14532 -#: common-cmds.h:20
14585 +#: command-list.h:59
14586 +msgid "Move objects and refs by archive"
14587 +msgstr ""
14588 +
14589 +#: command-list.h:60
14590 +msgid "Provide content or type and size information for repository objects"
14591 +msgstr ""
14592 +
14593 +#: command-list.h:61
14594 +msgid "Display gitattributes information"
14595 +msgstr ""
14596 +
14597 +#: command-list.h:62
14598 +msgid "Debug gitignore / exclude files"
14599 +msgstr ""
14600 +
14601 +#: command-list.h:63
14602 +msgid "Show canonical names and email addresses of contacts"
14603 +msgstr ""
14604 +
14605 +#: command-list.h:64
14606 msgid "Switch branches or restore working tree files"
14607 msgstr ""
14608
14536 -#: common-cmds.h:21
14609 +#: command-list.h:65
14610 +msgid "Copy files from the index to the working tree"
14611 +msgstr ""
14612 +
14613 +#: command-list.h:66
14614 +msgid "Ensures that a reference name is well formed"
14615 +msgstr ""
14616 +
14617 +#: command-list.h:67
14618 +msgid "Find commits yet to be applied to upstream"
14619 +msgstr ""
14620 +
14621 +#: command-list.h:68
14622 +msgid "Apply the changes introduced by some existing commits"
14623 +msgstr ""
14624 +
14625 +#: command-list.h:69
14626 +msgid "Graphical alternative to git-commit"
14627 +msgstr ""
14628 +
14629 +#: command-list.h:70
14630 +msgid "Remove untracked files from the working tree"
14631 +msgstr ""
14632 +
14633 +#: command-list.h:71
14634 msgid "Clone a repository into a new directory"
14635 msgstr ""
14636
14540 -#: common-cmds.h:22
14637 +#: command-list.h:72
14638 +msgid "Display data in columns"
14639 +msgstr ""
14640 +
14641 +#: command-list.h:73
14642 msgid "Record changes to the repository"
14643 msgstr ""
14644
14544 -#: common-cmds.h:23
14645 +#: command-list.h:74
14646 +msgid "Write and verify Git commit graph files"
14647 +msgstr ""
14648 +
14649 +#: command-list.h:75
14650 +msgid "Create a new commit object"
14651 +msgstr ""
14652 +
14653 +#: command-list.h:76
14654 +msgid "Get and set repository or global options"
14655 +msgstr ""
14656 +
14657 +#: command-list.h:77
14658 +msgid "Count unpacked number of objects and their disk consumption"
14659 +msgstr ""
14660 +
14661 +#: command-list.h:78
14662 +msgid "Retrieve and store user credentials"
14663 +msgstr ""
14664 +
14665 +#: command-list.h:79
14666 +msgid "Helper to temporarily store passwords in memory"
14667 +msgstr ""
14668 +
14669 +#: command-list.h:80
14670 +msgid "Helper to store credentials on disk"
14671 +msgstr ""
14672 +
14673 +#: command-list.h:81
14674 +msgid "Export a single commit to a CVS checkout"
14675 +msgstr ""
14676 +
14677 +#: command-list.h:82
14678 +msgid "Salvage your data out of another SCM people love to hate"
14679 +msgstr ""
14680 +
14681 +#: command-list.h:83
14682 +msgid "A CVS server emulator for Git"
14683 +msgstr ""
14684 +
14685 +#: command-list.h:84
14686 +msgid "A really simple server for Git repositories"
14687 +msgstr ""
14688 +
14689 +#: command-list.h:85
14690 +msgid "Give an object a human readable name based on an available ref"
14691 +msgstr ""
14692 +
14693 +#: command-list.h:86
14694 msgid "Show changes between commits, commit and working tree, etc"
14695 msgstr ""
14696
14548 -#: common-cmds.h:24
14697 +#: command-list.h:87
14698 +msgid "Compares files in the working tree and the index"
14699 +msgstr ""
14700 +
14701 +#: command-list.h:88
14702 +msgid "Compare a tree to the working tree or index"
14703 +msgstr ""
14704 +
14705 +#: command-list.h:89
14706 +msgid "Compares the content and mode of blobs found via two tree objects"
14707 +msgstr ""
14708 +
14709 +#: command-list.h:90
14710 +msgid "Show changes using common diff tools"
14711 +msgstr ""
14712 +
14713 +#: command-list.h:91
14714 +msgid "Git data exporter"
14715 +msgstr ""
14716 +
14717 +#: command-list.h:92
14718 +msgid "Backend for fast Git data importers"
14719 +msgstr ""
14720 +
14721 +#: command-list.h:93
14722 msgid "Download objects and refs from another repository"
14723 msgstr ""
14724
14552 -#: common-cmds.h:25
14725 +#: command-list.h:94
14726 +msgid "Receive missing objects from another repository"
14727 +msgstr ""
14728 +
14729 +#: command-list.h:95
14730 +msgid "Rewrite branches"
14731 +msgstr ""
14732 +
14733 +#: command-list.h:96
14734 +msgid "Produce a merge commit message"
14735 +msgstr ""
14736 +
14737 +#: command-list.h:97
14738 +msgid "Output information on each ref"
14739 +msgstr ""
14740 +
14741 +#: command-list.h:98
14742 +msgid "Prepare patches for e-mail submission"
14743 +msgstr ""
14744 +
14745 +#: command-list.h:99
14746 +msgid "Verifies the connectivity and validity of the objects in the database"
14747 +msgstr ""
14748 +
14749 +#: command-list.h:100
14750 +msgid "Cleanup unnecessary files and optimize the local repository"
14751 +msgstr ""
14752 +
14753 +#: command-list.h:101
14754 +msgid "Extract commit ID from an archive created using git-archive"
14755 +msgstr ""
14756 +
14757 +#: command-list.h:102
14758 msgid "Print lines matching a pattern"
14759 msgstr ""
14760
14556 -#: common-cmds.h:26
14761 +#: command-list.h:103
14762 +msgid "A portable graphical interface to Git"
14763 +msgstr ""
14764 +
14765 +#: command-list.h:104
14766 +msgid "Compute object ID and optionally creates a blob from a file"
14767 +msgstr ""
14768 +
14769 +#: command-list.h:105
14770 +msgid "Display help information about Git"
14771 +msgstr ""
14772 +
14773 +#: command-list.h:106
14774 +msgid "Server side implementation of Git over HTTP"
14775 +msgstr ""
14776 +
14777 +#: command-list.h:107
14778 +msgid "Download from a remote Git repository via HTTP"
14779 +msgstr ""
14780 +
14781 +#: command-list.h:108
14782 +msgid "Push objects over HTTP/DAV to another repository"
14783 +msgstr ""
14784 +
14785 +#: command-list.h:109
14786 +msgid "Send a collection of patches from stdin to an IMAP folder"
14787 +msgstr ""
14788 +
14789 +#: command-list.h:110
14790 +msgid "Build pack index file for an existing packed archive"
14791 +msgstr ""
14792 +
14793 +#: command-list.h:111
14794 msgid "Create an empty Git repository or reinitialize an existing one"
14795 msgstr ""
14796
14560 -#: common-cmds.h:27
14797 +#: command-list.h:112
14798 +msgid "Instantly browse your working repository in gitweb"
14799 +msgstr ""
14800 +
14801 +#: command-list.h:113
14802 +msgid "add or parse structured information in commit messages"
14803 +msgstr ""
14804 +
14805 +#: command-list.h:114
14806 +msgid "The Git repository browser"
14807 +msgstr ""
14808 +
14809 +#: command-list.h:115
14810 msgid "Show commit logs"
14811 msgstr ""
14812
14564 -#: common-cmds.h:28
14813 +#: command-list.h:116
14814 +msgid "Show information about files in the index and the working tree"
14815 +msgstr ""
14816 +
14817 +#: command-list.h:117
14818 +msgid "List references in a remote repository"
14819 +msgstr ""
14820 +
14821 +#: command-list.h:118
14822 +msgid "List the contents of a tree object"
14823 +msgstr ""
14824 +
14825 +#: command-list.h:119
14826 +msgid "Extracts patch and authorship from a single e-mail message"
14827 +msgstr ""
14828 +
14829 +#: command-list.h:120
14830 +msgid "Simple UNIX mbox splitter program"
14831 +msgstr ""
14832 +
14833 +#: command-list.h:121
14834 msgid "Join two or more development histories together"
14835 msgstr ""
14836
14568 -#: common-cmds.h:29
14837 +#: command-list.h:122
14838 +msgid "Find as good common ancestors as possible for a merge"
14839 +msgstr ""
14840 +
14841 +#: command-list.h:123
14842 +msgid "Run a three-way file merge"
14843 +msgstr ""
14844 +
14845 +#: command-list.h:124
14846 +msgid "Run a merge for files needing merging"
14847 +msgstr ""
14848 +
14849 +#: command-list.h:125
14850 +msgid "The standard helper program to use with git-merge-index"
14851 +msgstr ""
14852 +
14853 +#: command-list.h:126
14854 +msgid "Run merge conflict resolution tools to resolve merge conflicts"
14855 +msgstr ""
14856 +
14857 +#: command-list.h:127
14858 +msgid "Show three-way merge without touching index"
14859 +msgstr ""
14860 +
14861 +#: command-list.h:128
14862 +msgid "Creates a tag object"
14863 +msgstr ""
14864 +
14865 +#: command-list.h:129
14866 +msgid "Build a tree-object from ls-tree formatted text"
14867 +msgstr ""
14868 +
14869 +#: command-list.h:130
14870 msgid "Move or rename a file, a directory, or a symlink"
14871 msgstr ""
14872
14572 -#: common-cmds.h:30
14873 +#: command-list.h:131
14874 +msgid "Find symbolic names for given revs"
14875 +msgstr ""
14876 +
14877 +#: command-list.h:132
14878 +msgid "Add or inspect object notes"
14879 +msgstr ""
14880 +
14881 +#: command-list.h:133
14882 +msgid "Import from and submit to Perforce repositories"
14883 +msgstr ""
14884 +
14885 +#: command-list.h:134
14886 +msgid "Create a packed archive of objects"
14887 +msgstr ""
14888 +
14889 +#: command-list.h:135
14890 +msgid "Find redundant pack files"
14891 +msgstr ""
14892 +
14893 +#: command-list.h:136
14894 +msgid "Pack heads and tags for efficient repository access"
14895 +msgstr ""
14896 +
14897 +#: command-list.h:137
14898 +msgid "Routines to help parsing remote repository access parameters"
14899 +msgstr ""
14900 +
14901 +#: command-list.h:138
14902 +msgid "Compute unique ID for a patch"
14903 +msgstr ""
14904 +
14905 +#: command-list.h:139
14906 +msgid "Prune all unreachable objects from the object database"
14907 +msgstr ""
14908 +
14909 +#: command-list.h:140
14910 +msgid "Remove extra objects that are already in pack files"
14911 +msgstr ""
14912 +
14913 +#: command-list.h:141
14914 msgid "Fetch from and integrate with another repository or a local branch"
14915 msgstr ""
14916
14576 -#: common-cmds.h:31
14917 +#: command-list.h:142
14918 msgid "Update remote refs along with associated objects"
14919 msgstr ""
14920
14580 -#: common-cmds.h:32
14921 +#: command-list.h:143
14922 +msgid "Applies a quilt patchset onto the current branch"
14923 +msgstr ""
14924 +
14925 +#: command-list.h:144
14926 +msgid "Reads tree information into the index"
14927 +msgstr ""
14928 +
14929 +#: command-list.h:145
14930 msgid "Reapply commits on top of another base tip"
14931 msgstr ""
14932
14584 -#: common-cmds.h:33
14933 +#: command-list.h:146
14934 +msgid "Receive what is pushed into the repository"
14935 +msgstr ""
14936 +
14937 +#: command-list.h:147
14938 +msgid "Manage reflog information"
14939 +msgstr ""
14940 +
14941 +#: command-list.h:148
14942 +msgid "Manage set of tracked repositories"
14943 +msgstr ""
14944 +
14945 +#: command-list.h:149
14946 +msgid "Pack unpacked objects in a repository"
14947 +msgstr ""
14948 +
14949 +#: command-list.h:150
14950 +msgid "Create, list, delete refs to replace objects"
14951 +msgstr ""
14952 +
14953 +#: command-list.h:151
14954 +msgid "Generates a summary of pending changes"
14955 +msgstr ""
14956 +
14957 +#: command-list.h:152
14958 +msgid "Reuse recorded resolution of conflicted merges"
14959 +msgstr ""
14960 +
14961 +#: command-list.h:153
14962 msgid "Reset current HEAD to the specified state"
14963 msgstr ""
14964
14588 -#: common-cmds.h:34
14965 +#: command-list.h:154
14966 +msgid "Revert some existing commits"
14967 +msgstr ""
14968 +
14969 +#: command-list.h:155
14970 +msgid "Lists commit objects in reverse chronological order"
14971 +msgstr ""
14972 +
14973 +#: command-list.h:156
14974 +msgid "Pick out and massage parameters"
14975 +msgstr ""
14976 +
14977 +#: command-list.h:157
14978 msgid "Remove files from the working tree and from the index"
14979 msgstr ""
14980
14592 -#: common-cmds.h:35
14981 +#: command-list.h:158
14982 +msgid "Send a collection of patches as emails"
14983 +msgstr ""
14984 +
14985 +#: command-list.h:159
14986 +msgid "Push objects over Git protocol to another repository"
14987 +msgstr ""
14988 +
14989 +#: command-list.h:160
14990 +msgid "Restricted login shell for Git-only SSH access"
14991 +msgstr ""
14992 +
14993 +#: command-list.h:161
14994 +msgid "Summarize 'git log' output"
14995 +msgstr ""
14996 +
14997 +#: command-list.h:162
14998 msgid "Show various types of objects"
14999 msgstr ""
15000
14596 -#: common-cmds.h:36
15001 +#: command-list.h:163
15002 +msgid "Show branches and their commits"
15003 +msgstr ""
15004 +
15005 +#: command-list.h:164
15006 +msgid "Show packed archive index"
15007 +msgstr ""
15008 +
15009 +#: command-list.h:165
15010 +msgid "List references in a local repository"
15011 +msgstr ""
15012 +
15013 +#: command-list.h:166
15014 +msgid "Git's i18n setup code for shell scripts"
15015 +msgstr ""
15016 +
15017 +#: command-list.h:167
15018 +msgid "Common Git shell script setup code"
15019 +msgstr ""
15020 +
15021 +#: command-list.h:168
15022 +msgid "Stash the changes in a dirty working directory away"
15023 +msgstr ""
15024 +
15025 +#: command-list.h:169
15026 +msgid "Add file contents to the staging area"
15027 +msgstr ""
15028 +
15029 +#: command-list.h:170
15030 msgid "Show the working tree status"
15031 msgstr ""
15032
14600 -#: common-cmds.h:37
15033 +#: command-list.h:171
15034 +msgid "Remove unnecessary whitespace"
15035 +msgstr ""
15036 +
15037 +#: command-list.h:172
15038 +msgid "Initialize, update or inspect submodules"
15039 +msgstr ""
15040 +
15041 +#: command-list.h:173
15042 +msgid "Bidirectional operation between a Subversion repository and Git"
15043 +msgstr ""
15044 +
15045 +#: command-list.h:174
15046 +msgid "Read, modify and delete symbolic refs"
15047 +msgstr ""
15048 +
15049 +#: command-list.h:175
15050 msgid "Create, list, delete or verify a tag object signed with GPG"
15051 msgstr ""
15052
14604 -#: parse-options.h:157
14605 -msgid "expiry-date"
15053 +#: command-list.h:176
15054 +msgid "Creates a temporary file with a blob's contents"
15055 msgstr ""
15056
14608 -#: parse-options.h:172
14609 -msgid "no-op (backward compatibility)"
15057 +#: command-list.h:177
15058 +msgid "Unpack objects from a packed archive"
15059 msgstr ""
15060
14612 -#: parse-options.h:251
14613 -msgid "be more verbose"
15061 +#: command-list.h:178
15062 +msgid "Register file contents in the working tree to the index"
15063 msgstr ""
15064
14616 -#: parse-options.h:253
14617 -msgid "be more quiet"
15065 +#: command-list.h:179
15066 +msgid "Update the object name stored in a ref safely"
15067 msgstr ""
15068
14620 -#: parse-options.h:259
14621 -msgid "use <n> digits to display SHA-1s"
15069 +#: command-list.h:180
15070 +msgid "Update auxiliary info file to help dumb servers"
15071 +msgstr ""
15072 +
15073 +#: command-list.h:181
15074 +msgid "Send archive back to git-archive"
15075 +msgstr ""
15076 +
15077 +#: command-list.h:182
15078 +msgid "Send objects packed back to git-fetch-pack"
15079 +msgstr ""
15080 +
15081 +#: command-list.h:183
15082 +msgid "Show a Git logical variable"
15083 +msgstr ""
15084 +
15085 +#: command-list.h:184
15086 +msgid "Check the GPG signature of commits"
15087 +msgstr ""
15088 +
15089 +#: command-list.h:185
15090 +msgid "Validate packed Git archive files"
15091 +msgstr ""
15092 +
15093 +#: command-list.h:186
15094 +msgid "Check the GPG signature of tags"
15095 +msgstr ""
15096 +
15097 +#: command-list.h:187
15098 +msgid "Git web interface (web frontend to Git repositories)"
15099 +msgstr ""
15100 +
15101 +#: command-list.h:188
15102 +msgid "Show logs with difference each commit introduces"
15103 +msgstr ""
15104 +
15105 +#: command-list.h:189
15106 +msgid "Manage multiple working trees"
15107 +msgstr ""
15108 +
15109 +#: command-list.h:190
15110 +msgid "Create a tree object from the current index"
15111 +msgstr ""
15112 +
15113 +#: command-list.h:191
15114 +msgid "Defining attributes per path"
15115 +msgstr ""
15116 +
15117 +#: command-list.h:192
15118 +msgid "Git command-line interface and conventions"
15119 +msgstr ""
15120 +
15121 +#: command-list.h:193
15122 +msgid "A Git core tutorial for developers"
15123 +msgstr ""
15124 +
15125 +#: command-list.h:194
15126 +msgid "Git for CVS users"
15127 +msgstr ""
15128 +
15129 +#: command-list.h:195
15130 +msgid "Tweaking diff output"
15131 +msgstr ""
15132 +
15133 +#: command-list.h:196
15134 +msgid "A useful minimum set of commands for Everyday Git"
15135 +msgstr ""
15136 +
15137 +#: command-list.h:197
15138 +msgid "A Git Glossary"
15139 +msgstr ""
15140 +
15141 +#: command-list.h:198
15142 +msgid "Hooks used by Git"
15143 +msgstr ""
15144 +
15145 +#: command-list.h:199
15146 +msgid "Specifies intentionally untracked files to ignore"
15147 +msgstr ""
15148 +
15149 +#: command-list.h:200
15150 +msgid "Defining submodule properties"
15151 +msgstr ""
15152 +
15153 +#: command-list.h:201
15154 +msgid "Git namespaces"
15155 +msgstr ""
15156 +
15157 +#: command-list.h:202
15158 +msgid "Git Repository Layout"
15159 +msgstr ""
15160 +
15161 +#: command-list.h:203
15162 +msgid "Specifying revisions and ranges for Git"
15163 +msgstr ""
15164 +
15165 +#: command-list.h:204
15166 +msgid "A tutorial introduction to Git: part two"
15167 +msgstr ""
15168 +
15169 +#: command-list.h:205
15170 +msgid "A tutorial introduction to Git"
15171 +msgstr ""
15172 +
15173 +#: command-list.h:206
15174 +msgid "An overview of recommended workflows with Git"
15175 msgstr ""
15176
15177 #: rerere.h:40
@@ -15314,7 +15867,7 @@ msgid ""
15867 "e, edit <commit> = use commit, but stop for amending\n"
15868 "s, squash <commit> = use commit, but meld into previous commit\n"
15869 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
15317 -"x, exec <commit> = run command (the rest of the line) using shell\n"
15870 +"x, exec <command> = run command (the rest of the line) using shell\n"
15871 "d, drop <commit> = remove commit\n"
15872 "l, label <label> = label current HEAD with a name\n"
15873 "t, reset <label> = reset HEAD to a label\n"