005c62fe46 · matheusbsbs/matheus-bagliano

@@ -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: 2017-12-31 10:45+0800\n"

11 +"POT-Creation-Date: 2018-01-07 07:50+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -572,7 +572,7 @@ msgstr[1] ""

572 msgid "Unable to write new index file"

573 msgstr ""

574

575 -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260

575 +#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223

576 #: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

577 #: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

578 #: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

@@ -589,7 +589,7 @@ msgstr ""

589 msgid "apply changes matching the given path"

590 msgstr ""

591

592 -#: apply.c:4927 builtin/am.c:2266

592 +#: apply.c:4927 builtin/am.c:2229

593 msgid "num"

594 msgstr ""

595

@@ -649,7 +649,7 @@ msgstr ""

649 msgid "ensure at least <n> lines of context match"

650 msgstr ""

651

652 -#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95

652 +#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95

653 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

654 #: builtin/pack-objects.c:3009

655 msgid "action"

@@ -693,7 +693,7 @@ msgstr ""

693 msgid "do not trust the line counts in the hunk headers"

694 msgstr ""

695

696 -#: apply.c:4983 builtin/am.c:2254

696 +#: apply.c:4983 builtin/am.c:2217

697 msgid "root"

698 msgstr ""

699

@@ -942,8 +942,8 @@ msgstr ""

942 msgid "--reverse and --first-parent together require specified latest commit"

943 msgstr ""

944

945 -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179

946 -#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

945 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177

946 +#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

947 #: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

948 #: builtin/shortlog.c:191

949 msgid "revision walk setup failed"

@@ -1098,8 +1098,8 @@ msgstr ""

1098 msgid "unrecognized header: %s%s (%d)"

1099 msgstr ""

1100

1101 -#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631

1102 -#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782

1101 +#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637

1102 +#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782

1103 #, c-format

1104 msgid "could not open '%s'"

1105 msgstr ""

@@ -1166,8 +1166,8 @@ msgstr ""

1166 msgid "invalid color value: %.*s"

1167 msgstr ""

1168

1169 -#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465

1170 -#: builtin/am.c:1471 builtin/am.c:2106

1169 +#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465

1170 +#: builtin/am.c:1434 builtin/am.c:2069

1171 #, c-format

1172 msgid "could not parse %s"

1173 msgstr ""

@@ -1938,11 +1938,11 @@ msgstr ""

1938 msgid "Unable to create '%s.lock': %s"

1939 msgstr ""

1940

1941 -#: merge.c:41

1941 +#: merge.c:74

1942 msgid "failed to read the cache"

1943 msgstr ""

1944

1945 -#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379

1945 +#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379

1946 #: builtin/checkout.c:600 builtin/clone.c:754

1947 msgid "unable to write new index file"

1948 msgstr ""

@@ -2158,36 +2158,41 @@ msgstr ""

2158 msgid "Adding %s"

2159 msgstr ""

2160

2161 -#: merge-recursive.c:1955

2161 +#: merge-recursive.c:1958

2162 +#, c-format

2163 +msgid "Dirty index: cannot merge (dirty: %s)"

2164 +msgstr ""

2165 +

2166 +#: merge-recursive.c:1962

2167 msgid "Already up to date!"

2168 msgstr ""

2169

2165 -#: merge-recursive.c:1964

2170 +#: merge-recursive.c:1971

2171 #, c-format

2172 msgid "merging of trees %s and %s failed"

2173 msgstr ""

2174

2170 -#: merge-recursive.c:2061

2175 +#: merge-recursive.c:2068

2176 msgid "Merging:"

2177 msgstr ""

2178

2174 -#: merge-recursive.c:2074

2179 +#: merge-recursive.c:2081

2180 #, c-format

2181 msgid "found %u common ancestor:"

2182 msgid_plural "found %u common ancestors:"

2183 msgstr[0] ""

2184 msgstr[1] ""

2185

2181 -#: merge-recursive.c:2113

2186 +#: merge-recursive.c:2120

2187 msgid "merge returned no commit"

2188 msgstr ""

2189

2185 -#: merge-recursive.c:2176

2190 +#: merge-recursive.c:2183

2191 #, c-format

2192 msgid "Could not parse object '%s'"

2193 msgstr ""

2194

2190 -#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815

2195 +#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815

2196 msgid "Unable to write index."

2197 msgstr ""

2198

@@ -2371,12 +2376,12 @@ msgid ""

2376 "Using version %i"

2377 msgstr ""

2378

2374 -#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048

2379 +#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048

2380 #, c-format

2381 msgid "could not close '%s'"

2382 msgstr ""

2383

2379 -#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093

2384 +#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096

2385 #, c-format

2386 msgid "could not stat '%s'"

2387 msgstr ""

@@ -2782,35 +2787,35 @@ msgid ""

2787 "You can disable this warning with `git config advice.ignoredHook false`."

2788 msgstr ""

2789

2785 -#: send-pack.c:151

2790 +#: send-pack.c:141

2791 #, c-format

2792 msgid "unable to parse remote unpack status: %s"

2793 msgstr ""

2794

2790 -#: send-pack.c:153

2795 +#: send-pack.c:143

2796 #, c-format

2797 msgid "remote unpack failed: %s"

2798 msgstr ""

2799

2795 -#: send-pack.c:316

2800 +#: send-pack.c:306

2801 msgid "failed to sign the push certificate"

2802 msgstr ""

2803

2799 -#: send-pack.c:429

2804 +#: send-pack.c:419

2805 msgid "the receiving end does not support --signed push"

2806 msgstr ""

2807

2803 -#: send-pack.c:431

2808 +#: send-pack.c:421

2809 msgid ""

2810 "not sending a push certificate since the receiving end does not support --"

2811 "signed push"

2812 msgstr ""

2813

2809 -#: send-pack.c:443

2814 +#: send-pack.c:433

2815 msgid "the receiving end does not support --atomic push"

2816 msgstr ""

2817

2813 -#: send-pack.c:448

2818 +#: send-pack.c:438

2819 msgid "the receiving end does not support push options"

2820 msgstr ""

2821

@@ -2844,13 +2849,13 @@ msgid ""

2849 "and commit the result with 'git commit'"

2850 msgstr ""

2851

2847 -#: sequencer.c:297 sequencer.c:1715

2852 +#: sequencer.c:297 sequencer.c:1718

2853 #, c-format

2854 msgid "could not lock '%s'"

2855 msgstr ""

2856

2852 -#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734

2853 -#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656

2857 +#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737

2858 +#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656

2859 #, c-format

2860 msgid "could not write to '%s'"

2861 msgstr ""

@@ -2860,12 +2865,12 @@ msgstr ""

2865 msgid "could not write eol to '%s'"

2866 msgstr ""

2867

2863 -#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722

2868 +#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725

2869 #, c-format

2870 msgid "failed to finalize '%s'."

2871 msgstr ""

2872

2868 -#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259

2873 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259

2874 #: builtin/commit.c:754 builtin/merge.c:1046

2875 #, c-format

2876 msgid "could not read '%s'"

@@ -2894,11 +2899,11 @@ msgid "%s: Unable to write new index file"

2899 msgstr ""

2900

2901 #: sequencer.c:496

2897 -msgid "could not resolve HEAD commit\n"

2902 +msgid "could not resolve HEAD commit"

2903 msgstr ""

2904

2905 #: sequencer.c:516

2901 -msgid "unable to update cache tree\n"

2906 +msgid "unable to update cache tree"

2907 msgstr ""

2908

2909 #: sequencer.c:600

@@ -2920,12 +2925,12 @@ msgstr ""

2925

2926 #: sequencer.c:702

2927 #, c-format

2923 -msgid "could not parse commit %s\n"

2928 +msgid "could not parse commit %s"

2929 msgstr ""

2930

2931 #: sequencer.c:707

2932 #, c-format

2928 -msgid "could not parse parent commit %s\n"

2933 +msgid "could not parse parent commit %s"

2934 msgstr ""

2935

2936 #: sequencer.c:836

@@ -2949,7 +2954,7 @@ msgstr ""

2954 msgid "This is a combination of %d commits."

2955 msgstr ""

2956

2952 -#: sequencer.c:857 sequencer.c:2742

2957 +#: sequencer.c:857 sequencer.c:2748

2958 msgid "need a HEAD to fixup"

2959 msgstr ""

2960

@@ -3016,158 +3021,168 @@ msgstr ""

3021

3022 #. TRANSLATORS: The first %s will be a "todo" command like

3023 #. "revert" or "pick", the second %s a SHA1.

3019 -#: sequencer.c:1025

3024 +#: sequencer.c:1023

3025 #, c-format

3026 msgid "%s: cannot parse parent commit %s"

3027 msgstr ""

3028

3024 -#: sequencer.c:1088 sequencer.c:1864

3029 +#: sequencer.c:1086 sequencer.c:1867

3030 #, c-format

3031 msgid "could not rename '%s' to '%s'"

3032 msgstr ""

3033

3029 -#: sequencer.c:1139

3034 +#: sequencer.c:1137

3035 #, c-format

3036 msgid "could not revert %s... %s"

3037 msgstr ""

3038

3034 -#: sequencer.c:1140

3039 +#: sequencer.c:1138

3040 #, c-format

3041 msgid "could not apply %s... %s"

3042 msgstr ""

3043

3039 -#: sequencer.c:1182

3044 +#: sequencer.c:1180

3045 msgid "empty commit set passed"

3046 msgstr ""

3047

3043 -#: sequencer.c:1192

3048 +#: sequencer.c:1190

3049 #, c-format

3050 msgid "git %s: failed to read the index"

3051 msgstr ""

3052

3048 -#: sequencer.c:1198

3053 +#: sequencer.c:1196

3054 #, c-format

3055 msgid "git %s: failed to refresh the index"

3056 msgstr ""

3057

3053 -#: sequencer.c:1319

3058 +#: sequencer.c:1270

3059 +#, c-format

3060 +msgid "%s does not accept arguments: '%s'"

3061 +msgstr ""

3062 +

3063 +#: sequencer.c:1279

3064 +#, c-format

3065 +msgid "missing arguments for %s"

3066 +msgstr ""

3067 +

3068 +#: sequencer.c:1322

3069 #, c-format

3070 msgid "invalid line %d: %.*s"

3071 msgstr ""

3072

3058 -#: sequencer.c:1327

3073 +#: sequencer.c:1330

3074 #, c-format

3075 msgid "cannot '%s' without a previous commit"

3076 msgstr ""

3077

3063 -#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636

3064 -#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853

3078 +#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642

3079 +#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859

3080 #, c-format

3081 msgid "could not read '%s'."

3082 msgstr ""

3083

3069 -#: sequencer.c:1372

3084 +#: sequencer.c:1375

3085 msgid "please fix this using 'git rebase --edit-todo'."

3086 msgstr ""

3087

3073 -#: sequencer.c:1374

3088 +#: sequencer.c:1377

3089 #, c-format

3090 msgid "unusable instruction sheet: '%s'"

3091 msgstr ""

3092

3078 -#: sequencer.c:1379

3093 +#: sequencer.c:1382

3094 msgid "no commits parsed."

3095 msgstr ""

3096

3082 -#: sequencer.c:1390

3097 +#: sequencer.c:1393

3098 msgid "cannot cherry-pick during a revert."

3099 msgstr ""

3100

3086 -#: sequencer.c:1392

3101 +#: sequencer.c:1395

3102 msgid "cannot revert during a cherry-pick."

3103 msgstr ""

3104

3090 -#: sequencer.c:1459

3105 +#: sequencer.c:1462

3106 #, c-format

3107 msgid "invalid key: %s"

3108 msgstr ""

3109

3095 -#: sequencer.c:1462

3110 +#: sequencer.c:1465

3111 #, c-format

3112 msgid "invalid value for %s: %s"

3113 msgstr ""

3114

3100 -#: sequencer.c:1528

3115 +#: sequencer.c:1531

3116 #, c-format

3117 msgid "malformed options sheet: '%s'"

3118 msgstr ""

3119

3105 -#: sequencer.c:1566

3120 +#: sequencer.c:1569

3121 msgid "a cherry-pick or revert is already in progress"

3122 msgstr ""

3123

3109 -#: sequencer.c:1567

3124 +#: sequencer.c:1570

3125 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3126 msgstr ""

3127

3113 -#: sequencer.c:1570

3128 +#: sequencer.c:1573

3129 #, c-format

3130 msgid "could not create sequencer directory '%s'"

3131 msgstr ""

3132

3118 -#: sequencer.c:1585

3133 +#: sequencer.c:1588

3134 msgid "could not lock HEAD"

3135 msgstr ""

3136

3122 -#: sequencer.c:1643 sequencer.c:2227

3137 +#: sequencer.c:1646 sequencer.c:2230

3138 msgid "no cherry-pick or revert in progress"

3139 msgstr ""

3140

3126 -#: sequencer.c:1645

3141 +#: sequencer.c:1648

3142 msgid "cannot resolve HEAD"

3143 msgstr ""

3144

3130 -#: sequencer.c:1647 sequencer.c:1682

3145 +#: sequencer.c:1650 sequencer.c:1685

3146 msgid "cannot abort from a branch yet to be born"

3147 msgstr ""

3148

3134 -#: sequencer.c:1668 builtin/grep.c:713

3149 +#: sequencer.c:1671 builtin/grep.c:713

3150 #, c-format

3151 msgid "cannot open '%s'"

3152 msgstr ""

3153

3139 -#: sequencer.c:1670

3154 +#: sequencer.c:1673

3155 #, c-format

3156 msgid "cannot read '%s': %s"

3157 msgstr ""

3158

3144 -#: sequencer.c:1671

3159 +#: sequencer.c:1674

3160 msgid "unexpected end of file"

3161 msgstr ""

3162

3148 -#: sequencer.c:1677

3163 +#: sequencer.c:1680

3164 #, c-format

3165 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3166 msgstr ""

3167

3153 -#: sequencer.c:1688

3168 +#: sequencer.c:1691

3169 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3170 msgstr ""

3171

3157 -#: sequencer.c:1829 sequencer.c:2125

3172 +#: sequencer.c:1832 sequencer.c:2128

3173 msgid "cannot read HEAD"

3174 msgstr ""

3175

3161 -#: sequencer.c:1869 builtin/difftool.c:639

3176 +#: sequencer.c:1872 builtin/difftool.c:639

3177 #, c-format

3178 msgid "could not copy '%s' to '%s'"

3179 msgstr ""

3180

3166 -#: sequencer.c:1888

3181 +#: sequencer.c:1891

3182 msgid "could not read index"

3183 msgstr ""

3184

3170 -#: sequencer.c:1893

3185 +#: sequencer.c:1896

3186 #, c-format

3187 msgid ""

3188 "execution failed: %s\n"

@@ -3177,11 +3192,11 @@ msgid ""

3192 "\n"

3193 msgstr ""

3194

3180 -#: sequencer.c:1899

3195 +#: sequencer.c:1902

3196 msgid "and made changes to the index and/or the working tree\n"

3197 msgstr ""

3198

3184 -#: sequencer.c:1905

3199 +#: sequencer.c:1908

3200 #, c-format

3201 msgid ""

3202 "execution succeeded: %s\n"

@@ -3192,17 +3207,17 @@ msgid ""

3207 "\n"

3208 msgstr ""

3209

3195 -#: sequencer.c:1964

3210 +#: sequencer.c:1967

3211 #, c-format

3212 msgid "Applied autostash.\n"

3213 msgstr ""

3214

3200 -#: sequencer.c:1976

3215 +#: sequencer.c:1979

3216 #, c-format

3217 msgid "cannot store %s"

3218 msgstr ""

3219

3205 -#: sequencer.c:1979 git-rebase.sh:175

3220 +#: sequencer.c:1982 git-rebase.sh:175

3221 #, c-format

3222 msgid ""

3223 "Applying autostash resulted in conflicts.\n"

@@ -3210,108 +3225,108 @@ msgid ""

3225 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

3226 msgstr ""

3227

3213 -#: sequencer.c:2061

3228 +#: sequencer.c:2064

3229 #, c-format

3230 msgid "Stopped at %s... %.*s\n"

3231 msgstr ""

3232

3218 -#: sequencer.c:2103

3233 +#: sequencer.c:2106

3234 #, c-format

3235 msgid "unknown command %d"

3236 msgstr ""

3237

3223 -#: sequencer.c:2133

3238 +#: sequencer.c:2136

3239 msgid "could not read orig-head"

3240 msgstr ""

3241

3227 -#: sequencer.c:2138 sequencer.c:2739

3242 +#: sequencer.c:2141 sequencer.c:2745

3243 msgid "could not read 'onto'"

3244 msgstr ""

3245

3231 -#: sequencer.c:2145

3246 +#: sequencer.c:2148

3247 #, c-format

3248 msgid "could not update %s"

3249 msgstr ""

3250

3236 -#: sequencer.c:2152

3251 +#: sequencer.c:2155

3252 #, c-format

3253 msgid "could not update HEAD to %s"

3254 msgstr ""

3255

3241 -#: sequencer.c:2236

3256 +#: sequencer.c:2239

3257 msgid "cannot rebase: You have unstaged changes."

3258 msgstr ""

3259

3245 -#: sequencer.c:2241

3260 +#: sequencer.c:2244

3261 msgid "could not remove CHERRY_PICK_HEAD"

3262 msgstr ""

3263

3249 -#: sequencer.c:2250

3264 +#: sequencer.c:2253

3265 msgid "cannot amend non-existing commit"

3266 msgstr ""

3267

3253 -#: sequencer.c:2252

3268 +#: sequencer.c:2255

3269 #, c-format

3270 msgid "invalid file: '%s'"

3271 msgstr ""

3272

3258 -#: sequencer.c:2254

3273 +#: sequencer.c:2257

3274 #, c-format

3275 msgid "invalid contents: '%s'"

3276 msgstr ""

3277

3263 -#: sequencer.c:2257

3278 +#: sequencer.c:2260

3279 msgid ""

3280 "\n"

3281 "You have uncommitted changes in your working tree. Please, commit them\n"

3282 "first and then run 'git rebase --continue' again."

3283 msgstr ""

3284

3270 -#: sequencer.c:2267

3285 +#: sequencer.c:2270

3286 msgid "could not commit staged changes."

3287 msgstr ""

3288

3274 -#: sequencer.c:2347

3289 +#: sequencer.c:2350

3290 #, c-format

3291 msgid "%s: can't cherry-pick a %s"

3292 msgstr ""

3293

3279 -#: sequencer.c:2351

3294 +#: sequencer.c:2354

3295 #, c-format

3296 msgid "%s: bad revision"

3297 msgstr ""

3298

3284 -#: sequencer.c:2384

3299 +#: sequencer.c:2387

3300 msgid "can't revert as initial commit"

3301 msgstr ""

3302

3288 -#: sequencer.c:2489

3303 +#: sequencer.c:2492

3304 msgid "make_script: unhandled options"

3305 msgstr ""

3306

3292 -#: sequencer.c:2492

3307 +#: sequencer.c:2495

3308 msgid "make_script: error preparing revisions"

3309 msgstr ""

3310

3296 -#: sequencer.c:2526 sequencer.c:2561

3311 +#: sequencer.c:2529 sequencer.c:2564

3312 #, c-format

3313 msgid "unusable todo list: '%s'"

3314 msgstr ""

3315

3301 -#: sequencer.c:2609

3316 +#: sequencer.c:2615

3317 #, c-format

3318 msgid ""

3319 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3320 msgstr ""

3321

3307 -#: sequencer.c:2689

3322 +#: sequencer.c:2695

3323 #, c-format

3324 msgid ""

3325 "Warning: some commits may have been dropped accidentally.\n"

3326 "Dropped commits (newer to older):\n"

3327 msgstr ""

3328

3314 -#: sequencer.c:2696

3329 +#: sequencer.c:2702

3330 #, c-format

3331 msgid ""

3332 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3322,7 +3337,7 @@ msgid ""

3337 "\n"

3338 msgstr ""

3339

3325 -#: sequencer.c:2708

3340 +#: sequencer.c:2714

3341 #, c-format

3342 msgid ""

3343 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3330,18 +3345,18 @@ msgid ""

3345 "Or you can abort the rebase with 'git rebase --abort'.\n"

3346 msgstr ""

3347

3333 -#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395

3348 +#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395

3349 #: builtin/am.c:779

3350 #, c-format

3351 msgid "could not open '%s' for writing"

3352 msgstr ""

3353

3339 -#: sequencer.c:2769

3354 +#: sequencer.c:2775

3355 #, c-format

3356 msgid "could not parse commit '%s'"

3357 msgstr ""

3358

3344 -#: sequencer.c:2891

3359 +#: sequencer.c:2897

3360 msgid "the script was already rearranged."

3361 msgstr ""

3362

@@ -4627,80 +4642,80 @@ msgstr ""

4642 msgid "unable to write index file"

4643 msgstr ""

4644

4630 -#: builtin/am.c:1197

4645 +#: builtin/am.c:1160

4646 #, c-format

4647 msgid "When you have resolved this problem, run \"%s --continue\"."

4648 msgstr ""

4649

4635 -#: builtin/am.c:1198

4650 +#: builtin/am.c:1161

4651 #, c-format

4652 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

4653 msgstr ""

4654

4640 -#: builtin/am.c:1199

4655 +#: builtin/am.c:1162

4656 #, c-format

4657 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

4658 msgstr ""

4659

4645 -#: builtin/am.c:1306

4660 +#: builtin/am.c:1269

4661 msgid "Patch is empty."

4662 msgstr ""

4663

4649 -#: builtin/am.c:1372

4664 +#: builtin/am.c:1335

4665 #, c-format

4666 msgid "invalid ident line: %.*s"

4667 msgstr ""

4668

4654 -#: builtin/am.c:1394

4669 +#: builtin/am.c:1357

4670 #, c-format

4671 msgid "unable to parse commit %s"

4672 msgstr ""

4673

4659 -#: builtin/am.c:1587

4674 +#: builtin/am.c:1550

4675 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

4676 msgstr ""

4677

4663 -#: builtin/am.c:1589

4678 +#: builtin/am.c:1552

4679 msgid "Using index info to reconstruct a base tree..."

4680 msgstr ""

4681

4667 -#: builtin/am.c:1608

4682 +#: builtin/am.c:1571

4683 msgid ""

4684 "Did you hand edit your patch?\n"

4685 "It does not apply to blobs recorded in its index."

4686 msgstr ""

4687

4673 -#: builtin/am.c:1614

4688 +#: builtin/am.c:1577

4689 msgid "Falling back to patching base and 3-way merge..."

4690 msgstr ""

4691

4677 -#: builtin/am.c:1639

4692 +#: builtin/am.c:1602

4693 msgid "Failed to merge in the changes."

4694 msgstr ""

4695

4681 -#: builtin/am.c:1663 builtin/merge.c:642

4696 +#: builtin/am.c:1626 builtin/merge.c:642

4697 msgid "git write-tree failed to write a tree"

4698 msgstr ""

4699

4685 -#: builtin/am.c:1670

4700 +#: builtin/am.c:1633

4701 msgid "applying to an empty history"

4702 msgstr ""

4703

4689 -#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825

4704 +#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825

4705 #: builtin/merge.c:850

4706 msgid "failed to write commit object"

4707 msgstr ""

4708

4694 -#: builtin/am.c:1716 builtin/am.c:1720

4709 +#: builtin/am.c:1679 builtin/am.c:1683

4710 #, c-format

4711 msgid "cannot resume: %s does not exist."

4712 msgstr ""

4713

4699 -#: builtin/am.c:1736

4714 +#: builtin/am.c:1699

4715 msgid "cannot be interactive without stdin connected to a terminal."

4716 msgstr ""

4717

4703 -#: builtin/am.c:1741

4718 +#: builtin/am.c:1704

4719 msgid "Commit Body is:"

4720 msgstr ""

4721

@@ -4708,42 +4723,42 @@ msgstr ""

4723 #. in your translation. The program will only accept English

4724 #. input at this point.

4725 #.

4711 -#: builtin/am.c:1751

4726 +#: builtin/am.c:1714

4727 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

4728 msgstr ""

4729

4715 -#: builtin/am.c:1801

4730 +#: builtin/am.c:1764

4731 #, c-format

4732 msgid "Dirty index: cannot apply patches (dirty: %s)"

4733 msgstr ""

4734

4720 -#: builtin/am.c:1841 builtin/am.c:1913

4735 +#: builtin/am.c:1804 builtin/am.c:1876

4736 #, c-format

4737 msgid "Applying: %.*s"

4738 msgstr ""

4739

4725 -#: builtin/am.c:1857

4740 +#: builtin/am.c:1820

4741 msgid "No changes -- Patch already applied."

4742 msgstr ""

4743

4729 -#: builtin/am.c:1865

4744 +#: builtin/am.c:1828

4745 #, c-format

4746 msgid "Patch failed at %s %.*s"

4747 msgstr ""

4748

4734 -#: builtin/am.c:1871

4749 +#: builtin/am.c:1834

4750 #, c-format

4751 msgid "The copy of the patch that failed is found in: %s"

4752 msgstr ""

4753

4739 -#: builtin/am.c:1916

4754 +#: builtin/am.c:1879

4755 msgid ""

4756 "No changes - did you forget to use 'git add'?\n"

4757 "If there is nothing left to stage, chances are that something else\n"

4758 "already introduced the same changes; you might want to skip this patch."

4759 msgstr ""

4760

4746 -#: builtin/am.c:1923

4761 +#: builtin/am.c:1886

4762 msgid ""

4763 "You still have unmerged paths in your index.\n"

4764 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -4751,91 +4766,91 @@ msgid ""

4766 "You might run `git rm` on a file to accept \"deleted by them\" for it."

4767 msgstr ""

4768

4754 -#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332

4769 +#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332

4770 #: builtin/reset.c:340

4771 #, c-format

4772 msgid "Could not parse object '%s'."

4773 msgstr ""

4774

4760 -#: builtin/am.c:2082

4775 +#: builtin/am.c:2045

4776 msgid "failed to clean index"

4777 msgstr ""

4778

4764 -#: builtin/am.c:2117

4779 +#: builtin/am.c:2080

4780 msgid ""

4781 "You seem to have moved HEAD since the last 'am' failure.\n"

4782 "Not rewinding to ORIG_HEAD"

4783 msgstr ""

4784

4770 -#: builtin/am.c:2180

4785 +#: builtin/am.c:2143

4786 #, c-format

4787 msgid "Invalid value for --patch-format: %s"

4788 msgstr ""

4789

4775 -#: builtin/am.c:2213

4790 +#: builtin/am.c:2176

4791 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

4792 msgstr ""

4793

4779 -#: builtin/am.c:2214

4794 +#: builtin/am.c:2177

4795 msgid "git am [<options>] (--continue | --skip | --abort)"

4796 msgstr ""

4797

4783 -#: builtin/am.c:2220

4798 +#: builtin/am.c:2183

4799 msgid "run interactively"

4800 msgstr ""

4801

4787 -#: builtin/am.c:2222

4802 +#: builtin/am.c:2185

4803 msgid "historical option -- no-op"

4804 msgstr ""

4805

4791 -#: builtin/am.c:2224

4806 +#: builtin/am.c:2187

4807 msgid "allow fall back on 3way merging if needed"

4808 msgstr ""

4809

4795 -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

4810 +#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57

4811 #: builtin/repack.c:180

4812 msgid "be quiet"

4813 msgstr ""

4814

4800 -#: builtin/am.c:2227

4815 +#: builtin/am.c:2190

4816 msgid "add a Signed-off-by line to the commit message"

4817 msgstr ""

4818

4804 -#: builtin/am.c:2230

4819 +#: builtin/am.c:2193

4820 msgid "recode into utf8 (default)"

4821 msgstr ""

4822

4808 -#: builtin/am.c:2232

4823 +#: builtin/am.c:2195

4824 msgid "pass -k flag to git-mailinfo"

4825 msgstr ""

4826

4812 -#: builtin/am.c:2234

4827 +#: builtin/am.c:2197

4828 msgid "pass -b flag to git-mailinfo"

4829 msgstr ""

4830

4816 -#: builtin/am.c:2236

4831 +#: builtin/am.c:2199

4832 msgid "pass -m flag to git-mailinfo"

4833 msgstr ""

4834

4820 -#: builtin/am.c:2238

4835 +#: builtin/am.c:2201

4836 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

4837 msgstr ""

4838

4824 -#: builtin/am.c:2241

4839 +#: builtin/am.c:2204

4840 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

4841 msgstr ""

4842

4828 -#: builtin/am.c:2244

4843 +#: builtin/am.c:2207

4844 msgid "strip everything before a scissors line"

4845 msgstr ""

4846

4832 -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

4833 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

4834 -#: builtin/am.c:2273

4847 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218

4848 +#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230

4849 +#: builtin/am.c:2236

4850 msgid "pass it through git-apply"

4851 msgstr ""

4852

4838 -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

4853 +#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

4854 #: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

4855 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

4856 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

@@ -4843,79 +4858,79 @@ msgstr ""

4858 msgid "n"

4859 msgstr ""

4860

4846 -#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38

4861 +#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38

4862 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

4863 msgid "format"

4864 msgstr ""

4865

4851 -#: builtin/am.c:2270

4866 +#: builtin/am.c:2233

4867 msgid "format the patch(es) are in"

4868 msgstr ""

4869

4855 -#: builtin/am.c:2276

4870 +#: builtin/am.c:2239

4871 msgid "override error message when patch failure occurs"

4872 msgstr ""

4873

4859 -#: builtin/am.c:2278

4874 +#: builtin/am.c:2241

4875 msgid "continue applying patches after resolving a conflict"

4876 msgstr ""

4877

4863 -#: builtin/am.c:2281

4878 +#: builtin/am.c:2244

4879 msgid "synonyms for --continue"

4880 msgstr ""

4881

4867 -#: builtin/am.c:2284

4882 +#: builtin/am.c:2247

4883 msgid "skip the current patch"

4884 msgstr ""

4885

4871 -#: builtin/am.c:2287

4886 +#: builtin/am.c:2250

4887 msgid "restore the original branch and abort the patching operation."

4888 msgstr ""

4889

4875 -#: builtin/am.c:2291

4890 +#: builtin/am.c:2254

4891 msgid "lie about committer date"

4892 msgstr ""

4893

4879 -#: builtin/am.c:2293

4894 +#: builtin/am.c:2256

4895 msgid "use current timestamp for author date"

4896 msgstr ""

4897

4883 -#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236

4898 +#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236

4899 #: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

4900 msgid "key-id"

4901 msgstr ""

4902

4888 -#: builtin/am.c:2296

4903 +#: builtin/am.c:2259

4904 msgid "GPG-sign commits"

4905 msgstr ""

4906

4892 -#: builtin/am.c:2299

4907 +#: builtin/am.c:2262

4908 msgid "(internal use for git-rebase)"

4909 msgstr ""

4910

4896 -#: builtin/am.c:2317

4911 +#: builtin/am.c:2280

4912 msgid ""

4913 "The -b/--binary option has been a no-op for long time, and\n"

4914 "it will be removed. Please do not use it anymore."

4915 msgstr ""

4916

4902 -#: builtin/am.c:2324

4917 +#: builtin/am.c:2287

4918 msgid "failed to read the index"

4919 msgstr ""

4920

4906 -#: builtin/am.c:2339

4921 +#: builtin/am.c:2302

4922 #, c-format

4923 msgid "previous rebase directory %s still exists but mbox given."

4924 msgstr ""

4925

4911 -#: builtin/am.c:2363

4926 +#: builtin/am.c:2326

4927 #, c-format

4928 msgid ""

4929 "Stray %s directory found.\n"

4930 "Use \"git am --abort\" to remove it."

4931 msgstr ""

4932

4918 -#: builtin/am.c:2369

4933 +#: builtin/am.c:2332

4934 msgid "Resolve operation not in progress, we are not resuming."

4935 msgstr ""

4936

@@ -14661,7 +14676,7 @@ msgid ""

14676 "\n"

14677 msgstr ""

14678

14664 -#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994

14679 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995

14680 msgid "Could not execute editor"

14681 msgstr ""

14682

@@ -14687,21 +14702,25 @@ msgstr ""

14702 msgid "Could not init rewritten commits"

14703 msgstr ""

14704

14690 -#: git-rebase--interactive.sh:972

14705 +#: git-rebase--interactive.sh:897

14706 +msgid "Could not generate todo list"

14707 +msgstr ""

14708 +

14709 +#: git-rebase--interactive.sh:973

14710 #, sh-format

14711 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"

14712 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"

14713 msgstr[0] ""

14714 msgstr[1] ""

14715

14697 -#: git-rebase--interactive.sh:977

14716 +#: git-rebase--interactive.sh:978

14717 msgid ""

14718 "\n"

14719 "However, if you remove everything, the rebase will be aborted.\n"

14720 "\n"

14721 msgstr ""

14722

14704 -#: git-rebase--interactive.sh:984

14723 +#: git-rebase--interactive.sh:985

14724 msgid "Note that empty commits are commented out"

14725 msgstr ""

14726

l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed)